All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order
@ 2019-07-22 14:08 Maxime Ripard
  2019-07-22 14:08 ` [PATCH 2/2] arm64: dts: allwinner: h6: Fix SID node name Maxime Ripard
  2019-07-22 14:16 ` [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Chen-Yu Tsai
  0 siblings, 2 replies; 4+ messages in thread
From: Maxime Ripard @ 2019-07-22 14:08 UTC (permalink / raw)
  To: Chen-Yu Tsai, Maxime Ripard; +Cc: linux-arm-kernel

The DE2 bus takes two clocks, named bus and mod according to the binding.

However, the order of these clocks change from one SoC to another. Even
though it might not be an issue in most cases, having consistency will help
if we ever need to have some code to deal with deprecated bindings, and in
general it's just better.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 arch/arm/boot/dts/sun8i-a83t.dtsi             | 8 ++++----
 arch/arm/boot/dts/sun8i-r40.dtsi              | 8 ++++----
 arch/arm/boot/dts/sun8i-v3s.dtsi              | 8 ++++----
 arch/arm/boot/dts/sunxi-h3-h5.dtsi            | 8 ++++----
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index b849fbfd3cbf..60f36147dafc 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -314,10 +314,10 @@
 		display_clocks: clock@1000000 {
 			compatible = "allwinner,sun8i-a83t-de2-clk";
 			reg = <0x01000000 0x100000>;
-			clocks = <&ccu CLK_PLL_DE>,
-				 <&ccu CLK_BUS_DE>;
-			clock-names = "mod",
-				      "bus";
+			clocks = <&ccu CLK_BUS_DE>,
+				 <&ccu CLK_PLL_DE>;
+			clock-names = "bus",
+				      "mod";
 			resets = <&ccu RST_BUS_DE>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index 6007d0cc252d..6323941b0f3e 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -119,10 +119,10 @@
 			compatible = "allwinner,sun8i-r40-de2-clk",
 				     "allwinner,sun8i-h3-de2-clk";
 			reg = <0x01000000 0x100000>;
-			clocks = <&ccu CLK_DE>,
-				 <&ccu CLK_BUS_DE>;
-			clock-names = "mod",
-				      "bus";
+			clocks = <&ccu CLK_BUS_DE>,
+				 <&ccu CLK_DE>;
+			clock-names = "bus",
+				      "mod";
 			resets = <&ccu RST_BUS_DE>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
index 1fce5b07c65c..ddbcc28dc541 100644
--- a/arch/arm/boot/dts/sun8i-v3s.dtsi
+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
@@ -106,10 +106,10 @@
 		display_clocks: clock@1000000 {
 			compatible = "allwinner,sun8i-v3s-de2-clk";
 			reg = <0x01000000 0x100000>;
-			clocks = <&ccu CLK_DE>,
-				 <&ccu CLK_BUS_DE>;
-			clock-names = "mod",
-				      "bus";
+			clocks = <&ccu CLK_BUS_DE>,
+				 <&ccu CLK_DE>;
+			clock-names = "bus",
+				      "mod";
 			resets = <&ccu RST_BUS_DE>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index fa8bac5aa3ce..a7cd88fb4012 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -114,10 +114,10 @@
 		display_clocks: clock@1000000 {
 			/* compatible is in per SoC .dtsi file */
 			reg = <0x01000000 0x100000>;
-			clocks = <&ccu CLK_DE>,
-				 <&ccu CLK_BUS_DE>;
-			clock-names = "mod",
-				      "bus";
+			clocks = <&ccu CLK_BUS_DE>,
+				 <&ccu CLK_DE>;
+			clock-names = "bus",
+				      "mod";
 			resets = <&ccu RST_BUS_DE>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 9cc9bdde81ac..60afacfe141d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -228,10 +228,10 @@
 			display_clocks: clock@0 {
 				compatible = "allwinner,sun50i-a64-de2-clk";
 				reg = <0x0 0x100000>;
-				clocks = <&ccu CLK_DE>,
-					 <&ccu CLK_BUS_DE>;
-				clock-names = "mod",
-					      "bus";
+				clocks = <&ccu CLK_BUS_DE>,
+					 <&ccu CLK_DE>;
+				clock-names = "bus",
+					      "mod";
 				resets = <&ccu RST_BUS_DE>;
 				#clock-cells = <1>;
 				#reset-cells = <1>;
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] arm64: dts: allwinner: h6: Fix SID node name
  2019-07-22 14:08 [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Maxime Ripard
@ 2019-07-22 14:08 ` Maxime Ripard
  2019-07-22 14:16 ` [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Chen-Yu Tsai
  1 sibling, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2019-07-22 14:08 UTC (permalink / raw)
  To: Chen-Yu Tsai, Maxime Ripard; +Cc: linux-arm-kernel

The SID node one the H6 doesn't have a standard node name. Switch to the
one we use for the other SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 7628a7c83096..0f571798fc95 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -215,7 +215,7 @@
 			#dma-cells = <1>;
 		};
 
-		sid: sid@3006000 {
+		sid: efuse@3006000 {
 			compatible = "allwinner,sun50i-h6-sid";
 			reg = <0x03006000 0x400>;
 		};
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order
  2019-07-22 14:08 [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Maxime Ripard
  2019-07-22 14:08 ` [PATCH 2/2] arm64: dts: allwinner: h6: Fix SID node name Maxime Ripard
@ 2019-07-22 14:16 ` Chen-Yu Tsai
  2019-07-22 14:50   ` Maxime Ripard
  1 sibling, 1 reply; 4+ messages in thread
From: Chen-Yu Tsai @ 2019-07-22 14:16 UTC (permalink / raw)
  To: Maxime Ripard; +Cc: linux-arm-kernel

On Mon, Jul 22, 2019 at 10:08 PM Maxime Ripard
<maxime.ripard@bootlin.com> wrote:
>
> The DE2 bus takes two clocks, named bus and mod according to the binding.
>
> However, the order of these clocks change from one SoC to another. Even
> though it might not be an issue in most cases, having consistency will help
> if we ever need to have some code to deal with deprecated bindings, and in
> general it's just better.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

Acked-by: Chen-Yu Tsai <wens@csie.org>

for both patches.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order
  2019-07-22 14:16 ` [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Chen-Yu Tsai
@ 2019-07-22 14:50   ` Maxime Ripard
  0 siblings, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2019-07-22 14:50 UTC (permalink / raw)
  To: Chen-Yu Tsai; +Cc: linux-arm-kernel


[-- Attachment #1.1: Type: text/plain, Size: 744 bytes --]

On Mon, Jul 22, 2019 at 10:16:07PM +0800, Chen-Yu Tsai wrote:
> On Mon, Jul 22, 2019 at 10:08 PM Maxime Ripard
> <maxime.ripard@bootlin.com> wrote:
> >
> > The DE2 bus takes two clocks, named bus and mod according to the binding.
> >
> > However, the order of these clocks change from one SoC to another. Even
> > though it might not be an issue in most cases, having consistency will help
> > if we ever need to have some code to deal with deprecated bindings, and in
> > general it's just better.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
>
> for both patches.

Applied both, thanks

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-07-22 14:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-22 14:08 [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Maxime Ripard
2019-07-22 14:08 ` [PATCH 2/2] arm64: dts: allwinner: h6: Fix SID node name Maxime Ripard
2019-07-22 14:16 ` [PATCH 1/2] ARM: dts: sunxi: Unify the DE2 bus clocks order Chen-Yu Tsai
2019-07-22 14:50   ` Maxime Ripard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.