On Mon, Jun 12, 2023 at 11:57:34AM +0200, Neil Armstrong wrote:
> 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@xxxxxxxxxx>
> ---
> drivers/clk/meson/a1-peripherals.c | 2 ++
> drivers/clk/meson/a1-peripherals.h | 3 ---
> drivers/clk/meson/a1-pll.c | 2 ++
> 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 a5cab418736a..070ea1427d73 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 */
Reviewed-by: Dmitry Rokosov <ddrokosov@xxxxxxxxxxxxxx>
--
Thank you,
Dmitry
