Skip to content

include: stm32: clock_control: Ease usage of STM32_DT_CLOCKS macro #46842

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 1 commit into from
Jun 28, 2022
Merged

include: stm32: clock_control: Ease usage of STM32_DT_CLOCKS macro #46842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/clock_control/clock_stm32_mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static int stm32_clk_mux_init(const struct device *dev)
#define STM32_MUX_CLK_INIT(id) \
\
static const struct stm32_clk_mux_config stm32_clk_mux_cfg_##id = { \
.pclken = STM32_INST_CLOCK_INFO(id, 0) \
.pclken = STM32_CLOCK_INFO(0, DT_DRV_INST(id)) \
}; \
\
DEVICE_DT_INST_DEFINE(id, &stm32_clk_mux_init, NULL, \
Expand Down
22 changes: 7 additions & 15 deletions include/zephyr/drivers/clock_control/stm32_clock_control.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,27 +281,19 @@ struct stm32_pclken {

/** Device tree clocks helpers */

#define STM32_CLOCK_INFO(clk_index, id) \
#define STM32_CLOCK_INFO(clk_index, node_id) \
{ \
.enr = DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(id), clk_index, bits),\
.bus = DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(id), clk_index, bus) \
.enr = DT_CLOCKS_CELL_BY_IDX(node_id, clk_index, bits), \
.bus = DT_CLOCKS_CELL_BY_IDX(node_id, clk_index, bus) \
}
#define STM32_DT_CLOCKS(id) \
#define STM32_DT_CLOCKS(node_id) \
{ \
LISTIFY(DT_NUM_CLOCKS(DT_NODELABEL(id)), \
STM32_CLOCK_INFO, (,), id) \
LISTIFY(DT_NUM_CLOCKS(node_id), \
STM32_CLOCK_INFO, (,), node_id) \
}

#define STM32_INST_CLOCK_INFO(clk_index, inst) \
{ \
.enr = DT_INST_CLOCKS_CELL_BY_IDX(inst, clk_index, bits), \
.bus = DT_INST_CLOCKS_CELL_BY_IDX(inst, clk_index, bus) \
}
#define STM32_DT_INST_CLOCKS(inst) \
{ \
LISTIFY(DT_INST_NUM_CLOCKS(inst), \
STM32_INST_CLOCK_INFO, (,), inst) \
}
STM32_DT_CLOCKS(DT_DRV_INST(inst))

#define STM32_OPT_CLOCK_INST_SUPPORT(inst) DT_INST_CLOCKS_HAS_IDX(inst, 1) ||
#define STM32_DT_INST_DEV_OPT_CLOCK_SUPPORT \
Expand Down
4 changes: 2 additions & 2 deletions ...ntrol/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static void test_sysclk_freq(void)

static void test_i2c_clk_config(void)
{
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(i2c1);
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(i2c1));

uint32_t dev_dt_clk_freq, dev_actual_clk_freq;
uint32_t dev_actual_clk_src;
Expand Down Expand Up @@ -136,7 +136,7 @@ static void test_i2c_clk_config(void) {}

static void test_lptim_clk_config(void)
{
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(lptim1);
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(lptim1));

uint32_t dev_dt_clk_freq, dev_actual_clk_freq;
uint32_t dev_actual_clk_src;
Expand Down
2 changes: 1 addition & 1 deletion ...ck_control/stm32_clock_configuration/stm32h7_devices/src/test_stm32_clock_configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void test_sysclk_freq(void)

static void test_spi_clk_config(void)
{
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(spi1);
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(spi1));
struct stm32_pclken spi1_reg_clk_cfg = pclken[0];

uint32_t spi1_actual_clk_src, spi1_dt_ker_clk_src;
Expand Down
2 changes: 1 addition & 1 deletion ...ck_control/stm32_clock_configuration/stm32u5_devices/src/test_stm32_clock_configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void test_sysclk_freq(void)

static void test_spi_clk_config(void)
{
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(spi1);
static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(spi1));

uint32_t spi1_actual_clk_src;
uint32_t spi1_dt_clk_freq, spi1_actual_clk_freq;
Expand Down