aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-370-xp.dtsi
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2013-04-12 10:29:08 -0400
committerJason Cooper <jason@lakedaemon.net>2013-04-15 11:00:21 -0400
commit82a682676ce34e59369f60168a8729348aaae4d0 (patch)
tree4981ab52ed82202ccf6b2bce1e2d80dabaf2cc95 /arch/arm/boot/dts/armada-370-xp.dtsi
parentb18ea4dc7746f1270bbe3a0817f9a034eec031a8 (diff)
ARM: dts: mvebu: Convert all the mvebu files to use the range property
This conversion will allow to keep 32 bits addresses for the internal registers whereas the memory of the system will be 64 bits. Later it will also ease the move of the mvebu-mbus driver to the device tree support. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370-xp.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi99
1 files changed, 50 insertions, 49 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 972448c4880c..da40ce5711b3 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -28,54 +28,55 @@
28 }; 28 };
29 }; 29 };
30 30
31
31 soc { 32 soc {
32 #address-cells = <1>; 33 #address-cells = <1>;
33 #size-cells = <1>; 34 #size-cells = <1>;
34 compatible = "simple-bus"; 35 compatible = "simple-bus";
35 interrupt-parent = <&mpic>; 36 interrupt-parent = <&mpic>;
36 ranges; 37 ranges = <0 0xd0000000 0x100000>;
37 38
38 mpic: interrupt-controller@d0020000 { 39 mpic: interrupt-controller@20000 {
39 compatible = "marvell,mpic"; 40 compatible = "marvell,mpic";
40 #interrupt-cells = <1>; 41 #interrupt-cells = <1>;
41 #size-cells = <1>; 42 #size-cells = <1>;
42 interrupt-controller; 43 interrupt-controller;
43 }; 44 };
44 45
45 coherency-fabric@d0020200 { 46 coherency-fabric@20200 {
46 compatible = "marvell,coherency-fabric"; 47 compatible = "marvell,coherency-fabric";
47 reg = <0xd0020200 0xb0>, 48 reg = <0x20200 0xb0>,
48 <0xd0021810 0x1c>; 49 <0x21810 0x1c>;
49 }; 50 };
50 51
51 serial@d0012000 { 52 serial@12000 {
52 compatible = "snps,dw-apb-uart"; 53 compatible = "snps,dw-apb-uart";
53 reg = <0xd0012000 0x100>; 54 reg = <0x12000 0x100>;
54 reg-shift = <2>; 55 reg-shift = <2>;
55 interrupts = <41>; 56 interrupts = <41>;
56 reg-io-width = <1>; 57 reg-io-width = <1>;
57 status = "disabled"; 58 status = "disabled";
58 }; 59 };
59 serial@d0012100 { 60 serial@12100 {
60 compatible = "snps,dw-apb-uart"; 61 compatible = "snps,dw-apb-uart";
61 reg = <0xd0012100 0x100>; 62 reg = <0x12100 0x100>;
62 reg-shift = <2>; 63 reg-shift = <2>;
63 interrupts = <42>; 64 interrupts = <42>;
64 reg-io-width = <1>; 65 reg-io-width = <1>;
65 status = "disabled"; 66 status = "disabled";
66 }; 67 };
67 68
68 timer@d0020300 { 69 timer@20300 {
69 compatible = "marvell,armada-370-xp-timer"; 70 compatible = "marvell,armada-370-xp-timer";
70 reg = <0xd0020300 0x30>, 71 reg = <0x20300 0x30>,
71 <0xd0021040 0x30>; 72 <0x21040 0x30>;
72 interrupts = <37>, <38>, <39>, <40>, <5>, <6>; 73 interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
73 clocks = <&coreclk 2>; 74 clocks = <&coreclk 2>;
74 }; 75 };
75 76
76 sata@d00a0000 { 77 sata@a0000 {
77 compatible = "marvell,orion-sata"; 78 compatible = "marvell,orion-sata";
78 reg = <0xd00a0000 0x2400>; 79 reg = <0xa0000 0x2400>;
79 interrupts = <55>; 80 interrupts = <55>;
80 clocks = <&gateclk 15>, <&gateclk 30>; 81 clocks = <&gateclk 15>, <&gateclk 30>;
81 clock-names = "0", "1"; 82 clock-names = "0", "1";
@@ -86,28 +87,28 @@
86 #address-cells = <1>; 87 #address-cells = <1>;
87 #size-cells = <0>; 88 #size-cells = <0>;
88 compatible = "marvell,orion-mdio"; 89 compatible = "marvell,orion-mdio";
89 reg = <0xd0072004 0x4>; 90 reg = <0x72004 0x4>;
90 }; 91 };
91 92
92 ethernet@d0070000 { 93 ethernet@70000 {
93 compatible = "marvell,armada-370-neta"; 94 compatible = "marvell,armada-370-neta";
94 reg = <0xd0070000 0x2500>; 95 reg = <0x70000 0x2500>;
95 interrupts = <8>; 96 interrupts = <8>;
96 clocks = <&gateclk 4>; 97 clocks = <&gateclk 4>;
97 status = "disabled"; 98 status = "disabled";
98 }; 99 };
99 100
100 ethernet@d0074000 { 101 ethernet@74000 {
101 compatible = "marvell,armada-370-neta"; 102 compatible = "marvell,armada-370-neta";
102 reg = <0xd0074000 0x2500>; 103 reg = <0x74000 0x2500>;
103 interrupts = <10>; 104 interrupts = <10>;
104 clocks = <&gateclk 3>; 105 clocks = <&gateclk 3>;
105 status = "disabled"; 106 status = "disabled";
106 }; 107 };
107 108
108 i2c0: i2c@d0011000 { 109 i2c0: i2c@11000 {
109 compatible = "marvell,mv64xxx-i2c"; 110 compatible = "marvell,mv64xxx-i2c";
110 reg = <0xd0011000 0x20>; 111 reg = <0x11000 0x20>;
111 #address-cells = <1>; 112 #address-cells = <1>;
112 #size-cells = <0>; 113 #size-cells = <0>;
113 interrupts = <31>; 114 interrupts = <31>;
@@ -116,9 +117,9 @@
116 status = "disabled"; 117 status = "disabled";
117 }; 118 };
118 119
119 i2c1: i2c@d0011100 { 120 i2c1: i2c@11100 {
120 compatible = "marvell,mv64xxx-i2c"; 121 compatible = "marvell,mv64xxx-i2c";
121 reg = <0xd0011100 0x20>; 122 reg = <0x11100 0x20>;
122 #address-cells = <1>; 123 #address-cells = <1>;
123 #size-cells = <0>; 124 #size-cells = <0>;
124 interrupts = <32>; 125 interrupts = <32>;
@@ -129,35 +130,35 @@
129 130
130 rtc@10300 { 131 rtc@10300 {
131 compatible = "marvell,orion-rtc"; 132 compatible = "marvell,orion-rtc";
132 reg = <0xd0010300 0x20>; 133 reg = <0x10300 0x20>;
133 interrupts = <50>; 134 interrupts = <50>;
134 }; 135 };
135 136
136 mvsdio@d00d4000 { 137 mvsdio@d4000 {
137 compatible = "marvell,orion-sdio"; 138 compatible = "marvell,orion-sdio";
138 reg = <0xd00d4000 0x200>; 139 reg = <0xd4000 0x200>;
139 interrupts = <54>; 140 interrupts = <54>;
140 clocks = <&gateclk 17>; 141 clocks = <&gateclk 17>;
141 status = "disabled"; 142 status = "disabled";
142 }; 143 };
143 144
144 usb@d0050000 { 145 usb@50000 {
145 compatible = "marvell,orion-ehci"; 146 compatible = "marvell,orion-ehci";
146 reg = <0xd0050000 0x500>; 147 reg = <0x50000 0x500>;
147 interrupts = <45>; 148 interrupts = <45>;
148 status = "disabled"; 149 status = "disabled";
149 }; 150 };
150 151
151 usb@d0051000 { 152 usb@51000 {
152 compatible = "marvell,orion-ehci"; 153 compatible = "marvell,orion-ehci";
153 reg = <0xd0051000 0x500>; 154 reg = <0x51000 0x500>;
154 interrupts = <46>; 155 interrupts = <46>;
155 status = "disabled"; 156 status = "disabled";
156 }; 157 };
157 158
158 spi0: spi@d0010600 { 159 spi0: spi@10600 {
159 compatible = "marvell,orion-spi"; 160 compatible = "marvell,orion-spi";
160 reg = <0xd0010600 0x28>; 161 reg = <0x10600 0x28>;
161 #address-cells = <1>; 162 #address-cells = <1>;
162 #size-cells = <0>; 163 #size-cells = <0>;
163 cell-index = <0>; 164 cell-index = <0>;
@@ -166,9 +167,9 @@
166 status = "disabled"; 167 status = "disabled";
167 }; 168 };
168 169
169 spi1: spi@d0010680 { 170 spi1: spi@10680 {
170 compatible = "marvell,orion-spi"; 171 compatible = "marvell,orion-spi";
171 reg = <0xd0010680 0x28>; 172 reg = <0x10680 0x28>;
172 #address-cells = <1>; 173 #address-cells = <1>;
173 #size-cells = <0>; 174 #size-cells = <0>;
174 cell-index = <1>; 175 cell-index = <1>;
@@ -177,45 +178,45 @@
177 status = "disabled"; 178 status = "disabled";
178 }; 179 };
179 180
180 devbus-bootcs@d0010400 { 181 devbus-bootcs@10400 {
181 compatible = "marvell,mvebu-devbus"; 182 compatible = "marvell,mvebu-devbus";
182 reg = <0xd0010400 0x8>; 183 reg = <0x10400 0x8>;
183 #address-cells = <1>; 184 #address-cells = <1>;
184 #size-cells = <1>; 185 #size-cells = <1>;
185 clocks = <&coreclk 0>; 186 clocks = <&coreclk 0>;
186 status = "disabled"; 187 status = "disabled";
187 }; 188 };
188 189
189 devbus-cs0@d0010408 { 190 devbus-cs0@10408 {
190 compatible = "marvell,mvebu-devbus"; 191 compatible = "marvell,mvebu-devbus";
191 reg = <0xd0010408 0x8>; 192 reg = <0x10408 0x8>;
192 #address-cells = <1>; 193 #address-cells = <1>;
193 #size-cells = <1>; 194 #size-cells = <1>;
194 clocks = <&coreclk 0>; 195 clocks = <&coreclk 0>;
195 status = "disabled"; 196 status = "disabled";
196 }; 197 };
197 198
198 devbus-cs1@d0010410 { 199 devbus-cs1@10410 {
199 compatible = "marvell,mvebu-devbus"; 200 compatible = "marvell,mvebu-devbus";
200 reg = <0xd0010410 0x8>; 201 reg = <0x10410 0x8>;
201 #address-cells = <1>; 202 #address-cells = <1>;
202 #size-cells = <1>; 203 #size-cells = <1>;
203 clocks = <&coreclk 0>; 204 clocks = <&coreclk 0>;
204 status = "disabled"; 205 status = "disabled";
205 }; 206 };
206 207
207 devbus-cs2@d0010418 { 208 devbus-cs2@10418 {
208 compatible = "marvell,mvebu-devbus"; 209 compatible = "marvell,mvebu-devbus";
209 reg = <0xd0010418 0x8>; 210 reg = <0x10418 0x8>;
210 #address-cells = <1>; 211 #address-cells = <1>;
211 #size-cells = <1>; 212 #size-cells = <1>;
212 clocks = <&coreclk 0>; 213 clocks = <&coreclk 0>;
213 status = "disabled"; 214 status = "disabled";
214 }; 215 };
215 216
216 devbus-cs3@d0010420 { 217 devbus-cs3@10420 {
217 compatible = "marvell,mvebu-devbus"; 218 compatible = "marvell,mvebu-devbus";
218 reg = <0xd0010420 0x8>; 219 reg = <0x10420 0x8>;
219 #address-cells = <1>; 220 #address-cells = <1>;
220 #size-cells = <1>; 221 #size-cells = <1>;
221 clocks = <&coreclk 0>; 222 clocks = <&coreclk 0>;