Skip to content

Hfclk192 m separation #3387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: collab-nrfx-4.0
Choose a base branch
from
Open

Hfclk192 m separation #3387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e58c82a
[nrf fromlist] drivers: clock_control: Separated nrf hfclk shim from …
mif1-nordic Oct 8, 2025
93c4d66
[nrf fromlist] drivers: clock_control: Separated nrf xo shim from nrf…
mif1-nordic Oct 9, 2025
5ff74d1
[nrf fromlist] drivers: clock_control: Separated nrf lfclk shim from …
mif1-nordic Oct 9, 2025
eb580cc
[nrf fromlist] drivers: clock_control: Separated nrf hfclk192m shim f…
mif1-nordic Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions boards/ezurio/bl54l15_dvk/nrf54l_10_15_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&spi00 {
status = "okay";
cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
Expand Down
8 changes: 8 additions & 0 deletions boards/ezurio/bl54l15u_dvk/nrf54l15_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&spi00 {
status = "okay";
cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
Expand Down
8 changes: 8 additions & 0 deletions boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,11 @@
&clock {
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};
8 changes: 8 additions & 0 deletions boards/native/nrf_bsim/nrf54lm20bsim_nrf54lm20a_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,11 @@
&clock {
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};
8 changes: 8 additions & 0 deletions boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&gpregret1 {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions boards/nordic/nrf54l15dk/pre_dt_board.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright (c) 2025 Nordic Semiconductor
# SPDX-License-Identifier: Apache-2.0

# Suppress "unique_unit_address_if_enabled" to handle the following overlaps:
# - power@X010e000 & clock@X010e000 & xo@X010e000 & lfclk@X010e000
list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
8 changes: 8 additions & 0 deletions boards/nordic/nrf54lm20dk/nrf54lm20a_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&ieee802154 {
status = "okay";
};
Expand Down
8 changes: 8 additions & 0 deletions boards/panasonic/panb611evb/panb611evb_nrf54l15_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&spi00 {
status = "okay";
cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
Expand Down
8 changes: 8 additions & 0 deletions boards/raytac/an54l15q_db/raytac_an54l15q_db_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&spi00 {
status = "okay";
cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
Expand Down
8 changes: 8 additions & 0 deletions boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@
status = "okay";
};

&xo {
status = "okay";
};

&lfclk {
status = "okay";
};

&spi00 {
status = "okay";

Expand Down
9 changes: 8 additions & 1 deletion drivers/clock_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_FLL16M clock_cont
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF54H_HFXO clock_control_nrf54h_hfxo.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_HSFLL_LOCAL clock_control_nrf_hsfll_local.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_IRON_HSFLL_LOCAL clock_control_nrf_iron_hsfll_local.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_LFCLK clock_control_nrf_lfclk.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRFS_LFCLK clock_control_nrfs_lfclk.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_AUXPLL clock_control_nrf_auxpll.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_HFCLK clock_control_nrf_hfclk.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_XO clock_control_nrf_xo.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_LFCLK clock_control_nrf_lfclk.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_HFCLK192M clock_control_nrf_hfclk192m.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_COMMON clock_control_nrf_common.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL60X clock_control_bl60x.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL61X clock_control_bl61x.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL70X clock_control_bl70x.c)
Expand Down Expand Up @@ -129,3 +134,5 @@ endif()
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AST10X0 clock_control_ast10x0.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_MAX32 clock_control_max32.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_WCH_RCC clock_control_wch_rcc.c)

zephyr_linker_sources(SECTIONS clock_control_nrf_irq_handlers.ld)
37 changes: 32 additions & 5 deletions drivers/clock_control/Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,21 +307,48 @@

endif # CLOCK_CONTROL_NRF_IRON_HSFLL_LOCAL

config CLOCK_CONTROL_NRF_LFCLK
config CLOCK_CONTROL_NRFS_LFCLK
bool "NRF LFCLK driver support"
depends on DT_HAS_NORDIC_NRF_LFCLK_ENABLED
depends on DT_HAS_NORDIC_NRFS_LFCLK_ENABLED
select NRFS
select NRFS_CLOCK_SERVICE_ENABLED
select CLOCK_CONTROL_NRF2_COMMON
default y

if CLOCK_CONTROL_NRF_LFCLK
if CLOCK_CONTROL_NRFS_LFCLK

config CLOCK_CONTROL_NRF_LFCLK_CLOCK_TIMEOUT_MS
config CLOCK_CONTROL_NRFS_LFCLK_CLOCK_TIMEOUT_MS
int "Timeout waiting for nrfs clock service callback in milliseconds"
default 1000

endif # CLOCK_CONTROL_NRF_LFCLK
endif # CLOCK_CONTROL_NRFS_LFCLK

config CLOCK_CONTROL_NRF_COMMON
bool

config CLOCK_CONTROL_NRF_HFCLK
bool "NRF HFCLK driver support"
depends on DT_HAS_NORDIC_NRF_CLOCK_HFCLK_ENABLED
select CLOCK_CONTROL_NRF_COMMON
default y

config CLOCK_CONTROL_NRF_XO
bool "NRF XO driver support"
depends on DT_HAS_NORDIC_NRF_CLOCK_XO_ENABLED
select CLOCK_CONTROL_NRF_COMMON
default y

config CLOCK_CONTROL_NRF_LFCLK
bool "NRF LFCLK driver support"
depends on DT_HAS_NORDIC_NRF_CLOCK_LFCLK_ENABLED
select CLOCK_CONTROL_NRF_COMMON

Check warning on line 344 in drivers/clock_control/Kconfig.nrf

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LEADING_SPACE 

drivers/clock_control/Kconfig.nrf:344  please, no spaces at the start of a line
default y

config CLOCK_CONTROL_NRF_HFCLK192M
bool "NRF HFCLK192M driver support"
depends on DT_HAS_NORDIC_NRF_CLOCK_HFCLK192M_ENABLED
select CLOCK_CONTROL_NRF_COMMON
default y

config CLOCK_CONTROL_NRF_AUXPLL
bool "nRF Auxiliary PLL driver"
Expand Down
Loading
Loading