diff options
author | Arnaud Ebalard <arno@natisbad.org> | 2013-09-30 18:19:16 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-09-30 20:46:30 -0400 |
commit | b643f85814f69306b9a6e0df34a1c8acb97d3bbd (patch) | |
tree | 3271d11a61ad32b0f3a5c9f1ddb9fc62d8f44a78 /arch/arm/boot/dts/armada-370-netgear-rn102.dts | |
parent | 2832cf2558095854bcefe5a4e3690f4921f9f3a6 (diff) |
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.
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370-netgear-rn102.dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370-netgear-rn102.dts | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts index 40e73be31720..8ac2ac1f69cc 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts | |||
@@ -27,6 +27,25 @@ | |||
27 | }; | 27 | }; |
28 | 28 | ||
29 | soc { | 29 | soc { |
30 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 | ||
31 | MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; | ||
32 | |||
33 | pcie-controller { | ||
34 | status = "okay"; | ||
35 | |||
36 | /* Connected to Marvell SATA controller */ | ||
37 | pcie@1,0 { | ||
38 | /* Port 0, Lane 0 */ | ||
39 | status = "okay"; | ||
40 | }; | ||
41 | |||
42 | /* Connected to FL1009 USB 3.0 controller */ | ||
43 | pcie@2,0 { | ||
44 | /* Port 1, Lane 0 */ | ||
45 | status = "okay"; | ||
46 | }; | ||
47 | }; | ||
48 | |||
30 | internal-regs { | 49 | internal-regs { |
31 | serial@12000 { | 50 | serial@12000 { |
32 | clock-frequency = <200000000>; | 51 | clock-frequency = <200000000>; |
@@ -94,22 +113,6 @@ | |||
94 | pwm_polarity = <0>; | 113 | pwm_polarity = <0>; |
95 | }; | 114 | }; |
96 | }; | 115 | }; |
97 | |||
98 | pcie-controller { | ||
99 | status = "okay"; | ||
100 | |||
101 | /* Connected to Marvell SATA controller */ | ||
102 | pcie@1,0 { | ||
103 | /* Port 0, Lane 0 */ | ||
104 | status = "okay"; | ||
105 | }; | ||
106 | |||
107 | /* Connected to FL1009 USB 3.0 controller */ | ||
108 | pcie@2,0 { | ||
109 | /* Port 1, Lane 0 */ | ||
110 | status = "okay"; | ||
111 | }; | ||
112 | }; | ||
113 | }; | 116 | }; |
114 | }; | 117 | }; |
115 | 118 | ||