Skip to content

Commit afcb7c0

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

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

drivers/clk/meson/a1-peripherals.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include "clk-regmap.h"
1616
#include "meson-clkc-utils.h"
1717

18+
#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h>
19+
1820
static struct clk_regmap xtal_in = {
1921
.data = &(struct clk_regmap_gate_data){
2022
.offset = SYS_OSCIN_CTRL,

drivers/clk/meson/a1-peripherals.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,4 @@
4343
#define PSRAM_CLK_CTRL 0xf4
4444
#define DMC_CLK_CTRL 0xf8
4545

46-
/* include the CLKIDs that have been made part of the DT binding */
47-
#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h>
48-
4946
#endif /* __A1_PERIPHERALS_H */

drivers/clk/meson/a1-pll.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include "clk-regmap.h"
1515
#include "meson-clkc-utils.h"
1616

17+
#include <dt-bindings/clock/amlogic,a1-pll-clkc.h>
18+
1719
static struct clk_regmap fixed_pll_dco = {
1820
.data = &(struct meson_clk_pll_data){
1921
.en = {

drivers/clk/meson/a1-pll.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,4 @@
2525
#define ANACTRL_HIFIPLL_CTRL4 0xd0
2626
#define ANACTRL_HIFIPLL_STS 0xd4
2727

28-
/* include the CLKIDs that have been made part of the DT binding */
29-
#include <dt-bindings/clock/amlogic,a1-pll-clkc.h>
30-
3128
#endif /* __A1_PLL_H */

0 commit comments

Comments
 (0)