This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 8857d3673f0de6733596726733da9b7f0f6ff56b Author: hanzhijian <[email protected]> AuthorDate: Thu Jun 18 09:39:05 2026 +0800 drivers/clk: fix conflicting types in clk_register_* definitions Update the function definitions in all 6 clk implementation files to match the uintptr_t parameter type already declared in clk_provider.h. Fixes CI error: error: conflicting types for 'clk_register_divider' Signed-off-by: hanzhijian <[email protected]> --- drivers/clk/clk_divider.c | 2 +- drivers/clk/clk_fractional_divider.c | 2 +- drivers/clk/clk_gate.c | 2 +- drivers/clk/clk_multiplier.c | 2 +- drivers/clk/clk_mux.c | 2 +- drivers/clk/clk_phase.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/clk_divider.c b/drivers/clk/clk_divider.c index ab22125e94b..78aca2c0dc6 100644 --- a/drivers/clk/clk_divider.c +++ b/drivers/clk/clk_divider.c @@ -363,7 +363,7 @@ const struct clk_ops_s g_clk_divider_ops = FAR struct clk_s *clk_register_divider(FAR const char *name, FAR const char *parent_name, - uint8_t flags, uint32_t reg, + uint8_t flags, uintptr_t reg, uint8_t shift, uint8_t width, uint16_t clk_divider_flags) { diff --git a/drivers/clk/clk_fractional_divider.c b/drivers/clk/clk_fractional_divider.c index 784123da707..06101928f1e 100644 --- a/drivers/clk/clk_fractional_divider.c +++ b/drivers/clk/clk_fractional_divider.c @@ -159,7 +159,7 @@ const struct clk_ops_s g_clk_fractional_divider_ops = FAR struct clk_s * clk_register_fractional_divider(FAR const char *name, FAR const char *parent_name, - uint8_t flags, uint32_t reg, + uint8_t flags, uintptr_t reg, uint8_t mshift, uint8_t mwidth, uint8_t nshift, uint8_t nwidth, uint8_t clk_divider_flags) diff --git a/drivers/clk/clk_gate.c b/drivers/clk/clk_gate.c index f7a78d849e6..eaedba088f5 100644 --- a/drivers/clk/clk_gate.c +++ b/drivers/clk/clk_gate.c @@ -119,7 +119,7 @@ const struct clk_ops_s g_clk_gate_ops = FAR struct clk_s *clk_register_gate(FAR const char *name, FAR const char *parent_name, - uint8_t flags, uint32_t reg, + uint8_t flags, uintptr_t reg, uint8_t bit_idx, uint8_t clk_gate_flags) { diff --git a/drivers/clk/clk_multiplier.c b/drivers/clk/clk_multiplier.c index f86492ae840..6df9cf9096c 100644 --- a/drivers/clk/clk_multiplier.c +++ b/drivers/clk/clk_multiplier.c @@ -227,7 +227,7 @@ const struct clk_ops_s g_clk_multiplier_ops = FAR struct clk_s *clk_register_multiplier(FAR const char *name, FAR const char *parent_name, - uint8_t flags, uint32_t reg, + uint8_t flags, uintptr_t reg, uint8_t shift, uint8_t width, uint8_t clk_multiplier_flags) diff --git a/drivers/clk/clk_mux.c b/drivers/clk/clk_mux.c index d982b6da8d2..e6fe865e3db 100644 --- a/drivers/clk/clk_mux.c +++ b/drivers/clk/clk_mux.c @@ -177,7 +177,7 @@ const struct clk_ops_s g_clk_mux_ro_ops = FAR struct clk_s *clk_register_mux(FAR const char *name, FAR const char * const *parent_names, uint8_t num_parents, - uint8_t flags, uint32_t reg, + uint8_t flags, uintptr_t reg, uint8_t shift, uint8_t width, uint8_t clk_mux_flags) { diff --git a/drivers/clk/clk_phase.c b/drivers/clk/clk_phase.c index 8a96d745336..9e995aac45c 100644 --- a/drivers/clk/clk_phase.c +++ b/drivers/clk/clk_phase.c @@ -92,7 +92,7 @@ const struct clk_ops_s g_clk_phase_ops = FAR struct clk_s *clk_register_phase(FAR const char *name, FAR const char *parent_name, - uint8_t flags, uint32_t reg, + uint8_t flags, uintptr_t reg, uint8_t shift, uint8_t width, uint8_t clk_phase_flags) {
