Skip to content

Commit ccbfbd3

Browse files
superna9999jbrun3t
authored andcommitted
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>
1 parent eb10a26 commit ccbfbd3

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

drivers/clk/meson/axg.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include "axg.h"
2222
#include "meson-eeclk.h"
2323

24+
#include <dt-bindings/clock/axg-clkc.h>
25+
2426
static DEFINE_SPINLOCK(meson_clk_lock);
2527

2628
static struct clk_regmap axg_fixed_pll_dco = {

drivers/clk/meson/axg.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,4 @@
102102
#define HHI_DPLL_TOP_I 0x318
103103
#define HHI_DPLL_TOP2_I 0x31C
104104

105-
/* include the CLKIDs that have been made part of the DT binding */
106-
#include <dt-bindings/clock/axg-clkc.h>
107-
108105
#endif /* __AXG_H */

drivers/clk/meson/g12a.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "meson-eeclk.h"
2626
#include "g12a.h"
2727

28+
#include <dt-bindings/clock/g12a-clkc.h>
29+
2830
static DEFINE_SPINLOCK(meson_clk_lock);
2931

3032
static struct clk_regmap g12a_fixed_pll_dco = {

drivers/clk/meson/g12a.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,4 @@
126126
#define HHI_SYS1_PLL_CNTL5 0x394
127127
#define HHI_SYS1_PLL_CNTL6 0x398
128128

129-
/* include the CLKIDs that have been made part of the DT binding */
130-
#include <dt-bindings/clock/g12a-clkc.h>
131-
132129
#endif /* __G12A_H */

drivers/clk/meson/gxbb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#include "meson-eeclk.h"
1818
#include "vid-pll-div.h"
1919

20+
#include <dt-bindings/clock/gxbb-clkc.h>
21+
2022
static DEFINE_SPINLOCK(meson_clk_lock);
2123

2224
static const struct pll_params_table gxbb_gp0_pll_params_table[] = {

drivers/clk/meson/gxbb.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,4 @@
112112
#define HHI_BT656_CLK_CNTL 0x3D4 /* 0xf5 offset in data sheet */
113113
#define HHI_SAR_CLK_CNTL 0x3D8 /* 0xf6 offset in data sheet */
114114

115-
/* include the CLKIDs that have been made part of the DT binding */
116-
#include <dt-bindings/clock/gxbb-clkc.h>
117-
118115
#endif /* __GXBB_H */

0 commit comments

Comments
 (0)