aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/clk/meson
diff options
context:
space:
mode:
authorNeil Armstrong <neil.armstrong@linaro.org>2023-06-12 11:57:35 +0200
committerJerome Brunet <jbrunet@baylibre.com>2023-08-08 16:06:17 +0200
commitd25ffef809f4ca6dcb2ed21ecc0e9ed6809bb57a (patch)
tree9dbea4cbcc6ab180adbe39a567a06b203cb62c12 /drivers/clk/meson
parentclk: meson: a1: move bindings include to main driver (diff)
downloadwireguard-linux-d25ffef809f4ca6dcb2ed21ecc0e9ed6809bb57a.tar.xz
wireguard-linux-d25ffef809f4ca6dcb2ed21ecc0e9ed6809bb57a.zip
clk: meson: meson8b: 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-18-38172d17c27a@linaro.org Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Diffstat (limited to 'drivers/clk/meson')
-rw-r--r--drivers/clk/meson/meson8b.c3
-rw-r--r--drivers/clk/meson/meson8b.h7
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
index cea246daea39..b7417ac262d3 100644
--- a/drivers/clk/meson/meson8b.c
+++ b/drivers/clk/meson/meson8b.c
@@ -22,6 +22,9 @@
#include "clk-pll.h"
#include "clk-mpll.h"
+#include <dt-bindings/clock/meson8b-clkc.h>
+#include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
+
static DEFINE_SPINLOCK(meson_clk_lock);
struct meson8b_clk_reset {
diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h
index 2a9c4fe29ca2..a5b6e67eeefb 100644
--- a/drivers/clk/meson/meson8b.h
+++ b/drivers/clk/meson/meson8b.h
@@ -77,11 +77,4 @@
#define HHI_MPLL_CNTL9 0x2A0 /* 0xa8 offset in data sheet */
#define HHI_MPLL_CNTL10 0x2A4 /* 0xa9 offset in data sheet */
-/*
- * include the CLKID and RESETID that have
- * been made part of the stable DT binding
- */
-#include <dt-bindings/clock/meson8b-clkc.h>
-#include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
-
#endif /* __MESON8B_H */