poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2023-07-02 22:54:27 +00:00
commit ed6528b3e3
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
platforms/chibios/drivers/usbpd_stm32g4.c
View file

@ -22,8 +22,6 @@
// Initialises the USBPD subsystem // Initialises the USBPD subsystem
__attribute__((weak)) void usbpd_init(void) { __attribute__((weak)) void usbpd_init(void) {
// Disable dead-battery signals
PWR->CR3 |= PWR_CR3_UCPD_DBDIS;
// Enable the clock for the UCPD1 peripheral // Enable the clock for the UCPD1 peripheral
RCC->APB1ENR2 |= RCC_APB1ENR2_UCPD1EN; RCC->APB1ENR2 |= RCC_APB1ENR2_UCPD1EN;
@ -46,6 +44,11 @@ __attribute__((weak)) void usbpd_init(void) {
CR |= UCPD_CR_ANAMODE | UCPD_CR_CCENABLE_Msk; CR |= UCPD_CR_ANAMODE | UCPD_CR_CCENABLE_Msk;
// Apply the changes // Apply the changes
UCPD1->CR = CR; UCPD1->CR = CR;
// Disable dead-battery signals only after UCPD1 is configured to ensure
// that the transition does not go through any intermediate state without
// any pull-down resistance.
PWR->CR3 |= PWR_CR3_UCPD_DBDIS;
} }
// Gets the current state of the USBPD allowance // Gets the current state of the USBPD allowance