Clock separation #3495

mif1-nordic · 2025-11-12T13:33:35Z

No description provided.

github-actions · 2025-12-01T14:36:10Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

…nrf clock shim. Separated clock_control_nrf_hfclk shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

… clock shim. Separated clock_control_nrf_xo shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

masz-nordic

Not a full review

masz-nordic · 2025-12-02T10:28:16Z

dts/bindings/clock/nordic,nrf-clock-lfclk.yaml

+      - "CLOCK_CONTROL_NRF_K32SRC_RC"
+      - "CLOCK_CONTROL_NRF_K32SRC_XTAL"
+      - "CLOCK_CONTROL_NRF_K32SRC_SYNTH"
+      - "CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING"
+      - "CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING"


Suggested change

- "CLOCK_CONTROL_NRF_K32SRC_RC"

- "CLOCK_CONTROL_NRF_K32SRC_XTAL"

- "CLOCK_CONTROL_NRF_K32SRC_SYNTH"

- "CLOCK_CONTROL_NRF_K32SRC_EXT_LOW_SWING"

- "CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING"

- "RC"

- "XTAL"

- "SYNTH"

- "EXT_LOW_SWING"

- "EXT_FULL_SWING"

masz-nordic · 2025-12-02T10:30:32Z

modules/hal_nordic/nrfx/Kconfig

+
+config NRFX_CLOCK_HFCLK192M
+	bool "HFCLK192M driver"
+	depends on $(dt_nodelabel_exists,hfclk192m)


This will break out of tree boards. We need a temporary compatibility layer.

masz-nordic · 2025-12-02T10:33:49Z

drivers/clock_control/CMakeLists.txt

Whitespace alignment should be done in a separate PR.

masz-nordic · 2025-12-02T10:37:55Z

drivers/clock_control/nrf_clock_calibration.c

+						  (nordic_nrf_clock_hfclk),
+						  (nordic_nrf_clock_xo))),


It would be better not to depend on HAL symbol and check if node with compatible exists.

masz-nordic · 2025-12-02T10:40:55Z

drivers/led_strip/ws2812_gpio.c

+	struct device *clk_dev = DEVICE_DT_GET_ONE(COND_CODE_1((NRF_CLOCK_HAS_HFCLK),
+							       (nordic_nrf_clock_hfclk),
+							       (nordic_nrf_clock_xo)));


This could be described explicitly in DTS with a phandle? Let's discuss alternatives.

Same in other drivers.

masz-nordic · 2025-12-02T10:43:44Z

drivers/audio/dmic_nrfx_pdm.c

 #if CONFIG_SOC_SERIES_NRF54HX
 #define DMIC_NRFX_CLOCK_FREQ MHZ(16)
 #define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(NODE_AUDIOPLL, frequency, 0)
 #elif DT_NODE_HAS_STATUS_OKAY(NODE_AUDIO_AUXPLL)
 #define AUXPLL_FREQUENCY_SETTING DT_PROP(NODE_AUDIO_AUXPLL, nordic_frequency)
 BUILD_ASSERT((AUXPLL_FREQUENCY_SETTING == NRF_AUXPLL_FREQ_DIV_AUDIO_48K) ||
 	     (AUXPLL_FREQUENCY_SETTING == NRF_AUXPLL_FREQ_DIV_AUDIO_44K1),
 	      "Unsupported Audio AUXPLL frequency selection for PDM");

 #define DMIC_NRFX_AUDIO_CLOCK_FREQ CLOCK_CONTROL_NRF_AUXPLL_GET_FREQ(NODE_AUDIO_AUXPLL)

 #define DMIC_NRFX_CLOCK_FREQ MHZ(32)
-
-#else
+#elif CONFIG_CLOCK_CONTROL_NRF
 #define DMIC_NRFX_CLOCK_FREQ MHZ(32)
 #define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
 				   DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0))
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO)
+#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
+#define DMIC_NRFX_AUDIO_CLOCK_FREQ                                                                 \
+	DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency,                                            \
+		   DT_PROP_OR(DT_NODELABEL(hfclkaudio), hfclkaudio_frequency, 0))
+#endif
+
+#if defined(CONFIG_CLOCK_CONTORL_NRF)
+#define HFCLKAUDIO_NODE      clock
+#define HFCLKAUDIO_NODE_DESC "hfclkaudio-frequency in the nordic,nrf-clock node, "
+#elif defined(CONFIG_CLOCK_CONTROL_NRF_HFCLKAUDIO)
+#define HFCLKAUDIO_NODE      hfclkaudio
+#define HFCLKAUDIO_NODE_DESC "hfclkaudio-frequency in the nordic,nrf-clock-hfclkaudio node, "
 #endif


