Skip to contentSkip to conversation

arm: orion5x: devicetree fixups and additions

PATCH New Alexander Clouter 3 participants 10 messages Mar 26, 2013 – Mar 31, 2013 Device tree bindings

lore
Share & tools
lore
#0 lore raw

v3 cover arm: orion5x: devicetree fixups and additions

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(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v3 1/4 arm: orion5x: fix orion5x.dtsi gpio parameters

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.

---
 arch/arm/boot/dts/orion5x.dtsi |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/boot/dts/orion5x.dtsi +6 -1
index 8aad00f..7c2a326 100644
@@ -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>;
 		};
 
Signature · 1 line
1.7.10.4
Applied
#2 lore raw

PATCH v3 1/4 arm: orion5x: fix orion5x.dtsi gpio parameters

Quoted 9 lines · 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.

---
 arch/arm/boot/dts/orion5x.dtsi |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Applied to mvebu/fixes

thx,

Jason.

#3 lore raw

PATCH v3 2/4 arm: orion5x: add ehci bindings to dtsi

In reply to 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).

---
 arch/arm/boot/dts/orion5x.dtsi |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
arch/arm/boot/dts/orion5x.dtsi +14 -0
index 7c2a326..6fbc5c0 100644
@@ -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>;
Signature · 1 line
1.7.10.4
Applied
#4 lore raw

PATCH v3 2/4 arm: orion5x: add ehci bindings to dtsi

Quoted 7 lines · 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).

---
 arch/arm/boot/dts/orion5x.dtsi |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Applied to mvebu/dt

thx,

Jason.

#5 lore raw

PATCH v3 3/4 arm: orion5x: enable xor for orion5x platform

In reply to Alexander Clouter

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

---
 arch/arm/boot/dts/orion5x.dtsi |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm/boot/dts/orion5x.dtsi +19 -0
index 6fbc5c0..c37290b 100644
@@ -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>,
Signature · 1 line
1.7.10.4
Applied
#6 lore raw

PATCH v3 3/4 arm: orion5x: enable xor for orion5x platform

Quoted 7 lines · Alexander Clouter

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

---
 arch/arm/boot/dts/orion5x.dtsi |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Applied to mvebu/dt

thx,

Jason.

#7 lore raw

PATCH v3 4/4 arm: orion5x: correct IRQ used in dtsi for mv_cesa

In reply to 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.

---
 arch/arm/boot/dts/orion5x.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/orion5x.dtsi +1 -1
index c37290b..892c64e 100644
@@ -129,7 +129,7 @@
 			reg = <0x90000 0x10000>,
 			      <0xf2200000 0x800>;
 			reg-names = "regs", "sram";
-			interrupts = <22>;
+			interrupts = <28>;
 			status = "okay";
 		};
 	};
Signature · 1 line
1.7.10.4
Applied
#8 lore raw

PATCH v3 4/4 arm: orion5x: correct IRQ used in dtsi for mv_cesa

Quoted 9 lines · 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.

---
 arch/arm/boot/dts/orion5x.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to mvebu/fixes

thx,

Jason.

#9 lore raw

v3 cover arm: orion5x: devicetree fixups and additions

In reply to Alexander Clouter
Quoted 8 lines · 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

Quoted 8 lines

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(-)