drivers: clock_control: Add clock sources to common enabled_clock check

Add clock sources PLL2CLK, PLL3CLK and EXT_HSE. Needed to check that these clocks are enabled in MCO code. (cherry picked from commit 807ccf5) Original-Signed-off-by: Joakim Andersson <[email protected]> GitOrigin-RevId: 807ccf5 Cr-Build-Id: 8736554896755799505 Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8736554896755799505 Copybot-Job-Name: zephyr-main-copybot-downstream Change-Id: I3ec554d6f18456ea6ab1e9c5762696fc91941f79 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5870299 Tested-by: Keith Short <[email protected]> Commit-Queue: Keith Short <[email protected]> Tested-by: ChromeOS Prod (Robot) <[email protected]> Reviewed-by: Keith Short <[email protected]>
coreboot · Sep 17, 2024 · 5dc4379 · 5dc4379
1 parent f45f1a1
commit 5dc4379
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c
@@ -133,6 +133,13 @@ int enabled_clock(uint32_t src_clk)
 		}
 		break;
 #endif /* STM32_SRC_HSE */
+#if defined(STM32_SRC_EXT_HSE)
+	case STM32_SRC_EXT_HSE:
+		/* EXT_HSE is the raw OSC_IN signal, so it is always
+		 * available, regardless of the clocks configuration.
+		 */
+		break;
+#endif /* STM32_SRC_HSE */
 #if defined(STM32_SRC_HSI)
 	case STM32_SRC_HSI:
 		if (!IS_ENABLED(STM32_HSI_ENABLED)) {
@@ -210,6 +217,20 @@ int enabled_clock(uint32_t src_clk)
 		}
 		break;
 #endif /* STM32_SRC_PLLI2S_R */
+#if defined(STM32_SRC_PLL2CLK)
+	case STM32_SRC_PLL2CLK:
+		if (!IS_ENABLED(STM32_PLL2_ENABLED)) {
+			r = -ENOTSUP;
+		}
+		break;
+#endif
+#if defined(STM32_SRC_PLL3CLK)
+	case STM32_SRC_PLL3CLK:
+		if (!IS_ENABLED(STM32_PLL3_ENABLED)) {
+			r = -ENOTSUP;
+		}
+		break;
+#endif
 	default:
 		return -ENOTSUP;
 	}

diff --git a/drivers/clock_control/clock_stm32f1.c b/drivers/clock_control/clock_stm32f1.c
@@ -23,6 +23,15 @@
 
 #if defined(STM32_PLL_ENABLED)
 
+uint32_t get_pllout_frequency(void)
+{
+	/* Stub implementation for compatibility with clock_stm32_ll_common.
+	 * The PLL domain clock is only used for MCO configuration, but the
+	 * MCO driver never queries the PLL output clock frequency.
+	 */
+	return 0;
+}
+
 /*
  * Select PLL source for STM32F1 Connectivity line devices (STM32F105xx and
  * STM32F107xx).