aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-10-09 17:11:03 -0400
committerKevin Hilman <khilman@linaro.org>2013-10-09 17:11:13 -0400
commit0398436522b5deff4c1729ac3b47e4a2280e3ee7 (patch)
tree4780add542c0b435c5497753247ffa6d814f44b9
parent3197e4a123d90a2ece9488267a05fcb52766e52d (diff)
parent7837feff0d881835309fced7a7c4b5f32866d632 (diff)
Merge tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper: mvebu dt changes for v3.13 (round 2) - kirkwood - use MBus DT binding for setting up the windows - move crypto and nand underneath the mbus node - ib62x0 has a u-boot env partition - mvebu - add the Armada XP matrix board * tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu: arm: mvebu: add support for the Armada XP Matrix board ARM: kirkwood: ib62x0: add u-boot environment partition ARM: kirkwood: Move the nand node under the mbus node ARM: kirkwood: Move the crypto node under the mbus node ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/armada-xp-matrix.dts75
-rw-r--r--arch/arm/boot/dts/kirkwood-db-88f6281.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-db-88f6282.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-db.dtsi44
-rw-r--r--arch/arm/boot/dts/kirkwood-dnskw.dtsi76
-rw-r--r--arch/arm/boot/dts/kirkwood-dockstar.dts40
-rw-r--r--arch/arm/boot/dts/kirkwood-goflexnet.dts51
-rw-r--r--arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts40
-rw-r--r--arch/arm/boot/dts/kirkwood-ib62x0.dts53
-rw-r--r--arch/arm/boot/dts/kirkwood-iconnect.dts59
-rw-r--r--arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts51
-rw-r--r--arch/arm/boot/dts/kirkwood-km_kirkwood.dts14
-rw-r--r--arch/arm/boot/dts/kirkwood-mplcec4.dts63
-rw-r--r--arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts61
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310-common.dtsi86
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-openblocks_a6.dts74
-rw-r--r--arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi42
-rw-r--r--arch/arm/boot/dts/kirkwood-topkick.dts62
-rw-r--r--arch/arm/boot/dts/kirkwood-ts219-6282.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi57
-rw-r--r--arch/arm/mach-kirkwood/board-dt.c1
23 files changed, 517 insertions, 437 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c4e7fa0d3e67..b9b4b593b9af 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
111 armada-xp-axpwifiap.dtb \ 111 armada-xp-axpwifiap.dtb \
112 armada-xp-db.dtb \ 112 armada-xp-db.dtb \
113 armada-xp-gp.dtb \ 113 armada-xp-gp.dtb \
114 armada-xp-matrix.dtb \
114 armada-xp-openblocks-ax3-4.dtb 115 armada-xp-openblocks-ax3-4.dtb
115dtb-$(CONFIG_ARCH_MXC) += \ 116dtb-$(CONFIG_ARCH_MXC) += \
116 imx25-karo-tx25.dtb \ 117 imx25-karo-tx25.dtb \
diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
new file mode 100644
index 000000000000..e47c49ecd55c
--- /dev/null
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -0,0 +1,75 @@
1/*
2 * Device Tree file for Marvell Armada XP Matrix board
3 *
4 * Copyright (C) 2013 Marvell
5 *
6 * Lior Amsalem <alior@marvell.com>
7 *
8 * This file is licensed under the terms of the GNU General Public
9 * License version 2. This program is licensed "as is" without any
10 * warranty of any kind, whether express or implied.
11 */
12
13/dts-v1/;
14#include "armada-xp-mv78460.dtsi"
15
16/ {
17 model = "Marvell Armada XP Matrix Board";
18 compatible = "marvell,axp-matrix", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
19
20 chosen {
21 bootargs = "console=ttyS0,115200 earlyprintk";
22 };
23
24 memory {
25 device_type = "memory";
26 reg = <0 0x00000000 0 0x80000000>; /* 2 GB */
27 };
28
29 soc {
30 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
31 MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
32
33 internal-regs {
34 serial@12000 {
35 clock-frequency = <250000000>;
36 status = "okay";
37 };
38 serial@12100 {
39 clock-frequency = <250000000>;
40 status = "okay";
41 };
42 serial@12200 {
43 clock-frequency = <250000000>;
44 status = "okay";
45 };
46 serial@12300 {
47 clock-frequency = <250000000>;
48 status = "okay";
49 };
50
51 sata@a0000 {
52 nr-ports = <2>;
53 status = "okay";
54 };
55
56 ethernet@30000 {
57 status = "okay";
58 phy-mode = "sgmii";
59 };
60
61 pcie-controller {
62 status = "okay";
63
64 pcie@1,0 {
65 /* Port 0, Lane 0 */
66 status = "okay";
67 };
68 };
69
70 usb@50000 {
71 status = "okay";
72 };
73 };
74 };
75};
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6281.dts b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
index 72c4b0a0366f..c39dd766c75a 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6281.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
@@ -19,7 +19,6 @@
19 compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood"; 19 compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
20 20
21 mbus { 21 mbus {
22 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
23 pcie-controller { 22 pcie-controller {
24 status = "okay"; 23 status = "okay";
25 24
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
index 36c411d34926..701c6b6cdaa2 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
@@ -19,7 +19,6 @@
19 compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood"; 19 compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
20 20
21 mbus { 21 mbus {
22 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
23 pcie-controller { 22 pcie-controller {
24 status = "okay"; 23 status = "okay";
25 24
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index c0e2a5879174..053aa20fb30f 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -39,28 +39,6 @@
39 status = "ok"; 39 status = "ok";
40 }; 40 };
41 41
42 nand@3000000 {
43 pinctrl-0 = <&pmx_nand>;
44 pinctrl-names = "default";
45 chip-delay = <25>;
46 status = "okay";
47
48 partition@0 {
49 label = "uboot";
50 reg = <0x0 0x100000>;
51 };
52
53 partition@100000 {
54 label = "uImage";
55 reg = <0x100000 0x400000>;
56 };
57
58 partition@500000 {
59 label = "root";
60 reg = <0x500000 0x1fb00000>;
61 };
62 };
63
64 sata@80000 { 42 sata@80000 {
65 nr-ports = <2>; 43 nr-ports = <2>;
66 status = "okay"; 44 status = "okay";
@@ -80,6 +58,28 @@
80 }; 58 };
81}; 59};
82 60
61&nand {
62 pinctrl-0 = <&pmx_nand>;
63 pinctrl-names = "default";
64 chip-delay = <25>;
65 status = "okay";
66
67 partition@0 {
68 label = "uboot";
69 reg = <0x0 0x100000>;
70 };
71
72 partition@100000 {
73 label = "uImage";
74 reg = <0x100000 0x400000>;
75 };
76
77 partition@500000 {
78 label = "root";
79 reg = <0x500000 0x1fb00000>;
80 };
81};
82
83&mdio { 83&mdio {
84 status = "okay"; 84 status = "okay";
85 85
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index d544f77a4ca4..aefa375a550d 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -148,44 +148,6 @@
148 status = "okay"; 148 status = "okay";
149 nr-ports = <2>; 149 nr-ports = <2>;
150 }; 150 };
151
152 nand@3000000 {
153 pinctrl-0 = <&pmx_nand>;
154 pinctrl-names = "default";
155 status = "okay";
156 chip-delay = <35>;
157
158 partition@0 {
159 label = "u-boot";
160 reg = <0x0000000 0x100000>;
161 read-only;
162 };
163
164 partition@100000 {
165 label = "uImage";
166 reg = <0x0100000 0x500000>;
167 };
168
169 partition@600000 {
170 label = "ramdisk";
171 reg = <0x0600000 0x500000>;
172 };
173
174 partition@b00000 {
175 label = "image";
176 reg = <0x0b00000 0x6600000>;
177 };
178
179 partition@7100000 {
180 label = "mini firmware";
181 reg = <0x7100000 0xa00000>;
182 };
183
184 partition@7b00000 {
185 label = "config";
186 reg = <0x7b00000 0x500000>;
187 };
188 };
189 }; 151 };
190 152
191 regulators { 153 regulators {
@@ -220,6 +182,44 @@
220 }; 182 };
221}; 183};
222 184
185&nand {
186 pinctrl-0 = <&pmx_nand>;
187 pinctrl-names = "default";
188 status = "okay";
189 chip-delay = <35>;
190
191 partition@0 {
192 label = "u-boot";
193 reg = <0x0000000 0x100000>;
194 read-only;
195 };
196
197 partition@100000 {
198 label = "uImage";
199 reg = <0x0100000 0x500000>;
200 };
201
202 partition@600000 {
203 label = "ramdisk";
204 reg = <0x0600000 0x500000>;
205 };
206
207 partition@b00000 {
208 label = "image";
209 reg = <0x0b00000 0x6600000>;
210 };
211
212 partition@7100000 {
213 label = "mini firmware";
214 reg = <0x7100000 0xa00000>;
215 };
216
217 partition@7b00000 {
218 label = "config";
219 reg = <0x7b00000 0x500000>;
220 };
221};
222
223&mdio { 223&mdio {
224 status = "okay"; 224 status = "okay";
225 225
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
index 59a2117c35a7..33ff368fbfa5 100644
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -34,26 +34,6 @@
34 serial@12000 { 34 serial@12000 {
35 status = "ok"; 35 status = "ok";
36 }; 36 };
37
38 nand@3000000 {
39 status = "okay";
40
41 partition@0 {
42 label = "u-boot";
43 reg = <0x0000000 0x100000>;
44 read-only;
45 };
46
47 partition@100000 {
48 label = "uImage";
49 reg = <0x0100000 0x400000>;
50 };
51
52 partition@500000 {
53 label = "data";
54 reg = <0x0500000 0xfb00000>;
55 };
56 };
57 }; 37 };
58 gpio-leds { 38 gpio-leds {
59 compatible = "gpio-leds"; 39 compatible = "gpio-leds";
@@ -91,6 +71,26 @@
91 }; 71 };
92}; 72};
93 73
74&nand {
75 status = "okay";
76
77 partition@0 {
78 label = "u-boot";
79 reg = <0x0000000 0x100000>;
80 read-only;
81 };
82
83 partition@100000 {
84 label = "uImage";
85 reg = <0x0100000 0x400000>;
86 };
87
88 partition@500000 {
89 label = "data";
90 reg = <0x0500000 0xfb00000>;
91 };
92};
93
94&mdio { 94&mdio {
95 status = "okay"; 95 status = "okay";
96 96
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index 6f7c7d7ecf2a..a43bebb25110 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -67,31 +67,6 @@
67 status = "ok"; 67 status = "ok";
68 }; 68 };
69 69
70 nand@3000000 {
71 chip-delay = <40>;
72 status = "okay";
73
74 partition@0 {
75 label = "u-boot";
76 reg = <0x0000000 0x100000>;
77 read-only;
78 };
79
80 partition@100000 {
81 label = "uImage";
82 reg = <0x0100000 0x400000>;
83 };
84
85 partition@500000 {
86 label = "pogoplug";
87 reg = <0x0500000 0x2000000>;
88 };
89
90 partition@2500000 {
91 label = "root";
92 reg = <0x02500000 0xd800000>;
93 };
94 };
95 sata@80000 { 70 sata@80000 {
96 status = "okay"; 71 status = "okay";
97 nr-ports = <2>; 72 nr-ports = <2>;
@@ -171,6 +146,32 @@
171 }; 146 };
172}; 147};
173 148
149&nand {
150 chip-delay = <40>;
151 status = "okay";
152
153 partition@0 {
154 label = "u-boot";
155 reg = <0x0000000 0x100000>;
156 read-only;
157 };
158
159 partition@100000 {
160 label = "uImage";
161 reg = <0x0100000 0x400000>;
162 };
163
164 partition@500000 {
165 label = "pogoplug";
166 reg = <0x0500000 0x2000000>;
167 };
168
169 partition@2500000 {
170 label = "root";
171 reg = <0x02500000 0xd800000>;
172 };
173};
174
174&mdio { 175&mdio {
175 status = "okay"; 176 status = "okay";
176 177
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 6548b9dc6855..d30a91a5047d 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -40,26 +40,6 @@
40 status = "ok"; 40 status = "ok";
41 }; 41 };
42 42
43 nand@3000000 {
44 status = "okay";
45
46 partition@0 {
47 label = "u-boot";
48 reg = <0x00000000 0x00100000>;
49 read-only;
50 };
51
52 partition@100000 {
53 label = "uImage";
54 reg = <0x00100000 0x00400000>;
55 };
56
57 partition@500000 {
58 label = "data";
59 reg = <0x00500000 0x1fb00000>;
60 };
61 };
62
63 sata@80000 { 43 sata@80000 {
64 status = "okay"; 44 status = "okay";
65 nr-ports = <1>; 45 nr-ports = <1>;
@@ -97,6 +77,26 @@
97 }; 77 };
98}; 78};
99 79
80&nand {
81 status = "okay";
82
83 partition@0 {
84 label = "u-boot";
85 reg = <0x00000000 0x00100000>;
86 read-only;
87 };
88
89 partition@100000 {
90 label = "uImage";
91 reg = <0x00100000 0x00400000>;
92 };
93
94 partition@500000 {
95 label = "data";
96 reg = <0x00500000 0x1fb00000>;
97 };
98};
99
100&mdio { 100&mdio {
101 status = "okay"; 101 status = "okay";
102 102
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index cb711a3bd983..c5fb02f7ebc3 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -5,7 +5,7 @@
5 5
6/ { 6/ {
7 model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; 7 model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
8 compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood"; 8 compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
9 9
10 memory { 10 memory {
11 device_type = "memory"; 11 device_type = "memory";
@@ -43,6 +43,7 @@
43 marvell,function = "gpio"; 43 marvell,function = "gpio";
44 }; 44 };
45 }; 45 };
46
46 serial@12000 { 47 serial@12000 {
47 status = "okay"; 48 status = "okay";
48 }; 49 };
@@ -51,28 +52,6 @@
51 status = "okay"; 52 status = "okay";
52 nr-ports = <2>; 53 nr-ports = <2>;
53 }; 54 };
54
55 nand@3000000 {
56 status = "okay";
57 pinctrl-0 = <&pmx_nand>;
58 pinctrl-names = "default";
59
60 partition@0 {
61 label = "u-boot";
62 reg = <0x0000000 0x100000>;
63 };
64
65 partition@100000 {
66 label = "uImage";
67 reg = <0x0100000 0x600000>;
68 };
69
70 partition@700000 {
71 label = "root";
72 reg = <0x0700000 0xf900000>;
73 };
74
75 };
76 }; 55 };
77 56
78 gpio_keys { 57 gpio_keys {
@@ -93,6 +72,7 @@
93 gpios = <&gpio0 28 1>; 72 gpios = <&gpio0 28 1>;
94 }; 73 };
95 }; 74 };
75
96 gpio-leds { 76 gpio-leds {
97 compatible = "gpio-leds"; 77 compatible = "gpio-leds";
98 pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green 78 pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green
@@ -113,13 +93,39 @@
113 gpios = <&gpio0 27 0>; 93 gpios = <&gpio0 27 0>;
114 }; 94 };
115 }; 95 };
96
116 gpio_poweroff { 97 gpio_poweroff {
117 compatible = "gpio-poweroff"; 98 compatible = "gpio-poweroff";
118 pinctrl-0 = <&pmx_power_off>; 99 pinctrl-0 = <&pmx_power_off>;
119 pinctrl-names = "default"; 100 pinctrl-names = "default";
120 gpios = <&gpio0 24 0>; 101 gpios = <&gpio0 24 0>;
121 }; 102 };
103};
104
105&nand {
106 status = "okay";
107 pinctrl-0 = <&pmx_nand>;
108 pinctrl-names = "default";
109
110 partition@0 {
111 label = "u-boot";
112 reg = <0x0000000 0xe0000>;
113 };
122 114
115 partition@e0000 {
116 label = "u-boot environment";
117 reg = <0xe0000 0x100000>;
118 };
119
120 partition@100000 {
121 label = "uImage";
122 reg = <0x0100000 0x600000>;
123 };
124
125 partition@700000 {
126 label = "root";
127 reg = <0x0700000 0xf900000>;
128 };
123 129
124}; 130};
125 131
@@ -134,6 +140,7 @@
134 140
135&eth0 { 141&eth0 {
136 status = "okay"; 142 status = "okay";
143
137 ethernet0-port@0 { 144 ethernet0-port@0 {
138 phy-handle = <&ethphy0>; 145 phy-handle = <&ethphy0>;
139 }; 146 };
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 0323f017eeed..4a62b206f680 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -19,7 +19,6 @@
19 }; 19 };
20 20
21 mbus { 21 mbus {
22 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
23 pcie-controller { 22 pcie-controller {
24 status = "okay"; 23 status = "okay";
25 24
@@ -83,35 +82,6 @@
83 serial@12000 { 82 serial@12000 {
84 status = "ok"; 83 status = "ok";
85 }; 84 };
86
87 nand@3000000 {
88 status = "okay";
89
90 partition@0 {
91 label = "uboot";
92 reg = <0x0000000 0xc0000>;
93 };
94
95 partition@a0000 {
96 label = "env";
97 reg = <0xa0000 0x20000>;
98 };
99
100 partition@100000 {
101 label = "zImage";
102 reg = <0x100000 0x300000>;
103 };
104
105 partition@540000 {
106 label = "initrd";
107 reg = <0x540000 0x300000>;
108 };
109
110 partition@980000 {
111 label = "boot";
112 reg = <0x980000 0x1f400000>;
113 };
114 };
115 }; 85 };
116 86
117 gpio-leds { 87 gpio-leds {
@@ -180,6 +150,35 @@
180 }; 150 };
181}; 151};
182 152
153&nand {
154 status = "okay";
155
156 partition@0 {
157 label = "uboot";
158 reg = <0x0000000 0xc0000>;
159 };
160
161 partition@a0000 {
162 label = "env";
163 reg = <0xa0000 0x20000>;
164 };
165
166 partition@100000 {
167 label = "zImage";
168 reg = <0x100000 0x300000>;
169 };
170
171 partition@540000 {
172 label = "initrd";
173 reg = <0x540000 0x300000>;
174 };
175
176 partition@980000 {
177 label = "boot";
178 reg = <0x980000 0x1f400000>;
179 };
180};
181
183&mdio { 182&mdio {
184 status = "okay"; 183 status = "okay";
185 184
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index df8447442b37..d15395d671ed 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -113,31 +113,6 @@
113 status = "ok"; 113 status = "ok";
114 }; 114 };
115 115
116 nand@3000000 {
117 status = "okay";
118
119 partition@0 {
120 label = "u-boot";
121 reg = <0x0000000 0x100000>;
122 read-only;
123 };
124
125 partition@a0000 {
126 label = "env";
127 reg = <0xa0000 0x20000>;
128 read-only;
129 };
130
131 partition@100000 {
132 label = "uImage";
133 reg = <0x100000 0x300000>;
134 };
135
136 partition@400000 {
137 label = "uInitrd";
138 reg = <0x540000 0x1000000>;
139 };
140 };
141 sata@80000 { 116 sata@80000 {
142 status = "okay"; 117 status = "okay";
143 nr-ports = <2>; 118 nr-ports = <2>;
@@ -195,6 +170,32 @@
195 }; 170 };
196}; 171};
197 172
173&nand {
174 status = "okay";
175
176 partition@0 {
177 label = "u-boot";
178 reg = <0x0000000 0x100000>;
179 read-only;
180 };
181
182 partition@a0000 {
183 label = "env";
184 reg = <0xa0000 0x20000>;
185 read-only;
186 };
187
188 partition@100000 {
189 label = "uImage";
190 reg = <0x100000 0x300000>;
191 };
192
193 partition@400000 {
194 label = "uInitrd";
195 reg = <0x540000 0x1000000>;
196 };
197};
198
198&mdio { 199&mdio {
199 status = "okay"; 200 status = "okay";
200 201
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 6899408482d2..cd44f37e54b5 100644
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -34,13 +34,6 @@
34 serial@12000 { 34 serial@12000 {
35 status = "ok"; 35 status = "ok";
36 }; 36 };
37
38 nand@3000000 {
39 pinctrl-0 = <&pmx_nand>;
40 pinctrl-names = "default";
41 status = "ok";
42 chip-delay = <25>;
43 };
44 }; 37 };
45 38
46 i2c@0 { 39 i2c@0 {
@@ -51,6 +44,13 @@
51 }; 44 };
52}; 45};
53 46
47&nand {
48 pinctrl-0 = <&pmx_nand>;
49 pinctrl-names = "default";
50 status = "ok";
51 chip-delay = <25>;
52};
53
54&mdio { 54&mdio {
55 status = "okay"; 55 status = "okay";
56 56
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index ce2b94b513db..6c1ec2786e6e 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -17,7 +17,6 @@
17 }; 17 };
18 18
19 mbus { 19 mbus {
20 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
21 pcie-controller { 20 pcie-controller {
22 status = "okay"; 21 status = "okay";
23 22
@@ -96,37 +95,6 @@
96 pinctrl-names = "default"; 95 pinctrl-names = "default";
97 }; 96 };
98 97
99 nand@3000000 {
100 pinctrl-0 = <&pmx_nand>;
101 pinctrl-names = "default";
102 status = "okay";
103
104 partition@0 {
105 label = "uboot";
106 reg = <0x0000000 0x100000>;
107 };
108
109 partition@100000 {
110 label = "env";
111 reg = <0x100000 0x80000>;
112 };
113
114 partition@180000 {
115 label = "fdt";
116 reg = <0x180000 0x80000>;
117 };
118
119 partition@200000 {
120 label = "kernel";
121 reg = <0x200000 0x400000>;
122 };
123
124 partition@600000 {
125 label = "rootfs";
126 reg = <0x600000 0x1fa00000>;
127 };
128 };
129
130 rtc@10300 { 98 rtc@10300 {
131 status = "disabled"; 99 status = "disabled";
132 }; 100 };
@@ -194,6 +162,37 @@
194 }; 162 };
195}; 163};
196 164
165&nand {
166 pinctrl-0 = <&pmx_nand>;
167 pinctrl-names = "default";
168 status = "okay";
169
170 partition@0 {
171 label = "uboot";
172 reg = <0x0000000 0x100000>;
173 };
174
175 partition@100000 {
176 label = "env";
177 reg = <0x100000 0x80000>;
178 };
179
180 partition@180000 {
181 label = "fdt";
182 reg = <0x180000 0x80000>;
183 };
184
185 partition@200000 {
186 label = "kernel";
187 reg = <0x200000 0x400000>;
188 };
189
190 partition@600000 {
191 label = "rootfs";
192 reg = <0x600000 0x1fa00000>;
193 };
194};
195
197&mdio { 196&mdio {
198 status = "okay"; 197 status = "okay";
199 198
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 874857ea9cb8..e6a102cf424c 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -17,7 +17,6 @@
17 }; 17 };
18 18
19 mbus { 19 mbus {
20 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
21 pcie-controller { 20 pcie-controller {
22 status = "okay"; 21 status = "okay";
23 22
@@ -98,36 +97,6 @@
98 status = "okay"; 97 status = "okay";
99 }; 98 };
100 99
101 nand@3000000 {
102 status = "okay";
103
104 partition@0 {
105 label = "u-boot";
106 reg = <0x0000000 0x180000>;
107 read-only;
108 };
109
110 partition@180000 {
111 label = "u-boot-env";
112 reg = <0x180000 0x20000>;
113 };
114
115 partition@200000 {
116 label = "uImage";
117 reg = <0x0200000 0x600000>;
118 };
119
120 partition@800000 {
121 label = "minirootfs";
122 reg = <0x0800000 0x1000000>;
123 };
124
125 partition@1800000 {
126 label = "jffs2";
127 reg = <0x1800000 0x6800000>;
128 };
129 };
130
131 sata@80000 { 100 sata@80000 {
132 status = "okay"; 101 status = "okay";
133 nr-ports = <2>; 102 nr-ports = <2>;
@@ -208,6 +177,36 @@
208 }; 177 };
209}; 178};
210 179
180&nand {
181 status = "okay";
182
183 partition@0 {
184 label = "u-boot";
185 reg = <0x0000000 0x180000>;
186 read-only;
187 };
188
189 partition@180000 {
190 label = "u-boot-env";
191 reg = <0x180000 0x20000>;
192 };
193
194 partition@200000 {
195 label = "uImage";
196 reg = <0x0200000 0x600000>;
197 };
198
199 partition@800000 {
200 label = "minirootfs";
201 reg = <0x0800000 0x1000000>;
202 };
203
204 partition@1800000 {
205 label = "jffs2";
206 reg = <0x1800000 0x6800000>;
207 };
208};
209
211&mdio { 210&mdio {
212 status = "okay"; 211 status = "okay";
213 212
diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
index 06267a91de38..e3f915defd3d 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
@@ -27,49 +27,6 @@
27 nr-ports = <2>; 27 nr-ports = <2>;
28 }; 28 };
29 29
30 nand@3000000 {
31 status = "okay";
32 chip-delay = <35>;
33
34 partition@0 {
35 label = "uboot";
36 reg = <0x0000000 0x0100000>;
37 read-only;
38 };
39 partition@100000 {
40 label = "uboot_env";
41 reg = <0x0100000 0x0080000>;
42 };
43 partition@180000 {
44 label = "key_store";
45 reg = <0x0180000 0x0080000>;
46 };
47 partition@200000 {
48 label = "info";
49 reg = <0x0200000 0x0080000>;
50 };
51 partition@280000 {
52 label = "etc";
53 reg = <0x0280000 0x0a00000>;
54 };
55 partition@c80000 {
56 label = "kernel_1";
57 reg = <0x0c80000 0x0a00000>;
58 };
59 partition@1680000 {
60 label = "rootfs1";
61 reg = <0x1680000 0x2fc0000>;
62 };
63 partition@4640000 {
64 label = "kernel_2";
65 reg = <0x4640000 0x0a00000>;
66 };
67 partition@5040000 {
68 label = "rootfs2";
69 reg = <0x5040000 0x2fc0000>;
70 };
71 };
72
73 pcie-controller { 30 pcie-controller {
74 status = "okay"; 31 status = "okay";
75 32
@@ -105,3 +62,46 @@
105 }; 62 };
106 }; 63 };
107}; 64};
65
66&nand {
67 status = "okay";
68 chip-delay = <35>;
69
70 partition@0 {
71 label = "uboot";
72 reg = <0x0000000 0x0100000>;
73 read-only;
74 };
75 partition@100000 {
76 label = "uboot_env";
77 reg = <0x0100000 0x0080000>;
78 };
79 partition@180000 {
80 label = "key_store";
81 reg = <0x0180000 0x0080000>;
82 };
83 partition@200000 {
84 label = "info";
85 reg = <0x0200000 0x0080000>;
86 };
87 partition@280000 {
88 label = "etc";
89 reg = <0x0280000 0x0a00000>;
90 };
91 partition@c80000 {
92 label = "kernel_1";
93 reg = <0x0c80000 0x0a00000>;
94 };
95 partition@1680000 {
96 label = "rootfs1";
97 reg = <0x1680000 0x2fc0000>;
98 };
99 partition@4640000 {
100 label = "kernel_2";
101 reg = <0x4640000 0x0a00000>;
102 };
103 partition@5040000 {
104 label = "rootfs2";
105 reg = <0x5040000 0x2fc0000>;
106 };
107};
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 7aeae0c2c1f4..b5418bcaecce 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -15,7 +15,6 @@
15 }; 15 };
16 16
17 mbus { 17 mbus {
18 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
19 pcie-controller { 18 pcie-controller {
20 status = "okay"; 19 status = "okay";
21 20
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 85ccf8d8abb1..f0e3d213604c 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -29,43 +29,6 @@
29 pinctrl-names = "default"; 29 pinctrl-names = "default";
30 }; 30 };
31 31
32 nand@3000000 {
33 chip-delay = <25>;
34 status = "okay";
35 pinctrl-0 = <&pmx_nand>;
36 pinctrl-names = "default";
37
38 partition@0 {
39 label = "uboot";
40 reg = <0x0 0x90000>;
41 };
42
43 partition@90000 {
44 label = "env";
45 reg = <0x90000 0x44000>;
46 };
47
48 partition@d4000 {
49 label = "test";
50 reg = <0xd4000 0x24000>;
51 };
52
53 partition@f4000 {
54 label = "conf";
55 reg = <0xf4000 0x400000>;
56 };
57
58 partition@4f4000 {
59 label = "linux";
60 reg = <0x4f4000 0x1d20000>;
61 };
62
63 partition@2214000 {
64 label = "user";
65 reg = <0x2214000 0x1dec000>;
66 };
67 };
68
69 sata@80000 { 32 sata@80000 {
70 nr-ports = <1>; 33 nr-ports = <1>;
71 status = "okay"; 34 status = "okay";
@@ -167,6 +130,43 @@
167 }; 130 };
168}; 131};
169 132
133&nand {
134 chip-delay = <25>;
135 status = "okay";
136 pinctrl-0 = <&pmx_nand>;
137 pinctrl-names = "default";
138
139 partition@0 {
140 label = "uboot";
141 reg = <0x0 0x90000>;
142 };
143
144 partition@90000 {
145 label = "env";
146 reg = <0x90000 0x44000>;
147 };
148
149 partition@d4000 {
150 label = "test";
151 reg = <0xd4000 0x24000>;
152 };
153
154 partition@f4000 {
155 label = "conf";
156 reg = <0xf4000 0x400000>;
157 };
158
159 partition@4f4000 {
160 label = "linux";
161 reg = <0x4f4000 0x1d20000>;
162 };
163
164 partition@2214000 {
165 label = "user";
166 reg = <0x2214000 0x1dec000>;
167 };
168};
169
170&mdio { 170&mdio {
171 status = "okay"; 171 status = "okay";
172 172
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index 5696b630b70b..1173d7fb31b2 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -48,27 +48,6 @@
48 pinctrl-names = "default"; 48 pinctrl-names = "default";
49 status = "okay"; 49 status = "okay";
50 }; 50 };
51
52 nand@3000000 {
53 pinctrl-0 = <&pmx_nand>;
54 pinctrl-names = "default";
55 status = "okay";
56
57 partition@0 {
58 label = "u-boot";
59 reg = <0x0000000 0x100000>;
60 };
61
62 partition@100000 {
63 label = "uImage";
64 reg = <0x0100000 0x400000>;
65 };
66
67 partition@500000 {
68 label = "root";
69 reg = <0x0500000 0x1fb00000>;
70 };
71 };
72 }; 51 };
73 52
74 regulators { 53 regulators {
@@ -92,6 +71,27 @@
92 }; 71 };
93}; 72};
94 73
74&nand {
75 pinctrl-0 = <&pmx_nand>;
76 pinctrl-names = "default";
77 status = "okay";
78
79 partition@0 {
80 label = "u-boot";
81 reg = <0x0000000 0x100000>;
82 };
83
84 partition@100000 {
85 label = "uImage";
86 reg = <0x0100000 0x400000>;
87 };
88
89 partition@500000 {
90 label = "root";
91 reg = <0x0500000 0x1fb00000>;
92 };
93};
94
95&mdio { 95&mdio {
96 status = "okay"; 96 status = "okay";
97 97
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 30842b4ff293..320da677b984 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -90,37 +90,6 @@
90 pinctrl-names = "default"; 90 pinctrl-names = "default";
91 }; 91 };
92 92
93 nand@3000000 {
94 status = "okay";
95 pinctrl-0 = <&pmx_nand>;
96 pinctrl-names = "default";
97
98 partition@0 {
99 label = "u-boot";
100 reg = <0x0000000 0x180000>;
101 };
102
103 partition@180000 {
104 label = "u-boot env";
105 reg = <0x0180000 0x20000>;
106 };
107
108 partition@200000 {
109 label = "uImage";
110 reg = <0x0200000 0x600000>;
111 };
112
113 partition@800000 {
114 label = "uInitrd";
115 reg = <0x0800000 0x1000000>;
116 };
117
118 partition@1800000 {
119 label = "rootfs";
120 reg = <0x1800000 0xe800000>;
121 };
122 };
123
124 sata@80000 { 93 sata@80000 {
125 status = "okay"; 94 status = "okay";
126 nr-ports = <1>; 95 nr-ports = <1>;
@@ -204,6 +173,37 @@
204 }; 173 };
205}; 174};
206 175
176&nand {
177 status = "okay";
178 pinctrl-0 = <&pmx_nand>;
179 pinctrl-names = "default";
180
181 partition@0 {
182 label = "u-boot";
183 reg = <0x0000000 0x180000>;
184 };
185
186 partition@180000 {
187 label = "u-boot env";
188 reg = <0x0180000 0x20000>;
189 };
190
191 partition@200000 {
192 label = "uImage";
193 reg = <0x0200000 0x600000>;
194 };
195
196 partition@800000 {
197 label = "uInitrd";
198 reg = <0x0800000 0x1000000>;
199 };
200
201 partition@1800000 {
202 label = "rootfs";
203 reg = <0x1800000 0xe800000>;
204 };
205};
206
207&mdio { 207&mdio {
208 status = "okay"; 208 status = "okay";
209 209
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index 9efcd2dc79d3..345562f75891 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -6,7 +6,6 @@
6 6
7/ { 7/ {
8 mbus { 8 mbus {
9 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
10 pcie-controller { 9 pcie-controller {
11 status = "okay"; 10 status = "okay";
12 11
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index cf7aeaf89e9c..632b64701ecd 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -27,16 +27,43 @@
27 compatible = "marvell,kirkwood-mbus", "simple-bus"; 27 compatible = "marvell,kirkwood-mbus", "simple-bus";
28 #address-cells = <2>; 28 #address-cells = <2>;
29 #size-cells = <1>; 29 #size-cells = <1>;
30 /* If a board file needs to change this ranges it must replace it completely */
31 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 /* internal-regs */
32 MBUS_ID(0x01, 0x2f) 0 0xf4000000 0x10000 /* nand flash */
33 MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000 /* crypto sram */
34 >;
30 controller = <&mbusc>; 35 controller = <&mbusc>;
31 pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */ 36 pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
32 pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */ 37 pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */
38
39 crypto@0301 {
40 compatible = "marvell,orion-crypto";
41 reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>,
42 <MBUS_ID(0x03, 0x01) 0 0x800>;
43 reg-names = "regs", "sram";
44 interrupts = <22>;
45 clocks = <&gate_clk 17>;
46 status = "okay";
47 };
48
49 nand: nand@012f {
50 #address-cells = <1>;
51 #size-cells = <1>;
52 cle = <0>;
53 ale = <1>;
54 bank-width = <1>;
55 compatible = "marvell,orion-nand";
56 reg = <MBUS_ID(0x01, 0x2f) 0 0x400>;
57 chip-delay = <25>;
58 /* set partition map and/or chip-delay in board dts */
59 clocks = <&gate_clk 7>;
60 status = "disabled";
61 };
33 }; 62 };
34 63
35 ocp@f1000000 { 64 ocp@f1000000 {
36 compatible = "simple-bus"; 65 compatible = "simple-bus";
37 ranges = <0x00000000 0xf1000000 0x0100000 66 ranges = <0x00000000 0xf1000000 0x0100000>;
38 0xf4000000 0xf4000000 0x0000400
39 0xf5000000 0xf5000000 0x0000400>;
40 #address-cells = <1>; 67 #address-cells = <1>;
41 #size-cells = <1>; 68 #size-cells = <1>;
42 69
@@ -192,20 +219,6 @@
192 status = "okay"; 219 status = "okay";
193 }; 220 };
194 221
195 nand@3000000 {
196 #address-cells = <1>;
197 #size-cells = <1>;
198 cle = <0>;
199 ale = <1>;
200 bank-width = <1>;
201 compatible = "marvell,orion-nand";
202 reg = <0xf4000000 0x400>;
203 chip-delay = <25>;
204 /* set partition map and/or chip-delay in board dts */
205 clocks = <&gate_clk 7>;
206 status = "disabled";
207 };
208
209 i2c@11000 { 222 i2c@11000 {
210 compatible = "marvell,mv64xxx-i2c"; 223 compatible = "marvell,mv64xxx-i2c";
211 reg = <0x11000 0x20>; 224 reg = <0x11000 0x20>;
@@ -217,16 +230,6 @@
217 status = "disabled"; 230 status = "disabled";
218 }; 231 };
219 232
220 crypto@30000 {
221 compatible = "marvell,orion-crypto";
222 reg = <0x30000 0x10000>,
223 <0xf5000000 0x800>;
224 reg-names = "regs", "sram";
225 interrupts = <22>;
226 clocks = <&gate_clk 17>;
227 status = "okay";
228 };
229
230 mdio: mdio-bus@72004 { 233 mdio: mdio-bus@72004 {
231 compatible = "marvell,orion-mdio"; 234 compatible = "marvell,orion-mdio";
232 #address-cells = <1>; 235 #address-cells = <1>;
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 82d3ad8e87cf..f087b5f22425 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -92,7 +92,6 @@ static void __init kirkwood_dt_init(void)
92 writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG); 92 writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);
93 93
94 BUG_ON(mvebu_mbus_dt_init()); 94 BUG_ON(mvebu_mbus_dt_init());
95 kirkwood_setup_wins();
96 95
97 kirkwood_l2_init(); 96 kirkwood_l2_init();
98 97
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-26 10:04:20 -0400