[PATCHv2 0/4] arm: orion5x: devicetree fixups and additions

[PATCHv2 0/4] arm: orion5x: devicetree fixups and additions

[Alexander Clouter]

Fixups and additional DT bindings for orion5x.

Changelog:
 v2 - included descriptions to patches
    - added 'correct IRQ used in dtsi for mv_cesa' patch

Alexander Clouter (4):
  arm: orion5x: fix orion5x.dtsi gpio parameters
  arm: orion5x: add ehci bindings to dtsi
  arm: orion5x: enable xor for orion5x platform
  arm: orion5x: correct IRQ used in dtsi for mv_cesa

 arch/arm/boot/dts/orion5x.dtsi |   40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

-- 
1.7.10.4

[PATCHv2 1/4] arm: orion5x: fix orion5x.dtsi gpio parameters

[Alexander Clouter]

orion5x.dtsi is missing the gpio alias as well as including a typo
('ngpio' instead of 'ngpios') that prevented the orion-gpio driver
from loading.  This patches resolves this.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
---
 arch/arm/boot/dts/orion5x.dtsi |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 8aad00f..9bde027 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -13,6 +13,9 @@
 	compatible = "marvell,orion5x";
 	interrupt-parent = <&intc>;
 
+	aliases {
+		gpio0 = &gpio0;
+	};
 	intc: interrupt-controller {
 		compatible = "marvell,orion-intc", "marvell,intc";
 		interrupt-controller;
@@ -32,7 +35,7 @@
 			#gpio-cells = <2>;
 			gpio-controller;
 			reg = <0x10100 0x40>;
-			ngpio = <32>;
+			ngpios = <32>;
 			interrupts = <6>, <7>, <8>, <9>;
 		};
 
-- 
1.7.10.4

[PATCHv2 1/4] arm: orion5x: fix orion5x.dtsi gpio parameters

[Andrew Lunn]

On Sat, Mar 23, 2013 at 10:29:54PM +0000, Alexander Clouter wrote:
> orion5x.dtsi is missing the gpio alias as well as including a typo
> ('ngpio' instead of 'ngpios') that prevented the orion-gpio driver
> from loading.  This patches resolves this.
> 
> Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
> ---
>  arch/arm/boot/dts/orion5x.dtsi |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
> index 8aad00f..9bde027 100644
> --- a/arch/arm/boot/dts/orion5x.dtsi
> +++ b/arch/arm/boot/dts/orion5x.dtsi
> @@ -13,6 +13,9 @@
>  	compatible = "marvell,orion5x";
>  	interrupt-parent = <&intc>;
>  
> +	aliases {
> +		gpio0 = &gpio0;
> +	};
>  	intc: interrupt-controller {
>  		compatible = "marvell,orion-intc", "marvell,intc";
>  		interrupt-controller;
> @@ -32,7 +35,7 @@
>  			#gpio-cells = <2>;
>  			gpio-controller;
>  			reg = <0x10100 0x40>;
> -			ngpio = <32>;
> +			ngpios = <32>;
>  			interrupts = <6>, <7>, <8>, <9>;
>  		};

Hi Alex

If you look at Dove, Kirkwood, etc, you see:

                gpio0: gpio at d0400 {
                        compatible = "marvell,orion-gpio";
                        #gpio-cells = <2>;
                        gpio-controller;
                        reg = <0xd0400 0x20>;
                        ngpios = <32>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        interrupts = <12>, <13>, <14>, <60>;
                };

I think you also need to add

                        interrupt-controller;
                        #interrupt-cells = <2>;


	Andrew

[PATCHv2 1/4] arm: orion5x: fix orion5x.dtsi gpio parameters

[Alexander Clouter]

Hi,

On Mon, Mar 25, 2013 at 09:43:12AM +0100, Andrew Lunn wrote:
>If you look at Dove, Kirkwood, etc, you see:
>
>                gpio0: gpio at d0400 {
>                        compatible = "marvell,orion-gpio";
>                        #gpio-cells = <2>;
>                        gpio-controller;
>                        reg = <0xd0400 0x20>;
>                        ngpios = <32>;
>                        interrupt-controller;
>                        #interrupt-cells = <2>;
>                        interrupts = <12>, <13>, <14>, <60>;
>                };
>
>I think you also need to add
>
>                        interrupt-controller;
>                        #interrupt-cells = <2>;
>
Darn, I had noticed this and pondered, then thought to wait for someone brighter to point it out 
authoritively :)

Wanging out an update to this patch too.

Cheers

-- 
Alexander Clouter
.sigmonster says: I'd like some JUNK FOOD ... and then I want to be ALONE --

[PATCHv2 2/4] arm: orion5x: add ehci bindings to dtsi

[Alexander Clouter]

The orion5x SoC also includes a USB EHCI componment so lets add that
to the dtsi (disable by default incase the pins are not broken out).

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
---
 arch/arm/boot/dts/orion5x.dtsi |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 9bde027..e304f11 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -72,6 +72,20 @@
 			status = "okay";
 		};
 
