diff options
| author | Neil Armstrong <neil.armstrong@linaro.org> | 2023-06-12 11:57:34 +0200 |
|---|---|---|
| committer | Jerome Brunet <jbrunet@baylibre.com> | 2023-08-08 16:06:17 +0200 |
| commit | afcb7c07be52fabe79785f44467a80f62750ddcb (patch) | |
| tree | d9aa565e90a052f677e98179e18ade826b5218d9 | |
| parent | ccbfbd3679ec0cb1442bf84cf2ba31c8a4047814 (diff) | |
| download | linux-afcb7c07be52fabe79785f44467a80f62750ddcb.tar.gz linux-afcb7c07be52fabe79785f44467a80f62750ddcb.tar.bz2 linux-afcb7c07be52fabe79785f44467a80f62750ddcb.zip | |
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>
| -rw-r--r-- | drivers/clk/meson/a1-peripherals.c | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/a1-peripherals.h | 3 | ||||
| -rw-r--r-- | drivers/clk/meson/a1-pll.c | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/a1-pll.h | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/drivers/clk/meson/a1-peripherals.c b/drivers/clk/meson/a1-peripherals.c index 485182cd8a2a..dde2912671b8 100644 --- a/drivers/clk/meson/a1-peripherals.c +++ b/drivers/clk/meson/a1-peripherals.c @@ -15,6 +15,8 @@ #include "clk-regmap.h" #include "meson-clkc-utils.h" +#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> + static struct clk_regmap xtal_in = { .data = &(struct clk_regmap_gate_data){ .offset = SYS_OSCIN_CTRL, diff --git a/drivers/clk/meson/a1-peripherals.h b/drivers/clk/meson/a1-peripherals.h index 842b52634ed0..26de8530184a 100644 --- a/drivers/clk/meson/a1-peripherals.h +++ b/drivers/clk/meson/a1-peripherals.h @@ -43,7 +43,4 @@ #define PSRAM_CLK_CTRL 0xf4 #define DMC_CLK_CTRL 0xf8 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> - #endif /* __A1_PERIPHERALS_H */ diff --git a/drivers/clk/meson/a1-pll.c b/drivers/clk/meson/a1-pll.c index 25e6b567afd5..7de7d78c3813 100644 --- a/drivers/clk/meson/a1-pll.c +++ b/drivers/clk/meson/a1-pll.c @@ -14,6 +14,8 @@ #include "clk-regmap.h" #include "meson-clkc-utils.h" +#include <dt-bindings/clock/amlogic,a1-pll-clkc.h> + static struct clk_regmap fixed_pll_dco = { .data = &(struct meson_clk_pll_data){ .en = { diff --git a/drivers/clk/meson/a1-pll.h b/drivers/clk/meson/a1-pll.h index 0add1c7ea9f5..4be17b2bf383 100644 --- a/drivers/clk/meson/a1-pll.h +++ b/drivers/clk/meson/a1-pll.h @@ -25,7 +25,4 @@ #define ANACTRL_HIFIPLL_CTRL4 0xd0 #define ANACTRL_HIFIPLL_STS 0xd4 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/amlogic,a1-pll-clkc.h> - #endif /* __A1_PLL_H */ |