Skip to contentSkip to conversation

Fix address of second XOR engine in Kirkwood SoC DT

PATCH Applied Quentin Armitage 3 participants 3 messages Sep 19, 2013 – Sep 20, 2013 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix address of second XOR engine in Kirkwood SoC DT

There appears to be an error in the second address of the second XOR engine in the Kirkwood SoC device tree, which is specified as 0xd0b00 but should be 0x60b00.

For confirmation of address see
http://www.marvell.com/embedded-processors/kirkwood/assets/FS_88F6180_9x_6281_OpenSource.pdf table 581 page 658. Also see definition of XOR1_HIGH_PHYS_BASE in
arch/arm/mach-kirkwood/include/mach/kirkwood.h
#define XOR1_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x60B00)

---
 arch/arm/boot/dts/kirkwood.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/boot/dts/kirkwood.dtsi
index cf7aeaf..63d4066 100644

arch/arm/boot/dts/kirkwood.dtsi +1 -1
@@ -167,7 +167,7 @@
 		xor@60900 {
 			compatible = "marvell,orion-xor";
 			reg = <0x60900 0x100
-			       0xd0B00 0x100>;
+			       0x60B00 0x100>;
 			status = "okay";
 			clocks = <&gate_clk 16>;
 

---

Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Quentin Armitage

There appears to be an error in the second address of the second XOR engine in the Kirkwood SoC device tree, which is specified as 0xd0b00 but should be 0x60b00.

For confirmation of address see
http://www.marvell.com/embedded-processors/kirkwood/assets/FS_88F6180_9x_6281_OpenSource.pdf table 581 page 658. Also see definition of XOR1_HIGH_PHYS_BASE in
arch/arm/mach-kirkwood/include/mach/kirkwood.h
#define XOR1_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x60B00)

I double-checked the references, typo and fix are correct.

Quoted 26 lines
---
  arch/arm/boot/dts/kirkwood.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/kirkwood.dtsi +1 -3
index cf7aeaf..63d4066 100644
@@ -167,7 +167,7 @@
  		xor@60900 {
  			compatible = "marvell,orion-xor";
  			reg = <0x60900 0x100
-			       0xd0B00 0x100>;
+			       0x60B00 0x100>;
  			status = "okay";
  			clocks = <&gate_clk 16>;
 
---
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Applied
#2 lore raw
In reply to Quentin Armitage
Quoted 10 lines · Quentin Armitage

There appears to be an error in the second address of the second XOR engine in the Kirkwood SoC device tree, which is specified as 0xd0b00 but should be 0x60b00.

For confirmation of address see
http://www.marvell.com/embedded-processors/kirkwood/assets/FS_88F6180_9x_6281_OpenSource.pdf table 581 page 658. Also see definition of XOR1_HIGH_PHYS_BASE in
arch/arm/mach-kirkwood/include/mach/kirkwood.h
#define XOR1_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x60B00)

Quoted 5 lines
---
 arch/arm/boot/dts/kirkwood.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to mvebu/fixes with Sebastian's Reviewed-by.

thx,

Jason.