diff options
| author | Neil Armstrong <neil.armstrong@linaro.org> | 2023-06-12 11:57:33 +0200 |
|---|---|---|
| committer | Jerome Brunet <jbrunet@baylibre.com> | 2023-08-08 16:06:17 +0200 |
| commit | ccbfbd3679ec0cb1442bf84cf2ba31c8a4047814 (patch) | |
| tree | 778f6b289af459ed78ebaeffd601646cc882ab81 /drivers/clk/meson | |
| parent | eb10a264600d9d4385bec905a8c59ee9b635387a (diff) | |
| download | linux-ccbfbd3679ec0cb1442bf84cf2ba31c8a4047814.tar.gz linux-ccbfbd3679ec0cb1442bf84cf2ba31c8a4047814.tar.bz2 linux-ccbfbd3679ec0cb1442bf84cf2ba31c8a4047814.zip | |
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>
Diffstat (limited to 'drivers/clk/meson')
| -rw-r--r-- | drivers/clk/meson/axg.c | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/axg.h | 3 | ||||
| -rw-r--r-- | drivers/clk/meson/g12a.c | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/g12a.h | 3 | ||||
| -rw-r--r-- | drivers/clk/meson/gxbb.c | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/gxbb.h | 3 |
6 files changed, 6 insertions, 9 deletions
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 75f0912a9805..f132439a33a4 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -21,6 +21,8 @@ #include "axg.h" #include "meson-eeclk.h" +#include <dt-bindings/clock/axg-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static struct clk_regmap axg_fixed_pll_dco = { diff --git a/drivers/clk/meson/axg.h b/drivers/clk/meson/axg.h index ed157532b4d7..624d8d3ce7c4 100644 --- a/drivers/clk/meson/axg.h +++ b/drivers/clk/meson/axg.h @@ -102,7 +102,4 @@ #define HHI_DPLL_TOP_I 0x318 #define HHI_DPLL_TOP2_I 0x31C -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/axg-clkc.h> - #endif /* __AXG_H */ diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index e0e295645c9e..ceabd5f4b2ac 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -25,6 +25,8 @@ #include "meson-eeclk.h" #include "g12a.h" +#include <dt-bindings/clock/g12a-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static struct clk_regmap g12a_fixed_pll_dco = { diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h index 8e08af3c1476..f11ee3c59849 100644 --- a/drivers/clk/meson/g12a.h +++ b/drivers/clk/meson/g12a.h @@ -126,7 +126,4 @@ #define HHI_SYS1_PLL_CNTL5 0x394 #define HHI_SYS1_PLL_CNTL6 0x398 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/g12a-clkc.h> - #endif /* __G12A_H */ diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 116fcb6ba160..1ee0774a9827 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -17,6 +17,8 @@ #include "meson-eeclk.h" #include "vid-pll-div.h" +#include <dt-bindings/clock/gxbb-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static const struct pll_params_table gxbb_gp0_pll_params_table[] = { diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index 798ffb911103..ba5f39a8d746 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -112,7 +112,4 @@ #define HHI_BT656_CLK_CNTL 0x3D4 /* 0xf5 offset in data sheet */ #define HHI_SAR_CLK_CNTL 0x3D8 /* 0xf6 offset in data sheet */ -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/gxbb-clkc.h> - #endif /* __GXBB_H */ |