Skip to content

[nrf fromtree] Cherry pick nrf auxpll refactor nrf clock control #2994

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

Merged
merged 7 commits into from
Jul 3, 2025
Merged

[nrf fromtree] Cherry pick nrf auxpll refactor nrf clock control #2994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e556ca8
[nrf fromtree] drivers: clock_control: Introduce bl60x clock driver
VynDragon May 19, 2025
25b7371
[nrf fromtree] dts: bindings: clock: add nordic,nrf-auxpll
Hi-Im-David May 23, 2025
9e6acf9
[nrf fromtree] dts: vendor: nordic: nrf54h20 update canpll to use aux…
Hi-Im-David May 23, 2025
6e20d3b
[nrf fromtree] drivers: clock_control: refactor nrf_auxpll driver to …
Hi-Im-David Jun 4, 2025
9e9a1f6
[nrf fromtree] drivers: can: update clock control to use nrf2_auxpll
Hi-Im-David Jun 4, 2025
9dba34c
[nrf fromtree] tests: drivers: Update nrf2 clock control tests for nr…
Hi-Im-David Jun 4, 2025
e0ec489
[nrf fromtree] drivers: clock_control: update nrf2 lfosc_get_accuracy
Hi-Im-David Jun 9, 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
2 changes: 1 addition & 1 deletion drivers/can/can_nrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static int can_nrf_init(const struct device *dev)
return ret;
}

ret = clock_control_on(config->auxpll, NULL);
ret = nrf_clock_control_request_sync(config->auxpll, NULL, K_FOREVER);
if (ret < 0) {
return ret;
}
Expand Down
3 changes: 2 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 @@ -54,6 +54,8 @@ 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_LFCLK clock_control_nrf_lfclk.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_AUXPLL clock_control_nrf_auxpll.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL60X clock_control_bl60x.c)

if(CONFIG_CLOCK_CONTROL_RENESAS_RZA2M_CPG)
zephyr_library_sources(clock_control_renesas_rza2m_cpg.c)
Expand Down Expand Up @@ -115,5 +117,4 @@ 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_NRF_AUXPLL clock_control_nrf_auxpll.c)
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_WCH_RCC clock_control_wch_rcc.c)
4 changes: 2 additions & 2 deletions drivers/clock_control/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ source "drivers/clock_control/Kconfig.stm32"

source "drivers/clock_control/Kconfig.beetle"

source "drivers/clock_control/Kconfig.bflb"

source "drivers/clock_control/Kconfig.fixed"

source "drivers/clock_control/Kconfig.lpc11u6x"
Expand Down Expand Up @@ -102,8 +104,6 @@ source "drivers/clock_control/Kconfig.pwm"

source "drivers/clock_control/Kconfig.rpi_pico"

source "drivers/clock_control/Kconfig.nrf_auxpll"

source "drivers/clock_control/Kconfig.arm_scmi"

source "drivers/clock_control/Kconfig.silabs"
Expand Down
7 changes: 7 additions & 0 deletions drivers/clock_control/Kconfig.bflb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
# SPDX-License-Identifier: Apache-2.0

config CLOCK_CONTROL_BOUFFALOLAB_BL60X
bool "Bouffalolab BL60x Clock Control"
default y
depends on DT_HAS_BFLB_BL60X_CLOCK_CONTROLLER_ENABLED
6 changes: 6 additions & 0 deletions drivers/clock_control/Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,3 +297,9 @@ config CLOCK_CONTROL_NRF_LFCLK_CLOCK_TIMEOUT_MS
default 1000

endif # CLOCK_CONTROL_NRF_LFCLK

config CLOCK_CONTROL_NRF_AUXPLL
bool "nRF Auxiliary PLL driver"
default y
depends on DT_HAS_NORDIC_NRF_AUXPLL_ENABLED
select CLOCK_CONTROL_NRF2_COMMON
9 changes: 0 additions & 9 deletions drivers/clock_control/Kconfig.nrf_auxpll
View file
Open in desktop

This file was deleted.

Loading
Loading