Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: meson: eeclk: move bindings include to main driver

Now the clock ids are no more defined in private headers,
cleanup and include the dt-bindings headers from the main
driver file.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-16-38172d17c27a@linaro.org
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

authored by

Neil Armstrong and committed by
Jerome Brunet
ccbfbd36 eb10a264

+6 -9
+2
drivers/clk/meson/axg.c
··· 21 21 #include "axg.h" 22 22 #include "meson-eeclk.h" 23 23 24 + #include <dt-bindings/clock/axg-clkc.h> 25 + 24 26 static DEFINE_SPINLOCK(meson_clk_lock); 25 27 26 28 static struct clk_regmap axg_fixed_pll_dco = {
-3
drivers/clk/meson/axg.h
··· 102 102 #define HHI_DPLL_TOP_I 0x318 103 103 #define HHI_DPLL_TOP2_I 0x31C 104 104 105 - /* include the CLKIDs that have been made part of the DT binding */ 106 - #include <dt-bindings/clock/axg-clkc.h> 107 - 108 105 #endif /* __AXG_H */
+2
drivers/clk/meson/g12a.c
··· 25 25 #include "meson-eeclk.h" 26 26 #include "g12a.h" 27 27 28 + #include <dt-bindings/clock/g12a-clkc.h> 29 + 28 30 static DEFINE_SPINLOCK(meson_clk_lock); 29 31 30 32 static struct clk_regmap g12a_fixed_pll_dco = {
-3
drivers/clk/meson/g12a.h
··· 126 126 #define HHI_SYS1_PLL_CNTL5 0x394 127 127 #define HHI_SYS1_PLL_CNTL6 0x398 128 128 129 - /* include the CLKIDs that have been made part of the DT binding */ 130 - #include <dt-bindings/clock/g12a-clkc.h> 131 - 132 129 #endif /* __G12A_H */
+2
drivers/clk/meson/gxbb.c
··· 17 17 #include "meson-eeclk.h" 18 18 #include "vid-pll-div.h" 19 19 20 + #include <dt-bindings/clock/gxbb-clkc.h> 21 + 20 22 static DEFINE_SPINLOCK(meson_clk_lock); 21 23 22 24 static const struct pll_params_table gxbb_gp0_pll_params_table[] = {
-3
drivers/clk/meson/gxbb.h
··· 112 112 #define HHI_BT656_CLK_CNTL 0x3D4 /* 0xf5 offset in data sheet */ 113 113 #define HHI_SAR_CLK_CNTL 0x3D8 /* 0xf6 offset in data sheet */ 114 114 115 - /* include the CLKIDs that have been made part of the DT binding */ 116 - #include <dt-bindings/clock/gxbb-clkc.h> 117 - 118 115 #endif /* __GXBB_H */