+		ehci at 50000 {
+			compatible = "marvell,orion-ehci";
+			reg = <0x50000 0x1000>;
+			interrupts = <17>;
+			status = "disabled";
+		};
+
+		ehci at a0000 {
+			compatible = "marvell,orion-ehci";
+			reg = <0xa0000 0x1000>;
+			interrupts = <12>;
+			status = "disabled";
+		};
+
 		sata at 80000 {
 			compatible = "marvell,orion-sata";
 			reg = <0x80000 0x5000>;
-- 
1.7.10.4

[PATCHv2 3/4] arm: orion5x: enable xor for orion5x platform

[Alexander Clouter]

The orion5x SoC includes DMA functionality, so lets enable that
and turn it on by default.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
---
 arch/arm/boot/dts/orion5x.dtsi |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index e304f11..3944b9b 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -103,6 +103,25 @@
 			status = "disabled";
 		};
 
+		xor at 60900 {
+			compatible = "marvell,orion-xor";
+			reg = <0x60900 0x100
+			       0x60b00 0x100>;
+			status = "okay";
+
+			xor00 {
+			      interrupts = <30>;
+			      dmacap,memcpy;
+			      dmacap,xor;
+			};
+			xor01 {
+			      interrupts = <31>;
+			      dmacap,memcpy;
+			      dmacap,xor;
+			      dmacap,memset;
+			};
+		};
+
 		crypto at 90000 {
 			compatible = "marvell,orion-crypto";
 			reg = <0x90000 0x10000>,
-- 
1.7.10.4

[PATCHv2 4/4] arm: orion5x: correct IRQ used in dtsi for mv_cesa

[Alexander Clouter]

The crypto functionality hook in the orion5x dtsi uses an IRQ that clashes
with the Ethernet controller, so lets move it to use the IRQ that the non-DT
code utilises.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
---
 arch/arm/boot/dts/orion5x.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 3944b9b..f4be4c5 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -127,7 +127,7 @@
 			reg = <0x90000 0x10000>,
 			      <0xf2200000 0x800>;
 			reg-names = "regs", "sram";
-			interrupts = <22>;
+			interrupts = <28>;
 			status = "okay";
 		};
 	};
-- 
1.7.10.4

[PATCHv2 4/4] arm: orion5x: correct IRQ used in dtsi for mv_cesa

[Andrew Lunn]

On Sat, Mar 23, 2013 at 10:29:57PM +0000, Alexander Clouter wrote:
> The crypto functionality hook in the orion5x dtsi uses an IRQ that clashes
> with the Ethernet controller, so lets move it to use the IRQ that the non-DT
> code utilises.

Hi Alex

Move is the wrong word here. The IRQ are hardware assigned, you cannot
pick and choose. I would write a comment like:

Fix the IRQ number for crypto, which should be 28, not 22 which is
actually Ethernet.

	 Andrew


> 
> Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
> ---
>  arch/arm/boot/dts/orion5x.dtsi |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
> index 3944b9b..f4be4c5 100644
> --- a/arch/arm/boot/dts/orion5x.dtsi
> +++ b/arch/arm/boot/dts/orion5x.dtsi
> @@ -127,7 +127,7 @@
>  			reg = <0x90000 0x10000>,
>  			      <0xf2200000 0x800>;
>  			reg-names = "regs", "sram";
> -			interrupts = <22>;
> +			interrupts = <28>;
>  			status = "okay";
>  		};
>  	};
> -- 
> 1.7.10.4
> 

[PATCHv2 4/4] arm: orion5x: correct IRQ used in dtsi for mv_cesa

[Alexander Clouter]

Hi,

On Mon, Mar 25, 2013 at 09:47:39AM +0100, Andrew Lunn wrote:
>On Sat, Mar 23, 2013 at 10:29:57PM +0000, Alexander Clouter wrote:
>> The crypto functionality hook in the orion5x dtsi uses an IRQ that clashes
>> with the Ethernet controller, so lets move it to use the IRQ that the non-DT
>> code utilises.
>
>Move is the wrong word here. The IRQ are hardware assigned, you cannot
>pick and choose. I would write a comment like:
>
>Fix the IRQ number for crypto, which should be 28, not 22 which is
>actually Ethernet.
>
No problem, wanging an updated patch out.

Cheers

-- 
Alexander Clouter
.sigmonster says: BOFH excuse #125:
                   we just switched to Sprint.

[PATCHv2 0/4] arm: orion5x: devicetree fixups and additions

[Arnd Bergmann]

On Saturday 23 March 2013, Alexander Clouter wrote:
> 
> Fixups and additional DT bindings for orion5x.
> 
> Changelog:
>  v2 - included descriptions to patches
>     - added 'correct IRQ used in dtsi for mv_cesa' patch
> 

Thanks.

Acked-by: Arnd Bergmann <arnd@arndb.de>