[PATCH] ARM: kirkwood: refactor dtsi to largest common nodes

[PATCH] ARM: kirkwood: refactor dtsi to largest common nodes

[Valentin Longchamp]

Some kirkwood variants (for instance present in the prestera SoCs) do
not have all the peripherals whose nodes are initialized in the
kirkwood.dtsi. These missing peripherals are SATA, SDIO, and RTC.

Their corresponding nodes are moved from kirkwood.dtsi to the
kirkwood-628x.dtsi files so that they still are initialized for these
variants.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---
 arch/arm/boot/dts/kirkwood-6281.dtsi | 24 ++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-6282.dtsi | 24 ++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi      | 24 ------------------------
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index d6c9d65..29f831e 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -40,5 +40,29 @@
 				marvell,function = "sdio";
 			};
 		};
+
+		rtc at 10300 {
+			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
+			reg = <0x10300 0x20>;
+			interrupts = <53>;
+			clocks = <&gate_clk 7>;
+		};
+
+		sata at 80000 {
+			compatible = "marvell,orion-sata";
+			reg = <0x80000 0x5000>;
+			interrupts = <21>;
+			clocks = <&gate_clk 14>, <&gate_clk 15>;
+			clock-names = "0", "1";
+			status = "disabled";
+		};
+
+		mvsdio at 90000 {
+			compatible = "marvell,orion-sdio";
+			reg = <0x90000 0x200>;
+			interrupts = <28>;
+			clocks = <&gate_clk 4>;
+			status = "disabled";
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 23991e4..a1c2c05 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -49,6 +49,30 @@
 			};
 		};
 
+		rtc at 10300 {
+			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
+			reg = <0x10300 0x20>;
+			interrupts = <53>;
+			clocks = <&gate_clk 7>;
+		};
+
+		sata at 80000 {
+			compatible = "marvell,orion-sata";
+			reg = <0x80000 0x5000>;
+			interrupts = <21>;
+			clocks = <&gate_clk 14>, <&gate_clk 15>;
+			clock-names = "0", "1";
+			status = "disabled";
+		};
+
+		mvsdio at 90000 {
+			compatible = "marvell,orion-sdio";
+			reg = <0x90000 0x200>;
+			interrupts = <28>;
+			clocks = <&gate_clk 4>;
+			status = "disabled";
+		};
+
 		thermal at 10078 {
 			compatible = "marvell,kirkwood-thermal";
 			reg = <0x10078 0x4>;
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index fada7e6..39f497e 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -71,13 +71,6 @@
 			status = "disabled";
 		};
 
-		rtc at 10300 {
-			compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
-			reg = <0x10300 0x20>;
-			interrupts = <53>;
-			clocks = <&gate_clk 7>;
-		};
-
 		spi at 10600 {
 			compatible = "marvell,orion-spi";
 			#address-cells = <1>;
@@ -151,15 +144,6 @@
 			status = "okay";
 		};
 
-		sata at 80000 {
-			compatible = "marvell,orion-sata";
-			reg = <0x80000 0x5000>;
-			interrupts = <21>;
-			clocks = <&gate_clk 14>, <&gate_clk 15>;
-			clock-names = "0", "1";
-			status = "disabled";
-		};
-
 		nand at 3000000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -194,13 +178,5 @@
 			clocks = <&gate_clk 17>;
 			status = "okay";
 		};
-
-		mvsdio at 90000 {
-			compatible = "marvell,orion-sdio";
-			reg = <0x90000 0x200>;
-			interrupts = <28>;
-			clocks = <&gate_clk 4>;
-			status = "disabled";
-		};
 	};
 };
-- 
1.8.0.1

[PATCH] ARM: kirkwood: refactor dtsi to largest common nodes

[Jason Cooper]

Valentin,

On Thu, May 23, 2013 at 11:25:30AM +0200, Valentin Longchamp wrote:
> Some kirkwood variants (for instance present in the prestera SoCs) do
> not have all the peripherals whose nodes are initialized in the
> kirkwood.dtsi. These missing peripherals are SATA, SDIO, and RTC.

Could you provide a little more detail here about the exact problem this
is solving?

> Their corresponding nodes are moved from kirkwood.dtsi to the
> kirkwood-628x.dtsi files so that they still are initialized for these
> variants.
> 
> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> ---
>  arch/arm/boot/dts/kirkwood-6281.dtsi | 24 ++++++++++++++++++++++++
>  arch/arm/boot/dts/kirkwood-6282.dtsi | 24 ++++++++++++++++++++++++
>  arch/arm/boot/dts/kirkwood.dtsi      | 24 ------------------------
>  3 files changed, 48 insertions(+), 24 deletions(-)

What about kirkwood-nsa310.dts?

thx,

Jason.

[PATCH] ARM: kirkwood: refactor dtsi to largest common nodes

[Valentin Longchamp]

Jason,

On 05/23/2013 01:40 PM, Jason Cooper wrote:
> Valentin,
> 
> On Thu, May 23, 2013 at 11:25:30AM +0200, Valentin Longchamp wrote:
>> Some kirkwood variants (for instance present in the prestera SoCs) do
>> not have all the peripherals whose nodes are initialized in the
>> kirkwood.dtsi. These missing peripherals are SATA, SDIO, and RTC.
> 
> Could you provide a little more detail here about the exact problem this
> is solving?

Sure, I will add more detail.

> 
>> Their corresponding nodes are moved from kirkwood.dtsi to the
>> kirkwood-628x.dtsi files so that they still are initialized for these
>> variants.
>>
>> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
>> ---
>>  arch/arm/boot/dts/kirkwood-6281.dtsi | 24 ++++++++++++++++++++++++
>>  arch/arm/boot/dts/kirkwood-6282.dtsi | 24 ++++++++++++++++++++++++
>>  arch/arm/boot/dts/kirkwood.dtsi      | 24 ------------------------
>>  3 files changed, 48 insertions(+), 24 deletions(-)
> 
> What about kirkwood-nsa310.dts?
> 

Argh, this one slipped through my net when I checked that all .dts except
km_kirkwood somehow include 628[x].dtsi.

I guess it would be OK to just include kirkwood-6281.dtsi in kirkwood-nsa310.dts
as well. Does someone have access to the HW to actually test it ?

Valentin