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

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

[Alexander Clouter]

Fixups and additional DT bindings for orion5x.

Changelog:
 v3 - add the missing interrupt-controller properties to gpio block
    - amend the IRQ description to reflect we are fixing the incorrect value
 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 |   42 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

-- 
1.7.10.4

[PATCHv3 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.  Also missing were the interrupt-controller properties.
This patches resolves those glitches.

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

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 8aad00f..7c2a326 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,9 @@
 			#gpio-cells = <2>;
 			gpio-controller;
 			reg = <0x10100 0x40>;
-			ngpio = <32>;
+			ngpios = <32>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 			interrupts = <6>, <7>, <8>, <9>;
 		};
 
-- 
1.7.10.4

[PATCHv3 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 7c2a326..6fbc5c0 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -74,6 +74,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

[PATCHv3 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 6fbc5c0..c37290b 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -105,6 +105,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

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

[Alexander Clouter]

The crypto functionality in the orion5x dtsi uses the Ethernet IRQ and
so things do not work and there is much grumbling at boot time.
The IRQ for the crypto should be 28, and not 22, and that is what this
patch corrects.

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 c37290b..892c64e 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -129,7 +129,7 @@
 			reg = <0x90000 0x10000>,
 			      <0xf2200000 0x800>;
 			reg-names = "regs", "sram";
-			interrupts = <22>;
+			interrupts = <28>;
 			status = "okay";
 		};
 	};
-- 
1.7.10.4

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

[Andrew Lunn]

On Tue, Mar 26, 2013 at 09:44:45PM +0000, Alexander Clouter wrote:
> Fixups and additional DT bindings for orion5x.
> 
> Changelog:
>  v3 - add the missing interrupt-controller properties to gpio block
>     - amend the IRQ description to reflect we are fixing the incorrect value
>  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 |   42 ++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 40 insertions(+), 2 deletions(-)

Acked-by: Andrew Lunn <andrew@lunn.ch>

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

[Jason Cooper]

On Tue, Mar 26, 2013 at 09:44:46PM +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.  Also missing were the interrupt-controller properties.
> This patches resolves those glitches.
> 
> Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
> ---
>  arch/arm/boot/dts/orion5x.dtsi |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Applied to mvebu/fixes

thx,

Jason.

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

[Jason Cooper]

On Tue, Mar 26, 2013 at 09:44:49PM +0000, Alexander Clouter wrote:
> The crypto functionality in the orion5x dtsi uses the Ethernet IRQ and
> so things do not work and there is much grumbling at boot time.
> The IRQ for the crypto should be 28, and not 22, and that is what this
> patch corrects.
> 
> Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
> ---
>  arch/arm/boot/dts/orion5x.dtsi |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to mvebu/fixes

thx,

Jason.

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

[Jason Cooper]

On Tue, Mar 26, 2013 at 09:44:47PM +0000, Alexander Clouter wrote:
> 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(+)

Applied to mvebu/dt

thx,

Jason.

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

[Jason Cooper]

On Tue, Mar 26, 2013 at 09:44:48PM +0000, Alexander Clouter wrote:
> 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(+)

Applied to mvebu/dt

thx,

Jason.