From 1132279d7644c886c7d4ae9769b046b2a5126753 Mon Sep 17 00:00:00 2001 From: Riku Karjalainen Date: Wed, 2 Apr 2025 11:25:12 +0000 Subject: [PATCH 1/2] drivers: usb: stm32: fix stm32u5x clock disable in sleep mode Replace logical OR with bitwise OR. Signed-off-by: Riku Karjalainen (cherry picked from commit 160ef4670a79e94929ee545abb52767782845a5a) --- drivers/usb/device/usb_dc_stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c index b5fc75c3c2ea6..2817f5531ce03 100644 --- a/drivers/usb/device/usb_dc_stm32.c +++ b/drivers/usb/device/usb_dc_stm32.c @@ -311,7 +311,7 @@ static int usb_dc_stm32_clock_enable(void) #elif defined(CONFIG_SOC_SERIES_STM32U5X) LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_USBPHY); /* Both OTG HS and USBPHY sleep clock MUST be disabled here at the same time */ - LL_AHB2_GRP1_DisableClockStopSleep(LL_AHB2_GRP1_PERIPH_OTG_HS || + LL_AHB2_GRP1_DisableClockStopSleep(LL_AHB2_GRP1_PERIPH_OTG_HS | LL_AHB2_GRP1_PERIPH_USBPHY); #else LL_AHB1_GRP1_DisableClockLowPower(LL_AHB1_GRP1_PERIPH_OTGHSULPI); From 9370bc31f87319ea40aa39bea7a7311786cee769 Mon Sep 17 00:00:00 2001 From: Riku Karjalainen Date: Wed, 4 Jun 2025 07:38:32 +0000 Subject: [PATCH 2/2] drivers: usb: stm32: fix stm32u5x clock disable in sleep mode Replace logical OR with bitwise OR. Signed-off-by: Riku Karjalainen (cherry picked from commit 9493af937dd28e235d3ccaf9dedf17920fd38fef) --- drivers/usb/udc/udc_stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/udc/udc_stm32.c b/drivers/usb/udc/udc_stm32.c index 845f461ea96d9..4f36601961de9 100644 --- a/drivers/usb/udc/udc_stm32.c +++ b/drivers/usb/udc/udc_stm32.c @@ -1069,7 +1069,7 @@ static int priv_clock_enable(void) #elif defined(CONFIG_SOC_SERIES_STM32U5X) LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_USBPHY); /* Both OTG HS and USBPHY sleep clock MUST be disabled here at the same time */ - LL_AHB2_GRP1_DisableClockStopSleep(LL_AHB2_GRP1_PERIPH_OTG_HS || + LL_AHB2_GRP1_DisableClockStopSleep(LL_AHB2_GRP1_PERIPH_OTG_HS | LL_AHB2_GRP1_PERIPH_USBPHY); #else LL_AHB1_GRP1_DisableClockLowPower(LL_AHB1_GRP1_PERIPH_OTGHSULPI);