aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-11 19:06:32 -0400
committerPaul Mackerras <paulus@samba.org>2007-10-11 19:06:32 -0400
commit8087ebd5a121ac6bf5a8eba2459c01d3659c3e31 (patch)
tree31394658c138dcb130a229af03e3beefca8db642 /arch/powerpc/boot
parent895532a166010d8d8b4d58d63d21012eced22492 (diff)
parent4d9e55103aec1ba7d0617cfd88412ec39e1e2d32 (diff)
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.24
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/dts/mpc8272ads.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc8541cds.dts36
-rw-r--r--arch/powerpc/boot/dts/mpc8555cds.dts36
-rw-r--r--arch/powerpc/boot/dts/mpc8560ads.dts82
4 files changed, 117 insertions, 39 deletions
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 188179df0845..7285ca1325fd 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -121,7 +121,7 @@
121 #address-cells = <1>; 121 #address-cells = <1>;
122 #size-cells = <1>; 122 #size-cells = <1>;
123 compatible = "fsl,mpc8272-cpm", "fsl,cpm2"; 123 compatible = "fsl,mpc8272-cpm", "fsl,cpm2";
124 reg = <119c0 30 0 2000>; 124 reg = <119c0 30>;
125 ranges; 125 ranges;
126 126
127 muram@0 { 127 muram@0 {
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 6633e07d9f4d..f3f4d79deb63 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -145,6 +145,42 @@
145 device_type = "open-pic"; 145 device_type = "open-pic";
146 big-endian; 146 big-endian;
147 }; 147 };
148
149 cpm@919c0 {
150 #address-cells = <1>;
151 #size-cells = <1>;
152 compatible = "fsl,mpc8541-cpm", "fsl,cpm2";
153 reg = <919c0 30>;
154 ranges;
155
156 muram@80000 {
157 #address-cells = <1>;
158 #size-cells = <1>;
159 ranges = <0 80000 10000>;
160
161 data@0 {
162 compatible = "fsl,cpm-muram-data";
163 reg = <0 2000 9000 1000>;
164 };
165 };
166
167 brg@919f0 {
168 compatible = "fsl,mpc8541-brg",
169 "fsl,cpm2-brg",
170 "fsl,cpm-brg";
171 reg = <919f0 10 915f0 10>;
172 };
173
174 cpmpic: pic@90c00 {
175 interrupt-controller;
176 #address-cells = <0>;
177 #interrupt-cells = <2>;
178 interrupts = <2e 2>;
179 interrupt-parent = <&mpic>;
180 reg = <90c00 80>;
181 compatible = "fsl,mpc8541-cpm-pic", "fsl,cpm2-pic";
182 };
183 };
148 }; 184 };
149 185
150 pci1: pci@e0008000 { 186 pci1: pci@e0008000 {
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 99199295147e..57029cca32b2 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -145,6 +145,42 @@
145 device_type = "open-pic"; 145 device_type = "open-pic";
146 big-endian; 146 big-endian;
147 }; 147 };
148
149 cpm@919c0 {
150 #address-cells = <1>;
151 #size-cells = <1>;
152 compatible = "fsl,mpc8555-cpm", "fsl,cpm2";
153 reg = <919c0 30>;
154 ranges;
155
156 muram@80000 {
157 #address-cells = <1>;
158 #size-cells = <1>;
159 ranges = <0 80000 10000>;
160
161 data@0 {
162 compatible = "fsl,cpm-muram-data";
163 reg = <0 2000 9000 1000>;
164 };
165 };
166
167 brg@919f0 {
168 compatible = "fsl,mpc8555-brg",
169 "fsl,cpm2-brg",
170 "fsl,cpm-brg";
171 reg = <919f0 10 915f0 10>;
172 };
173
174 cpmpic: pic@90c00 {
175 interrupt-controller;
176 #address-cells = <0>;
177 #interrupt-cells = <2>;
178 interrupts = <2e 2>;
179 interrupt-parent = <&mpic>;
180 reg = <90c00 80>;
181 compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
182 };
183 };
148 }; 184 };
149 185
150 pci1: pci@e0008000 { 186 pci1: pci@e0008000 {
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 5577ec1f312b..6b362f8222c1 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -138,15 +138,31 @@
138 device_type = "open-pic"; 138 device_type = "open-pic";
139 }; 139 };
140 140
141 cpm@e0000000 { 141 cpm@919c0 {
142 #address-cells = <1>; 142 #address-cells = <1>;
143 #size-cells = <1>; 143 #size-cells = <1>;
144 device_type = "cpm"; 144 compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
145 model = "CPM2"; 145 reg = <919c0 30>;
146 ranges = <0 0 c0000>; 146 ranges;
147 reg = <80000 40000>; 147
148 command-proc = <919c0>; 148 muram@80000 {
149 brg-frequency = <9d5b340>; 149 #address-cells = <1>;
150 #size-cells = <1>;
151 ranges = <0 80000 10000>;
152
153 data@0 {
154 compatible = "fsl,cpm-muram-data";
155 reg = <0 4000 9000 2000>;
156 };
157 };
158
159 brg@919f0 {
160 compatible = "fsl,mpc8560-brg",
161 "fsl,cpm2-brg",
162 "fsl,cpm-brg";
163 reg = <919f0 10 915f0 10>;
164 clock-frequency = <d#165000000>;
165 };
150 166
151 cpmpic: pic@90c00 { 167 cpmpic: pic@90c00 {
152 interrupt-controller; 168 interrupt-controller;
@@ -155,43 +171,38 @@
155 interrupts = <2e 2>; 171 interrupts = <2e 2>;
156 interrupt-parent = <&mpic>; 172 interrupt-parent = <&mpic>;
157 reg = <90c00 80>; 173 reg = <90c00 80>;
158 device_type = "cpm-pic"; 174 compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
159 }; 175 };
160 176
161 scc@91a00 { 177 serial@91a00 {
162 device_type = "serial"; 178 device_type = "serial";
163 compatible = "cpm_uart"; 179 compatible = "fsl,mpc8560-scc-uart",
164 model = "SCC"; 180 "fsl,cpm2-scc-uart";
165 device-id = <1>;
166 reg = <91a00 20 88000 100>; 181 reg = <91a00 20 88000 100>;
167 clock-setup = <00ffffff 0>; 182 fsl,cpm-brg = <1>;
168 rx-clock = <1>; 183 fsl,cpm-command = <00800000>;
169 tx-clock = <1>;
170 current-speed = <1c200>; 184 current-speed = <1c200>;
171 interrupts = <28 8>; 185 interrupts = <28 8>;
172 interrupt-parent = <&cpmpic>; 186 interrupt-parent = <&cpmpic>;
173 }; 187 };
174 188
175 scc@91a20 { 189 serial@91a20 {
176 device_type = "serial"; 190 device_type = "serial";
177 compatible = "cpm_uart"; 191 compatible = "fsl,mpc8560-scc-uart",
178 model = "SCC"; 192 "fsl,cpm2-scc-uart";
179 device-id = <2>;
180 reg = <91a20 20 88100 100>; 193 reg = <91a20 20 88100 100>;
181 clock-setup = <ff00ffff 90000>; 194 fsl,cpm-brg = <2>;
182 rx-clock = <2>; 195 fsl,cpm-command = <04a00000>;
183 tx-clock = <2>;
184 current-speed = <1c200>; 196 current-speed = <1c200>;
185 interrupts = <29 8>; 197 interrupts = <29 8>;
186 interrupt-parent = <&cpmpic>; 198 interrupt-parent = <&cpmpic>;
187 }; 199 };
188 200
189 fcc@91320 { 201 ethernet@91320 {
190 device_type = "network"; 202 device_type = "network";
191 compatible = "fs_enet"; 203 compatible = "fsl,mpc8560-fcc-enet",
192 model = "FCC"; 204 "fsl,cpm2-fcc-enet";
193 device-id = <2>; 205 reg = <91320 20 88500 100 913b0 1>;
194 reg = <91320 20 88500 100 913a0 30>;
195 /* 206 /*
196 * mac-address is deprecated and will be removed 207 * mac-address is deprecated and will be removed
197 * in 2.6.25. Only recent versions of 208 * in 2.6.25. Only recent versions of
@@ -199,20 +210,17 @@
199 */ 210 */
200 mac-address = [ 00 00 00 00 00 00 ]; 211 mac-address = [ 00 00 00 00 00 00 ];
201 local-mac-address = [ 00 00 00 00 00 00 ]; 212 local-mac-address = [ 00 00 00 00 00 00 ];
202 clock-setup = <ff00ffff 250000>; 213 fsl,cpm-command = <16200300>;
203 rx-clock = <15>;
204 tx-clock = <16>;
205 interrupts = <21 8>; 214 interrupts = <21 8>;
206 interrupt-parent = <&cpmpic>; 215 interrupt-parent = <&cpmpic>;
207 phy-handle = <&phy2>; 216 phy-handle = <&phy2>;
208 }; 217 };
209 218
210 fcc@91340 { 219 ethernet@91340 {
211 device_type = "network"; 220 device_type = "network";
212 compatible = "fs_enet"; 221 compatible = "fsl,mpc8560-fcc-enet",
213 model = "FCC"; 222 "fsl,cpm2-fcc-enet";
214 device-id = <3>; 223 reg = <91340 20 88600 100 913d0 1>;
215 reg = <91340 20 88600 100 913d0 30>;
216 /* 224 /*
217 * mac-address is deprecated and will be removed 225 * mac-address is deprecated and will be removed
218 * in 2.6.25. Only recent versions of 226 * in 2.6.25. Only recent versions of
@@ -220,9 +228,7 @@
220 */ 228 */
221 mac-address = [ 00 00 00 00 00 00 ]; 229 mac-address = [ 00 00 00 00 00 00 ];
222 local-mac-address = [ 00 00 00 00 00 00 ]; 230 local-mac-address = [ 00 00 00 00 00 00 ];
223 clock-setup = <ffff00ff 3700>; 231 fsl,cpm-command = <1a400300>;
224 rx-clock = <17>;
225 tx-clock = <18>;
226 interrupts = <22 8>; 232 interrupts = <22 8>;
227 interrupt-parent = <&cpmpic>; 233 interrupt-parent = <&cpmpic>;
228 phy-handle = <&phy3>; 234 phy-handle = <&phy3>;
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-22 00:48:33 -0400