Skip to contentSkip to conversation

ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102

PATCH New Arnaud Ebalard 3 participants 4 messages Sep 30, 2013 – Oct 3, 2013 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102

When 5e12a613 and 0cd3754a were introduced, Netgear ReadyNAS 102 .dts file was queued for inclusion and missed the update to have Mbus (and then BootROM) ranges properties declared. It also missed the relocation of Armada 370/XP PCIe DT nodes introduced by 14fd8ed0 after de1af8d4. This patch fixes that which makes 3.12-rc3 bootable on the NAS.

---
 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 35 ++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)
arch/arm/boot/dts/armada-370-netgear-rn102.dts +19 -16
index 05e4485..aef5ac5 100644
@@ -27,6 +27,25 @@
 	};
 
 	soc {
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
+			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
+		pcie-controller {
+			status = "okay";
+
+			/* Connected to Marvell SATA controller */
+			pcie at 1,0 {
+				/* Port 0, Lane 0 */
+				status = "okay";
+			};
+
+			/* Connected to FL1009 USB 3.0 controller */
+			pcie at 2,0 {
+				/* Port 1, Lane 0 */
+				status = "okay";
+			};
+		};
+
 		internal-regs {
 			serial at 12000 {
 				clock-frequency = <200000000>;
@@ -89,22 +108,6 @@
 					pwm_polarity = <0>;
 				};
 			};
-
-			pcie-controller {
-				status = "okay";
-
-				/* Connected to Marvell SATA controller */
-				pcie at 1,0 {
-					/* Port 0, Lane 0 */
-					status = "okay";
-				};
-
-				/* Connected to FL1009 USB 3.0 controller */
-				pcie at 2,0 {
-					/* Port 1, Lane 0 */
-					status = "okay";
-				};
-			};
 		};
 	};
 
Signature · 1 line
1.8.4.rc3
Applied
#1 lore raw

PATCH 1/1 ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102

Quoted 11 lines · Arnaud Ebalard

When 5e12a613 and 0cd3754a were introduced, Netgear ReadyNAS 102 .dts file was queued for inclusion and missed the update to have Mbus (and then BootROM) ranges properties declared. It also missed the relocation of Armada 370/XP PCIe DT nodes introduced by 14fd8ed0 after de1af8d4. This patch fixes that which makes 3.12-rc3 bootable on the NAS.

---
 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 35 ++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

Applied to mvebu/fixes

thx,

Jason.

#2 lore raw

PATCH 1/1 ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102

In reply to Arnaud Ebalard

Hi,

Quoted 6 lines · Arnaud Ebalard

When 5e12a613 and 0cd3754a were introduced, Netgear ReadyNAS 102 .dts file was queued for inclusion and missed the update to have Mbus (and then BootROM) ranges properties declared. It also missed the relocation of Armada 370/XP PCIe DT nodes introduced by 14fd8ed0 after de1af8d4. This patch fixes that which makes 3.12-rc3 bootable on the NAS.

In the future please don't just quote the SHAs, give the patch subject as well. It makes it easier to follow the patch description without looking them up (besides, there's a chance that the 8-character SHAs will not be unique at some point in the future, which makes the lookup harder).

-Olof

#3 lore raw

PATCH 1/1 ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102

Hi,

Quoted 10 lines · Olof Johansson

Hi,

Quoted 6 lines · Arnaud Ebalard

When 5e12a613 and 0cd3754a were introduced, Netgear ReadyNAS 102 .dts file was queued for inclusion and missed the update to have Mbus (and then BootROM) ranges properties declared. It also missed the relocation of Armada 370/XP PCIe DT nodes introduced by 14fd8ed0 after de1af8d4. This patch fixes that which makes 3.12-rc3 bootable on the NAS.

Quoted 5 lines

In the future please don't just quote the SHAs, give the patch subject as well. It makes it easier to follow the patch description without looking them up (besides, there's a chance that the 8-character SHAs will not be unique at some point in the future, which makes the lookup harder).

Dully noted. Will do it next time, olof.

Cheers,

a+