I'm thinking this whole block could be refactored and simplified.

masz-nordic · 2025-12-02T10:47:25Z

drivers/clock_control/clock_control_nrf_common.c

+#if NRF_LFRC_HAS_CALIBRATION
+	IRQ_CONNECT(LFRC_IRQn, DT_INST_IRQ(0, priority), nrfx_isr, clock_irq_handler, 0);
+#endif


Should be a separate DT node.

masz-nordic · 2025-12-02T10:47:51Z

drivers/clock_control/clock_control_nrf_common.c

+#include "clock_control_nrf_common.h"
+#include <nrfx.h>
+
+#if NRFX_CHECK(NRFX_POWER_ENABLED)


I'm not convinced it's a good idea to depend on nrfx config symbols.

masz-nordic · 2025-12-02T10:48:22Z

drivers/clock_control/clock_control_nrf_hfclk.c

+#define CTX_ONOFF BIT(6)
+#define CTX_API   BIT(7)
+#define CTX_MASK  (CTX_ONOFF | CTX_API)
+
+#define STATUS_MASK       0x7
+#define GET_STATUS(flags) (flags & STATUS_MASK)
+#define GET_CTX(flags)    (flags & CTX_MASK)
+
+/* Used only by HF clock */
+#define HF_USER_BT      BIT(0)
+#define HF_USER_GENERIC BIT(1)
+
+/* Helper logging macros which prepends hfclk name to the log. */
+#ifdef CONFIG_LOG
+#define CLOCK_LOG(lvl, dev, ...)                                                                   \
+	LOG_##lvl("%s: " GET_ARG_N(1, __VA_ARGS__),                                                \
+		  "hfclk" COND_CODE_0(NUM_VA_ARGS_LESS_1(__VA_ARGS__),		\
+				(), (, GET_ARGS_LESS_N(1, __VA_ARGS__))))
+#else
+#define CLOCK_LOG(...)
+#endif
+
+#define ERR(dev, ...) CLOCK_LOG(ERR, dev, __VA_ARGS__)
+#define WRN(dev, ...) CLOCK_LOG(WRN, dev, __VA_ARGS__)
+#define INF(dev, ...) CLOCK_LOG(INF, dev, __VA_ARGS__)
+#define DBG(dev, ...) CLOCK_LOG(DBG, dev, __VA_ARGS__)


Common code between all drivers, should be factored out.

…nrf clock shim. Separated clock_control_nrf_lfclk shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

…rom nrf clock shim. Separated clock_control_nrf_hfclk192m shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

…nrf clock shim. Separated clock_control_nrf_xo24m shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

…from nrf clock shim. Separated clock_control_nrf_hfclkaudio shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

magp-nordic

Reviewed only part of PR for now

magp-nordic · 2025-12-03T14:23:16Z

include/zephyr/drivers/clock_control/nrf_clock_control.h

 #endif

-#if defined(CONFIG_CLOCK_CONTROL_NRF)
+#ifndef HALTIUM_XXAA


I'm not sure it can be used here; it is an nrfx symbol.

magp-nordic · 2025-12-03T14:28:17Z

drivers/clock_control/clock_control_nrf_common.c

+void clock_control_nrf_common_connect_irq(void)
+{
+	if (irq_connected) {
+		return;
+	}
+	irq_connected = true;
+
+	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
+		    nrfx_isr, clock_irq_handler, 0);


Why not connect nrfx_power_clock_irq_handler as in the previous API?

magp-nordic · 2025-12-03T14:32:13Z

dts/bindings/clock/nordic,nrf-lfclk.yaml

    };

-compatible: "nordic,nrf-lfclk"
+compatible: "nordic,nrfs-lfclk"


File name should also be changed. Or, maybe it could be left as it was? There won't be a name clash with nrf-clock-lfclk

Added binding parameters for HW related Kconfigs in clock control shim. Added dts configs for boards/tests using these Kconfigs. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

Replaced old clock_control.h api with nrf_clock_control.h api. Old api is still available when CONFIG_CLOCK_CONTROL_NRF is set. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

