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

clk: meson: a1: 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>
Reviewed-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-17-38172d17c27a@linaro.org
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

authored by

Neil Armstrong and committed by
Jerome Brunet
afcb7c07 ccbfbd36

+4 -6
+2
drivers/clk/meson/a1-peripherals.c
··· 15 15 #include "clk-regmap.h" 16 16 #include "meson-clkc-utils.h" 17 17 18 + #include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> 19 + 18 20 static struct clk_regmap xtal_in = { 19 21 .data = &(struct clk_regmap_gate_data){ 20 22 .offset = SYS_OSCIN_CTRL,
-3
drivers/clk/meson/a1-peripherals.h
··· 43 43 #define PSRAM_CLK_CTRL 0xf4 44 44 #define DMC_CLK_CTRL 0xf8 45 45 46 - /* include the CLKIDs that have been made part of the DT binding */ 47 - #include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> 48 - 49 46 #endif /* __A1_PERIPHERALS_H */
+2
drivers/clk/meson/a1-pll.c
··· 14 14 #include "clk-regmap.h" 15 15 #include "meson-clkc-utils.h" 16 16 17 + #include <dt-bindings/clock/amlogic,a1-pll-clkc.h> 18 + 17 19 static struct clk_regmap fixed_pll_dco = { 18 20 .data = &(struct meson_clk_pll_data){ 19 21 .en = {
-3
drivers/clk/meson/a1-pll.h
··· 25 25 #define ANACTRL_HIFIPLL_CTRL4 0xd0 26 26 #define ANACTRL_HIFIPLL_STS 0xd4 27 27 28 - /* include the CLKIDs that have been made part of the DT binding */ 29 - #include <dt-bindings/clock/amlogic,a1-pll-clkc.h> 30 - 31 28 #endif /* __A1_PLL_H */