Skip to content

Commit 82c954e

Browse files
committed
[nrf fromlist] drivers: clock_control: Separated nrf xo shim from nrf clock shim.
Separated clock_control_nrf_xo shim from clock_control_nrf shim. Upstream PR #: 97196 Signed-off-by: Michal Frankiewicz <[email protected]>
1 parent 0c29809 commit 82c954e

File tree

6 files changed

+594
-19
lines changed

6 files changed

+594
-19
lines changed

drivers/clock_control/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_IRON_HSFLL_LOCAL clock_con
6161
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_LFCLK clock_control_nrf_lfclk.c)
6262
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_AUXPLL clock_control_nrf_auxpll.c)
6363
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_HFCLK clock_control_nrf_hfclk.c)
64+
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_XO clock_control_nrf_xo.c)
6465
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_COMMON clock_control_nrf_common.c)
6566
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL60X clock_control_bl60x.c)
6667
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL61X clock_control_bl61x.c)

drivers/clock_control/clock_control_nrf.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,6 @@ static int clk_init(const struct device *dev)
770770
#if NRF_LFRC_HAS_CALIBRATION
771771
IRQ_CONNECT(LFRC_IRQn, DT_INST_IRQ(0, priority), nrfx_isr, nrfx_power_clock_irq_handler, 0);
772772
#endif
773-
774773
clock_control_nrf_common_connect_irq();
775774

776775
nrfx_err = nrfx_clock_init(clock_event_handler);

drivers/clock_control/clock_control_nrf_common.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ void clock_control_nrf_common_connect_irq(void)
3636
}
3737
irq_connected = true;
3838

39-
IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
40-
nrfx_isr, clock_irq_handler, 0);
39+
IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), nrfx_isr, clock_irq_handler, 0);
4140
}

drivers/clock_control/clock_control_nrf_common.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#define CLOCK_CONTROL_NRF_COMMON_H__
88

99
struct clock_control_nrf_irq_handler {
10-
void (*handler)(void); /* Clock interrupt handler */
10+
void (*handler)(void); /* Clock interrupt handler */
1111
};
1212

13-
#define CLOCK_CONTROL_NRF_IRQ_HANDLERS_ITERABLE(name, _a) \
14-
STRUCT_SECTION_ITERABLE(clock_control_nrf_irq_handler, name) = { \
15-
.handler = _a, \
13+
#define CLOCK_CONTROL_NRF_IRQ_HANDLERS_ITERABLE(name, _a) \
14+
STRUCT_SECTION_ITERABLE(clock_control_nrf_irq_handler, name) = { \
15+
.handler = _a, \
1616
}
1717

1818
void clock_control_nrf_common_connect_irq(void);

0 commit comments

Comments
 (0)