Skip to content

Commit 82a6826

Browse files
gclementJason Cooper
authored andcommitted
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
1 parent b18ea4d commit 82a6826

12 files changed

+245
-242
lines changed

arch/arm/boot/dts/armada-370-db.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
};
3131

3232
soc {
33-
serial@d0012000 {
33+
serial@12000 {
3434
clock-frequency = <200000000>;
3535
status = "okay";
3636
};
37-
sata@d00a0000 {
37+
sata@a0000 {
3838
nr-ports = <2>;
3939
status = "okay";
4040
};
@@ -49,18 +49,18 @@
4949
};
5050
};
5151

52-
ethernet@d0070000 {
52+
ethernet@70000 {
5353
status = "okay";
5454
phy = <&phy0>;
5555
phy-mode = "rgmii-id";
5656
};
57-
ethernet@d0074000 {
57+
ethernet@74000 {
5858
status = "okay";
5959
phy = <&phy1>;
6060
phy-mode = "rgmii-id";
6161
};
6262

63-
mvsdio@d00d4000 {
63+
mvsdio@d4000 {
6464
pinctrl-0 = <&sdio_pins1>;
6565
pinctrl-names = "default";
6666
/*
@@ -75,15 +75,15 @@
7575
/* No CD or WP GPIOs */
7676
};
7777

78-
usb@d0050000 {
78+
usb@50000 {
7979
status = "okay";
8080
};
8181

82-
usb@d0051000 {
82+
usb@51000 {
8383
status = "okay";
8484
};
8585

86-
spi0: spi@d0010600 {
86+
spi0: spi@10600 {
8787
status = "okay";
8888

8989
spi-flash@0 {

arch/arm/boot/dts/armada-370-mirabox.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
};
2626

2727
soc {
28-
serial@d0012000 {
28+
serial@12000 {
2929
clock-frequency = <200000000>;
3030
status = "okay";
3131
};
32-
timer@d0020300 {
32+
timer@20300 {
3333
clock-frequency = <600000000>;
3434
status = "okay";
3535
};
@@ -79,18 +79,18 @@
7979
reg = <1>;
8080
};
8181
};
82-
ethernet@d0070000 {
82+
ethernet@70000 {
8383
status = "okay";
8484
phy = <&phy0>;
8585
phy-mode = "rgmii-id";
8686
};
87-
ethernet@d0074000 {
87+
ethernet@74000 {
8888
status = "okay";
8989
phy = <&phy1>;
9090
phy-mode = "rgmii-id";
9191
};
9292

93-
mvsdio@d00d4000 {
93+
mvsdio@d4000 {
9494
pinctrl-0 = <&sdio_pins3>;
9595
pinctrl-names = "default";
9696
status = "okay";
@@ -100,15 +100,15 @@
100100
*/
101101
};
102102

103-
usb@d0050000 {
103+
usb@50000 {
104104
status = "okay";
105105
};
106106

107-
usb@d0051000 {
107+
usb@51000 {
108108
status = "okay";
109109
};
110110

111-
i2c@d0011000 {
111+
i2c@11000 {
112112
status = "okay";
113113
clock-frequency = <100000>;
114114
pca9505: pca9505@25 {

arch/arm/boot/dts/armada-370-rd.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
};
2929

3030
soc {
31-
serial@d0012000 {
31+
serial@12000 {
3232
clock-frequency = <200000000>;
3333
status = "okay";
3434
};
35-
sata@d00a0000 {
35+
sata@a0000 {
3636
nr-ports = <2>;
3737
status = "okay";
3838
};
@@ -47,29 +47,29 @@
4747
};
4848
};
4949

50-
ethernet@d0070000 {
50+
ethernet@70000 {
5151
status = "okay";
5252
phy = <&phy0>;
5353
phy-mode = "sgmii";
5454
};
55-
ethernet@d0074000 {
55+
ethernet@74000 {
5656
status = "okay";
5757
phy = <&phy1>;
5858
phy-mode = "rgmii-id";
5959
};
6060

61-
mvsdio@d00d4000 {
61+
mvsdio@d4000 {
6262
pinctrl-0 = <&sdio_pins1>;
6363
pinctrl-names = "default";
6464
status = "okay";
6565
/* No CD or WP GPIOs */
6666
};
6767

68-
usb@d0050000 {
68+
usb@50000 {
6969
status = "okay";
7070
};
7171

72-
usb@d0051000 {
72+
usb@51000 {
7373
status = "okay";
7474
};
7575
};

arch/arm/boot/dts/armada-370-xp.dtsi

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,55 @@
2828
};
2929
};
3030

31+
3132
soc {
3233
#address-cells = <1>;
3334
#size-cells = <1>;
3435
compatible = "simple-bus";
3536
interrupt-parent = <&mpic>;
36-
ranges;
37+
ranges = <0 0xd0000000 0x100000>;
3738

38-
mpic: interrupt-controller@d0020000 {
39-
compatible = "marvell,mpic";
40-
#interrupt-cells = <1>;
41-
#size-cells = <1>;
42-
interrupt-controller;
39+
mpic: interrupt-controller@20000 {
40+
compatible = "marvell,mpic";
41+
#interrupt-cells = <1>;
42+
#size-cells = <1>;
43+
interrupt-controller;
4344
};
4445

45-
coherency-fabric@d0020200 {
46-
compatible = "marvell,coherency-fabric";
47-
reg = <0xd0020200 0xb0>,
48-
<0xd0021810 0x1c>;
46+
coherency-fabric@20200 {
47+
compatible = "marvell,coherency-fabric";
48+
reg = <0x20200 0xb0>,
49+
<0x21810 0x1c>;
4950
};
5051

51-
serial@d0012000 {
52+
serial@12000 {
5253
compatible = "snps,dw-apb-uart";
53-
reg = <0xd0012000 0x100>;
54+
reg = <0x12000 0x100>;
5455
reg-shift = <2>;
5556
interrupts = <41>;
5657
reg-io-width = <1>;
5758
status = "disabled";
5859
};
59-
serial@d0012100 {
60+
serial@12100 {
6061
compatible = "snps,dw-apb-uart";
61-
reg = <0xd0012100 0x100>;
62+
reg = <0x12100 0x100>;
6263
reg-shift = <2>;
6364
interrupts = <42>;
6465
reg-io-width = <1>;
6566
status = "disabled";
6667
};
6768

68-
timer@d0020300 {
69+
timer@20300 {
6970
compatible = "marvell,armada-370-xp-timer";
70-
reg = <0xd0020300 0x30>,
71-
<0xd0021040 0x30>;
71+
reg = <0x20300 0x30>,
72+
<0x21040 0x30>;
7273
interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
7374
clocks = <&coreclk 2>;
7475
};
7576

76-
sata@d00a0000 {
77+
sata@a0000 {
7778
compatible = "marvell,orion-sata";
78-
reg = <0xd00a0000 0x2400>;
79+
reg = <0xa0000 0x2400>;
7980
interrupts = <55>;
8081
clocks = <&gateclk 15>, <&gateclk 30>;
8182
clock-names = "0", "1";
@@ -86,28 +87,28 @@
8687
#address-cells = <1>;
8788
#size-cells = <0>;
8889
compatible = "marvell,orion-mdio";
89-
reg = <0xd0072004 0x4>;
90+
reg = <0x72004 0x4>;
9091
};
9192

92-
ethernet@d0070000 {
93+
ethernet@70000 {
9394
compatible = "marvell,armada-370-neta";
94-
reg = <0xd0070000 0x2500>;
95+
reg = <0x70000 0x2500>;
9596
interrupts = <8>;
9697
clocks = <&gateclk 4>;
9798
status = "disabled";
9899
};
99100

100-
ethernet@d0074000 {
101+
ethernet@74000 {
101102
compatible = "marvell,armada-370-neta";
102-
reg = <0xd0074000 0x2500>;
103+
reg = <0x74000 0x2500>;
103104
interrupts = <10>;
104105
clocks = <&gateclk 3>;
105106
status = "disabled";
106107
};
107108

108-
i2c0: i2c@d0011000 {
109+
i2c0: i2c@11000 {
109110
compatible = "marvell,mv64xxx-i2c";
110-
reg = <0xd0011000 0x20>;
111+
reg = <0x11000 0x20>;
111112
#address-cells = <1>;
112113
#size-cells = <0>;
113114
interrupts = <31>;
@@ -116,9 +117,9 @@
116117
status = "disabled";
117118
};
118119

119-
i2c1: i2c@d0011100 {
120+
i2c1: i2c@11100 {
120121
compatible = "marvell,mv64xxx-i2c";
121-
reg = <0xd0011100 0x20>;
122+
reg = <0x11100 0x20>;
122123
#address-cells = <1>;
123124
#size-cells = <0>;
124125
interrupts = <32>;
@@ -129,35 +130,35 @@
129130

130131
rtc@10300 {
131132
compatible = "marvell,orion-rtc";
132-
reg = <0xd0010300 0x20>;
133+
reg = <0x10300 0x20>;
133134
interrupts = <50>;
134135
};
135136

136-
mvsdio@d00d4000 {
137+
mvsdio@d4000 {
137138
compatible = "marvell,orion-sdio";
138-
reg = <0xd00d4000 0x200>;
139+
reg = <0xd4000 0x200>;
139140
interrupts = <54>;
140141
clocks = <&gateclk 17>;
141142
status = "disabled";
142143
};
143144

144-
usb@d0050000 {
145+
usb@50000 {
145146
compatible = "marvell,orion-ehci";
146-
reg = <0xd0050000 0x500>;
147+
reg = <0x50000 0x500>;
147148
interrupts = <45>;
148149
status = "disabled";
149150
};
150151

151-
usb@d0051000 {
152+
usb@51000 {
152153
compatible = "marvell,orion-ehci";
153-
reg = <0xd0051000 0x500>;
154+
reg = <0x51000 0x500>;
154155
interrupts = <46>;
155156
status = "disabled";
156157
};
157158

158-
spi0: spi@d0010600 {
159+
spi0: spi@10600 {
159160
compatible = "marvell,orion-spi";
160-
reg = <0xd0010600 0x28>;
161+
reg = <0x10600 0x28>;
161162
#address-cells = <1>;
162163
#size-cells = <0>;
163164
cell-index = <0>;
@@ -166,9 +167,9 @@
166167
status = "disabled";
167168
};
168169

169-
spi1: spi@d0010680 {
170+
spi1: spi@10680 {
170171
compatible = "marvell,orion-spi";
171-
reg = <0xd0010680 0x28>;
172+
reg = <0x10680 0x28>;
172173
#address-cells = <1>;
173174
#size-cells = <0>;
174175
cell-index = <1>;
@@ -177,45 +178,45 @@
177178
status = "disabled";
178179
};
179180

180-
devbus-bootcs@d0010400 {
181+
devbus-bootcs@10400 {
181182
compatible = "marvell,mvebu-devbus";
182-
reg = <0xd0010400 0x8>;
183+
reg = <0x10400 0x8>;
183184
#address-cells = <1>;
184185
#size-cells = <1>;
185186
clocks = <&coreclk 0>;
186187
status = "disabled";
187188
};
188189

189-
devbus-cs0@d0010408 {
190+
devbus-cs0@10408 {
190191
compatible = "marvell,mvebu-devbus";
191-
reg = <0xd0010408 0x8>;
192+
reg = <0x10408 0x8>;
192193
#address-cells = <1>;
193194
#size-cells = <1>;
194195
clocks = <&coreclk 0>;
195196
status = "disabled";
196197
};
197198

198-
devbus-cs1@d0010410 {
199+
devbus-cs1@10410 {
199200
compatible = "marvell,mvebu-devbus";
200-
reg = <0xd0010410 0x8>;
201+
reg = <0x10410 0x8>;
201202
#address-cells = <1>;
202203
#size-cells = <1>;
203204
clocks = <&coreclk 0>;
204205
status = "disabled";
205206
};
206207

207-
devbus-cs2@d0010418 {
208+
devbus-cs2@10418 {
208209
compatible = "marvell,mvebu-devbus";
209-
reg = <0xd0010418 0x8>;
210+
reg = <0x10418 0x8>;
210211
#address-cells = <1>;
211212
#size-cells = <1>;
212213
clocks = <&coreclk 0>;
213214
status = "disabled";
214215
};
215216

216-
devbus-cs3@d0010420 {
217+
devbus-cs3@10420 {
217218
compatible = "marvell,mvebu-devbus";
218-
reg = <0xd0010420 0x8>;
219+
reg = <0x10420 0x8>;
219220
#address-cells = <1>;
220221
#size-cells = <1>;
221222
clocks = <&coreclk 0>;

0 commit comments

Comments
 (0)