mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 01:02:19 +00:00
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From f6986222eefd41918451f33b92d0bfe21174e636 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Thu, 26 Jan 2017 11:12:52 +0100
|
|
Subject: [PATCH 80/93] dt-bindings: clock: gxbb: expose i2s master clock
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
|
|
Conflicts:
|
|
include/dt-bindings/clock/gxbb-clkc.h
|
|
---
|
|
drivers/clk/meson/gxbb.h | 4 ++--
|
|
include/dt-bindings/clock/gxbb-clkc.h | 8 +++++---
|
|
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
|
|
index 084b016..740b755f 100644
|
|
--- a/drivers/clk/meson/gxbb.h
|
|
+++ b/drivers/clk/meson/gxbb.h
|
|
@@ -266,8 +266,8 @@
|
|
/* CLKID_SD_EMMC_B */
|
|
/* CLKID_SD_EMMC_C */
|
|
#define CLKID_MPLL0_PLL 97
|
|
-#define CLKID_CTS_AMCLK 98
|
|
-#define CLKID_CTS_AMCLK_SEL 99
|
|
+/* CLKID_CTS_AMCLK */
|
|
+/* CLKID_CTS_AMCLK_SEL */
|
|
#define CLKID_CTS_AMCLK_DIV 100
|
|
/* CLKID_MALI_0 */
|
|
/* CLKID_MALI_1 */
|
|
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h
|
|
index a1246d2..0e690ac 100644
|
|
--- a/include/dt-bindings/clock/gxbb-clkc.h
|
|
+++ b/include/dt-bindings/clock/gxbb-clkc.h
|
|
@@ -29,8 +29,10 @@
|
|
#define CLKID_SD_EMMC_A 94
|
|
#define CLKID_SD_EMMC_B 95
|
|
#define CLKID_SD_EMMC_C 96
|
|
-#define CLKID_MALI_0 97
|
|
-#define CLKID_MALI_1 98
|
|
-#define CLKID_MALI 99
|
|
+#define CLKID_CTS_AMCLK 98
|
|
+#define CLKID_CTS_AMCLK_SEL 99
|
|
+#define CLKID_MALI_0 101
|
|
+#define CLKID_MALI_1 102
|
|
+#define CLKID_MALI 103
|
|
|
|
#endif /* __GXBB_CLKC_H */
|
|
--
|
|
1.9.1
|
|
|