aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot/dts')
-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.dts44
-rw-r--r--arch/arm/boot/dts/kirkwood-iconnect.dts58
-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.dts62
-rw-r--r--arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts60
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310-common.dtsi86
-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.dtsi31
16 files changed, 418 insertions, 417 deletions
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..066f40f99816 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -51,28 +51,6 @@
51 status = "okay"; 51 status = "okay";
52 nr-ports = <2>; 52 nr-ports = <2>;
53 }; 53 };
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 }; 54 };
77 55
78 gpio_keys { 56 gpio_keys {
@@ -123,6 +101,28 @@
123 101
124}; 102};
125 103
104&nand {
105 status = "okay";
106 pinctrl-0 = <&pmx_nand>;
107 pinctrl-names = "default";
108
109 partition@0 {
110 label = "u-boot";
111 reg = <0x0000000 0x100000>;
112 };
113
114 partition@100000 {
115 label = "uImage";
116 reg = <0x0100000 0x600000>;
117 };
118
119 partition@700000 {
120 label = "root";
121 reg = <0x0700000 0xf900000>;
122 };
123
124};
125
126&mdio { 126&mdio {
127 status = "okay"; 127 status = "okay";
128 128
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index b8150a768547..4a62b206f680 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -82,35 +82,6 @@
82 serial@12000 { 82 serial@12000 {
83 status = "ok"; 83 status = "ok";
84 }; 84 };
85
86 nand@3000000 {
87 status = "okay";
88
89 partition@0 {
90 label = "uboot";
91 reg = <0x0000000 0xc0000>;
92 };
93
94 partition@a0000 {
95 label = "env";
96 reg = <0xa0000 0x20000>;
97 };
98
99 partition@100000 {
100 label = "zImage";
101 reg = <0x100000 0x300000>;
102 };
103
104 partition@540000 {
105 label = "initrd";
106 reg = <0x540000 0x300000>;
107 };
108
109 partition@980000 {
110 label = "boot";
111 reg = <0x980000 0x1f400000>;
112 };
113 };
114 }; 85 };
115 86
116 gpio-leds { 87 gpio-leds {
@@ -179,6 +150,35 @@
179 }; 150 };
180}; 151};
181 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
182&mdio { 182&mdio {
183 status = "okay"; 183 status = "okay";
184 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 26ae24055d85..6c1ec2786e6e 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -95,37 +95,6 @@
95 pinctrl-names = "default"; 95 pinctrl-names = "default";
96 }; 96 };
97 97
98 nand@3000000 {
99 pinctrl-0 = <&pmx_nand>;
100 pinctrl-names = "default";
101 status = "okay";
102
103 partition@0 {
104 label = "uboot";
105 reg = <0x0000000 0x100000>;
106 };
107
108 partition@100000 {
109 label = "env";
110 reg = <0x100000 0x80000>;
111 };
112
113 partition@180000 {
114 label = "fdt";
115 reg = <0x180000 0x80000>;
116 };
117
118 partition@200000 {
119 label = "kernel";
120 reg = <0x200000 0x400000>;
121 };
122
123 partition@600000 {
124 label = "rootfs";
125 reg = <0x600000 0x1fa00000>;
126 };
127 };
128
129 rtc@10300 { 98 rtc@10300 {
130 status = "disabled"; 99 status = "disabled";
131 }; 100 };
@@ -193,6 +162,37 @@
193 }; 162 };
194}; 163};
195 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
196&mdio { 196&mdio {
197 status = "okay"; 197 status = "okay";
198 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 d3a5a0fe4821..e6a102cf424c 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -97,36 +97,6 @@
97 status = "okay"; 97 status = "okay";
98 }; 98 };
99 99
100 nand@3000000 {
101 status = "okay";
102
103 partition@0 {
104 label = "u-boot";
105 reg = <0x0000000 0x180000>;
106 read-only;
107 };
108
109 partition@180000 {
110 label = "u-boot-env";
111 reg = <0x180000 0x20000>;
112 };
113
114 partition@200000 {
115 label = "uImage";
116 reg = <0x0200000 0x600000>;
117 };
118
119 partition@800000 {
120 label = "minirootfs";
121 reg = <0x0800000 0x1000000>;
122 };
123
124 partition@1800000 {
125 label = "jffs2";
126 reg = <0x1800000 0x6800000>;
127 };
128 };
129
130 sata@80000 { 100 sata@80000 {
131 status = "okay"; 101 status = "okay";
132 nr-ports = <2>; 102 nr-ports = <2>;
@@ -207,6 +177,36 @@
207 }; 177 };
208}; 178};
209 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
210&mdio { 210&mdio {
211 status = "okay"; 211 status = "okay";
212 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-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.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 76b16271362a..632b64701ecd 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -45,12 +45,25 @@
45 clocks = <&gate_clk 17>; 45 clocks = <&gate_clk 17>;
46 status = "okay"; 46 status = "okay";
47 }; 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 };
48 }; 62 };
49 63
50 ocp@f1000000 { 64 ocp@f1000000 {
51 compatible = "simple-bus"; 65 compatible = "simple-bus";
52 ranges = <0x00000000 0xf1000000 0x0100000 66 ranges = <0x00000000 0xf1000000 0x0100000>;
53 0xf4000000 0xf4000000 0x0000400>;
54 #address-cells = <1>; 67 #address-cells = <1>;
55 #size-cells = <1>; 68 #size-cells = <1>;
56 69
@@ -206,20 +219,6 @@
206 status = "okay"; 219 status = "okay";
207 }; 220 };
208 221
209 nand@3000000 {
210 #address-cells = <1>;
211 #size-cells = <1>;
212 cle = <0>;
213 ale = <1>;
214 bank-width = <1>;
215 compatible = "marvell,orion-nand";
216 reg = <0xf4000000 0x400>;
217 chip-delay = <25>;
218 /* set partition map and/or chip-delay in board dts */
219 clocks = <&gate_clk 7>;
220 status = "disabled";
221 };
222
223 i2c@11000 { 222 i2c@11000 {
224 compatible = "marvell,mv64xxx-i2c"; 223 compatible = "marvell,mv64xxx-i2c";
225 reg = <0x11000 0x20>; 224 reg = <0x11000 0x20>;
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-23 17:18:50 -0500