NordicBuilder mentioned this pull request Nov 12, 2025

Clock separation nrfconnect/sdk-nrf#25544

Open

mif1-nordic marked this pull request as draft November 13, 2025 08:37

mif1-nordic force-pushed the clock_separation branch 5 times, most recently from 26a63f3 to fea1633 Compare November 14, 2025 12:54

mif1-nordic marked this pull request as ready for review November 14, 2025 12:57

mif1-nordic force-pushed the clock_separation branch 2 times, most recently from eba4d57 to eb621f6 Compare November 17, 2025 15:02

mif1-nordic marked this pull request as draft November 19, 2025 14:31

mif1-nordic force-pushed the clock_separation branch 3 times, most recently from adeecd2 to dfa0e89 Compare November 28, 2025 13:39

mif1-nordic marked this pull request as ready for review November 28, 2025 13:39

mif1-nordic force-pushed the clock_separation branch 3 times, most recently from 35bdaab to af18d52 Compare December 1, 2025 14:33

github-actions bot added manifest manifest-trusted-firmware-m manifest-hostap manifest-mcuboot manifest-tf-m-tests manifest-nrf_wifi manifest-nrf_hw_models manifest-hal_renesas manifest-hal_nordic DNM (manifest) Binary Blobs Modified labels Dec 1, 2025

mif1-nordic changed the base branch from collab-nrfx-4.0 to main December 2, 2025 08:25

mif1-nordic added 2 commits December 2, 2025 09:31

[nrf fromlist] drivers: clock_control: Separated nrf hfclk shim from …

5acb2ef

…nrf clock shim. Separated clock_control_nrf_hfclk shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

[nrf fromlist] drivers: clock_control: Separated nrf xo shim from nrf…

91a9c8a

… clock shim. Separated clock_control_nrf_xo shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

mif1-nordic force-pushed the clock_separation branch from af18d52 to 40acc62 Compare December 2, 2025 08:32

github-actions bot removed manifest manifest-hal_nordic manifest-trusted-firmware-m manifest-mcuboot manifest-tf-m-tests manifest-nrf_hw_models manifest-hal_renesas manifest-hostap manifest-nrf_wifi DNM (manifest) Binary Blobs Modified labels Dec 2, 2025

masz-nordic reviewed Dec 2, 2025

View reviewed changes

mif1-nordic added 4 commits December 2, 2025 15:03

[nrf fromlist] drivers: clock_control: Separated nrf lfclk shim from …

89a042a

…nrf clock shim. Separated clock_control_nrf_lfclk shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

[nrf fromlist] drivers: clock_control: Separated nrf hfclk192m shim f…

3addd28

…rom nrf clock shim. Separated clock_control_nrf_hfclk192m shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

[nrf fromlist] drivers: clock_control: Separated nrf xo24m shim from …

1c4fb8a

…nrf clock shim. Separated clock_control_nrf_xo24m shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

[nrf fromlist] drivers: clock_control: Separated nrf hfclkaudio shim …

5cd67b8

…from nrf clock shim. Separated clock_control_nrf_hfclkaudio shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

mif1-nordic force-pushed the clock_separation branch from 40acc62 to 7687271 Compare December 2, 2025 15:53

magp-nordic reviewed Dec 3, 2025

View reviewed changes

mif1-nordic force-pushed the clock_separation branch from 7687271 to eab3e9d Compare December 5, 2025 14:34

mif1-nordic added 2 commits December 9, 2025 16:07

[nrf fromlist] treewide: Move separated clock control Kconfigs to dts

d404352

Added binding parameters for HW related Kconfigs in clock control shim. Added dts configs for boards/tests using these Kconfigs. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

[nrf fromlist] treewide: Replace clock api with clock api v2

a9e0cf0

Replaced old clock_control.h api with nrf_clock_control.h api. Old api is still available when CONFIG_CLOCK_CONTROL_NRF is set. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>

mif1-nordic force-pushed the clock_separation branch from eab3e9d to a9e0cf0 Compare December 9, 2025 15:47

Clock separation #3495

Are you sure you want to change the base?

Clock separation #3495

Uh oh!

Conversation

mif1-nordic commented Nov 12, 2025

Uh oh!

github-actions bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

masz-nordic left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

magp-nordic left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Dec 1, 2025 •

edited

Loading