Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1222846

[PATCH 3/4] ARM: sun8i: Move A23 AHB1 gates out of common DTSI

From Maxime Ripard <maxime.ripard@free-electrons.com>
Newsgroups linux.kernel
Subject [PATCH 3/4] ARM: sun8i: Move A23 AHB1 gates out of common DTSI
Date 2015-09-11 15:30 +0200
Message-ID <q7wyT-2OJ-23@gated-at.bofh.it> (permalink)
References <q7wyS-2OJ-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


The AHB1 gates were assumed to be identical between the A23 and the A33,
which turned out to be wrong. Move the A23 gates definition to the A23
DTSI.

Reported-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/sun8i-a23-a33.dtsi | 25 -------------------------
 arch/arm/boot/dts/sun8i-a23.dtsi     | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 27a925ec17d2..a34bd5f49c2a 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -175,31 +175,6 @@
 			clock-output-names = "apb1";
 		};
 
-		ahb1_gates: clk@01c20060 {
-			#clock-cells = <1>;
-			compatible = "allwinner,sun8i-a23-ahb1-gates-clk";
-			reg = <0x01c20060 0x8>;
-			clocks = <&ahb1>;
-			clock-indices = <1>, <6>,
-					<8>, <9>, <10>,
-					<13>, <14>,
-					<19>, <20>,
-					<21>, <24>, <26>,
-					<29>, <32>, <36>,
-					<40>, <44>, <46>,
-					<52>, <54>,
-					<57>;
-			clock-output-names = "ahb1_mipidsi", "ahb1_dma",
-					"ahb1_mmc0", "ahb1_mmc1", "ahb1_mmc2",
-					"ahb1_nand", "ahb1_sdram",
-					"ahb1_hstimer", "ahb1_spi0",
-					"ahb1_spi1", "ahb1_otg", "ahb1_ehci",
-					"ahb1_ohci", "ahb1_ve", "ahb1_lcd",
-					"ahb1_csi", "ahb1_be",	"ahb1_fe",
-					"ahb1_gpu", "ahb1_spinlock",
-					"ahb1_drc";
-		};
-
 		apb1_gates: clk@01c20068 {
 			#clock-cells = <1>;
 			compatible = "allwinner,sun8i-a23-apb1-gates-clk";
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 2cc27c7a59dc..4a85e213843b 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -50,6 +50,31 @@
 	};
 
 	clocks {
+		ahb1_gates: clk@01c20060 {
+			#clock-cells = <1>;
+			compatible = "allwinner,sun8i-a23-ahb1-gates-clk";
+			reg = <0x01c20060 0x8>;
+			clocks = <&ahb1>;
+			clock-indices = <1>, <6>,
+					<8>, <9>, <10>,
+					<13>, <14>,
+					<19>, <20>,
+					<21>, <24>, <26>,
+					<29>, <32>, <36>,
+					<40>, <44>, <46>,
+					<52>, <54>,
+					<57>;
+			clock-output-names = "ahb1_mipidsi", "ahb1_dma",
+					"ahb1_mmc0", "ahb1_mmc1", "ahb1_mmc2",
+					"ahb1_nand", "ahb1_sdram",
+					"ahb1_hstimer", "ahb1_spi0",
+					"ahb1_spi1", "ahb1_otg", "ahb1_ehci",
+					"ahb1_ohci", "ahb1_ve", "ahb1_lcd",
+					"ahb1_csi", "ahb1_be",	"ahb1_fe",
+					"ahb1_gpu", "ahb1_spinlock",
+					"ahb1_drc";
+		};
+
 		mbus_clk: clk@01c2015c {
 			#clock-cells = <0>;
 			compatible = "allwinner,sun8i-a23-mbus-clk";
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/4] ARM: sun8i: Fix A23 and A33 clock gates indices  Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-11 15:30 +0200
  [PATCH 1/4] clk: sunxi: Add A33 gates support Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-11 15:30 +0200
  [PATCH 2/4] ARM: sun8i: Add the A33 AHB1 gates clock driver Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-11 15:30 +0200
    Re: [PATCH 2/4] ARM: sun8i: Add the A33 AHB1 gates clock driver Peter Korsgaard <peter@korsgaard.com> - 2015-09-13 17:20 +0200
      Re: [PATCH 2/4] ARM: sun8i: Add the A33 AHB1 gates clock driver Peter Korsgaard <peter@korsgaard.com> - 2015-09-13 17:20 +0200
      Re: [PATCH 2/4] ARM: sun8i: Add the A33 AHB1 gates clock driver Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-14 16:50 +0200
  [PATCH 4/4] ARM: sun8i: A23: Add missing msgbox gate Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-11 15:30 +0200
  [PATCH 3/4] ARM: sun8i: Move A23 AHB1 gates out of common DTSI Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-11 15:30 +0200
  Re: [PATCH 0/4] ARM: sun8i: Fix A23 and A33 clock gates indices Chen-Yu Tsai <wens@csie.org> - 2015-09-16 07:50 +0200
  Re: [PATCH 0/4] ARM: sun8i: Fix A23 and A33 clock gates indices Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-09-18 22:10 +0200

csiph-web