1 files changed, 81 insertions, 66 deletions
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index d91e81c009f5..364a969f5c2f 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -52,7 +52,7 @@
                        compatible = "fsl,8540-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <2 2>;
+                        interrupts = <12 2>;
                };
                l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                        interrupts = <0 2>;
+                        interrupts = <10 2>;
                };
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                        interrupts = <1b 2>;
+                        interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -81,19 +81,19 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 1>;
+                                interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <35 1>;
+                                interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                                interrupts = <37 1>;
+                                interrupts = <7 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -106,9 +106,14 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                        address = [ 00 E0 0C 00 73 00 ];
+                        /*
-                        local-mac-address = [ 00 E0 0C 00 73 00 ];
+                         * address is deprecated and will be removed
-                        interrupts = <d 2 e 2 12 2>;
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
@@ -120,9 +125,14 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                        address = [ 00 E0 0C 00 73 01 ];
+                        /*
-                        local-mac-address = [ 00 E0 0C 00 73 01 ];
+                         * address is deprecated and will be removed
-                        interrupts = <13 2 14 2 18 2>;
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
@@ -134,9 +144,14 @@
                        model = "FEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                        address = [ 00 E0 0C 00 73 02 ];
+                        /*
-                        local-mac-address = [ 00 E0 0C 00 73 02 ];
+                         * address is deprecated and will be removed
-                        interrupts = <19 2>;
+                         * in 2.6.25.  Only recent versions of
+                         * U-Boot support local-mac-address, however.
+                         */
+                        address = [ 00 00 00 00 00 00 ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
                };
@@ -146,7 +161,7 @@
                        compatible = "ns16550";
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
@@ -155,7 +170,7 @@
                        compatible = "ns16550";
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <1a 2>;
+                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
                pci@8000 {
@@ -163,78 +178,78 @@
                        interrupt-map = <
                                /* IDSEL 0x02 */
-                                1000 0 0 1 &mpic 31 1
+                                1000 0 0 1 &mpic 1 1
-                                1000 0 0 2 &mpic 32 1
+                                1000 0 0 2 &mpic 2 1
-                                1000 0 0 3 &mpic 33 1
+                                1000 0 0 3 &mpic 3 1
-                                1000 0 0 4 &mpic 34 1
+                                1000 0 0 4 &mpic 4 1
                                /* IDSEL 0x03 */
-                                1800 0 0 1 &mpic 34 1
+                                1800 0 0 1 &mpic 4 1
-                                1800 0 0 2 &mpic 31 1
+                                1800 0 0 2 &mpic 1 1
-                                1800 0 0 3 &mpic 32 1
+                                1800 0 0 3 &mpic 2 1
-                                1800 0 0 4 &mpic 33 1
+                                1800 0 0 4 &mpic 3 1
                                /* IDSEL 0x04 */
-                                2000 0 0 1 &mpic 33 1
+                                2000 0 0 1 &mpic 3 1
-                                2000 0 0 2 &mpic 34 1
+                                2000 0 0 2 &mpic 4 1
-                                2000 0 0 3 &mpic 31 1
+                                2000 0 0 3 &mpic 1 1
-                                2000 0 0 4 &mpic 32 1
+                                2000 0 0 4 &mpic 2 1
                                /* IDSEL 0x05 */
-                                2800 0 0 1 &mpic 32 1
+                                2800 0 0 1 &mpic 2 1
-                                2800 0 0 2 &mpic 33 1
+                                2800 0 0 2 &mpic 3 1
-                                2800 0 0 3 &mpic 34 1
+                                2800 0 0 3 &mpic 4 1
-                                2800 0 0 4 &mpic 31 1
+                                2800 0 0 4 &mpic 1 1
                                /* IDSEL 0x0c */
-                                6000 0 0 1 &mpic 31 1
+                                6000 0 0 1 &mpic 1 1
-                                6000 0 0 2 &mpic 32 1
+                                6000 0 0 2 &mpic 2 1
-                                6000 0 0 3 &mpic 33 1
+                                6000 0 0 3 &mpic 3 1
-                                6000 0 0 4 &mpic 34 1
+                                6000 0 0 4 &mpic 4 1
                                /* IDSEL 0x0d */
-                                6800 0 0 1 &mpic 34 1
+                                6800 0 0 1 &mpic 4 1
-                                6800 0 0 2 &mpic 31 1
+                                6800 0 0 2 &mpic 1 1
-                                6800 0 0 3 &mpic 32 1
+                                6800 0 0 3 &mpic 2 1
-                                6800 0 0 4 &mpic 33 1
+                                6800 0 0 4 &mpic 3 1
                                /* IDSEL 0x0e */
-                                7000 0 0 1 &mpic 33 1
+                                7000 0 0 1 &mpic 3 1
-                                7000 0 0 2 &mpic 34 1
+                                7000 0 0 2 &mpic 4 1
-                                7000 0 0 3 &mpic 31 1
+                                7000 0 0 3 &mpic 1 1
-                                7000 0 0 4 &mpic 32 1
+                                7000 0 0 4 &mpic 2 1
                                /* IDSEL 0x0f */
-                                7800 0 0 1 &mpic 32 1
+                                7800 0 0 1 &mpic 2 1
-                                7800 0 0 2 &mpic 33 1
+                                7800 0 0 2 &mpic 3 1
-                                7800 0 0 3 &mpic 34 1
+                                7800 0 0 3 &mpic 4 1
-                                7800 0 0 4 &mpic 31 1
+                                7800 0 0 4 &mpic 1 1
                                /* IDSEL 0x12 */
-                                9000 0 0 1 &mpic 31 1
+                                9000 0 0 1 &mpic 1 1
-                                9000 0 0 2 &mpic 32 1
+                                9000 0 0 2 &mpic 2 1
-                                9000 0 0 3 &mpic 33 1
+                                9000 0 0 3 &mpic 3 1
-                                9000 0 0 4 &mpic 34 1
+                                9000 0 0 4 &mpic 4 1
                                /* IDSEL 0x13 */
-                                9800 0 0 1 &mpic 34 1
+                                9800 0 0 1 &mpic 4 1
-                                9800 0 0 2 &mpic 31 1
+                                9800 0 0 2 &mpic 1 1
-                                9800 0 0 3 &mpic 32 1
+                                9800 0 0 3 &mpic 2 1
-                                9800 0 0 4 &mpic 33 1
+                                9800 0 0 4 &mpic 3 1
                                /* IDSEL 0x14 */
-                                a000 0 0 1 &mpic 33 1
+                                a000 0 0 1 &mpic 3 1
-                                a000 0 0 2 &mpic 34 1
+                                a000 0 0 2 &mpic 4 1
-                                a000 0 0 3 &mpic 31 1
+                                a000 0 0 3 &mpic 1 1
-                                a000 0 0 4 &mpic 32 1
+                                a000 0 0 4 &mpic 2 1
                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic 32 1
+                                a800 0 0 1 &mpic 2 1
-                                a800 0 0 2 &mpic 33 1
+                                a800 0 0 2 &mpic 3 1
-                                a800 0 0 3 &mpic 34 1
+                                a800 0 0 3 &mpic 4 1
-                                a800 0 0 4 &mpic 31 1>;
+                                a800 0 0 4 &mpic 1 1>;
                        interrupt-parent = <&mpic>;
-                        interrupts = <08 2>;
+                        interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;

diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index d91e81c009f5..364a969f5c2f 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -52,7 +52,7 @@
52	compatible = "fsl,8540-memory-controller";	52	compatible = "fsl,8540-memory-controller";
53	reg = <2000 1000>;	53	reg = <2000 1000>;
54	interrupt-parent = <&mpic>;	54	interrupt-parent = <&mpic>;
55	interrupts = <2 2>;	55	interrupts = <12 2>;
56	};	56	};
57		57
58	l2-cache-controller@20000 {	58	l2-cache-controller@20000 {
@@ -61,14 +61,14 @@
61	cache-line-size = <20>; // 32 bytes	61	cache-line-size = <20>; // 32 bytes
62	cache-size = <40000>; // L2, 256K	62	cache-size = <40000>; // L2, 256K
63	interrupt-parent = <&mpic>;	63	interrupt-parent = <&mpic>;
64	interrupts = <0 2>;	64	interrupts = <10 2>;
65	};	65	};
66		66
67	i2c@3000 {	67	i2c@3000 {
68	device_type = "i2c";	68	device_type = "i2c";
69	compatible = "fsl-i2c";	69	compatible = "fsl-i2c";
70	reg = <3000 100>;	70	reg = <3000 100>;
71	interrupts = <1b 2>;	71	interrupts = <2b 2>;
72	interrupt-parent = <&mpic>;	72	interrupt-parent = <&mpic>;
73	dfsrr;	73	dfsrr;
74	};	74	};
@@ -81,19 +81,19 @@
81	reg = <24520 20>;	81	reg = <24520 20>;
82	phy0: ethernet-phy@0 {	82	phy0: ethernet-phy@0 {
83	interrupt-parent = <&mpic>;	83	interrupt-parent = <&mpic>;
84	interrupts = <35 1>;	84	interrupts = <5 1>;
85	reg = <0>;	85	reg = <0>;
86	device_type = "ethernet-phy";	86	device_type = "ethernet-phy";
87	};	87	};
88	phy1: ethernet-phy@1 {	88	phy1: ethernet-phy@1 {
89	interrupt-parent = <&mpic>;	89	interrupt-parent = <&mpic>;
90	interrupts = <35 1>;	90	interrupts = <5 1>;
91	reg = <1>;	91	reg = <1>;
92	device_type = "ethernet-phy";	92	device_type = "ethernet-phy";
93	};	93	};
94	phy3: ethernet-phy@3 {	94	phy3: ethernet-phy@3 {
95	interrupt-parent = <&mpic>;	95	interrupt-parent = <&mpic>;
96	interrupts = <37 1>;	96	interrupts = <7 1>;
97	reg = <3>;	97	reg = <3>;
98	device_type = "ethernet-phy";	98	device_type = "ethernet-phy";
99	};	99	};
@@ -106,9 +106,14 @@
106	model = "TSEC";	106	model = "TSEC";
107	compatible = "gianfar";	107	compatible = "gianfar";
108	reg = <24000 1000>;	108	reg = <24000 1000>;
109	address = [ 00 E0 0C 00 73 00 ];	109	/*
110	local-mac-address = [ 00 E0 0C 00 73 00 ];	110	* address is deprecated and will be removed
111	interrupts = <d 2 e 2 12 2>;	111	* in 2.6.25. Only recent versions of
		112	* U-Boot support local-mac-address, however.
		113	*/
		114	address = [ 00 00 00 00 00 00 ];
		115	local-mac-address = [ 00 00 00 00 00 00 ];
		116	interrupts = <1d 2 1e 2 22 2>;
112	interrupt-parent = <&mpic>;	117	interrupt-parent = <&mpic>;
113	phy-handle = <&phy0>;	118	phy-handle = <&phy0>;
114	};	119	};
@@ -120,9 +125,14 @@
120	model = "TSEC";	125	model = "TSEC";
121	compatible = "gianfar";	126	compatible = "gianfar";
122	reg = <25000 1000>;	127	reg = <25000 1000>;
123	address = [ 00 E0 0C 00 73 01 ];	128	/*
124	local-mac-address = [ 00 E0 0C 00 73 01 ];	129	* address is deprecated and will be removed
125	interrupts = <13 2 14 2 18 2>;	130	* in 2.6.25. Only recent versions of
		131	* U-Boot support local-mac-address, however.
		132	*/
		133	address = [ 00 00 00 00 00 00 ];
		134	local-mac-address = [ 00 00 00 00 00 00 ];
		135	interrupts = <23 2 24 2 28 2>;
126	interrupt-parent = <&mpic>;	136	interrupt-parent = <&mpic>;
127	phy-handle = <&phy1>;	137	phy-handle = <&phy1>;
128	};	138	};
@@ -134,9 +144,14 @@
134	model = "FEC";	144	model = "FEC";
135	compatible = "gianfar";	145	compatible = "gianfar";
136	reg = <26000 1000>;	146	reg = <26000 1000>;
137	address = [ 00 E0 0C 00 73 02 ];	147	/*
138	local-mac-address = [ 00 E0 0C 00 73 02 ];	148	* address is deprecated and will be removed
139	interrupts = <19 2>;	149	* in 2.6.25. Only recent versions of
		150	* U-Boot support local-mac-address, however.
		151	*/
		152	address = [ 00 00 00 00 00 00 ];
		153	local-mac-address = [ 00 00 00 00 00 00 ];
		154	interrupts = <29 2>;
140	interrupt-parent = <&mpic>;	155	interrupt-parent = <&mpic>;
141	phy-handle = <&phy3>;	156	phy-handle = <&phy3>;
142	};	157	};
@@ -146,7 +161,7 @@
146	compatible = "ns16550";	161	compatible = "ns16550";
147	reg = <4500 100>; // reg base, size	162	reg = <4500 100>; // reg base, size
148	clock-frequency = <0>; // should we fill in in uboot?	163	clock-frequency = <0>; // should we fill in in uboot?
149	interrupts = <1a 2>;	164	interrupts = <2a 2>;
150	interrupt-parent = <&mpic>;	165	interrupt-parent = <&mpic>;
151	};	166	};
152		167
@@ -155,7 +170,7 @@
155	compatible = "ns16550";	170	compatible = "ns16550";
156	reg = <4600 100>; // reg base, size	171	reg = <4600 100>; // reg base, size
157	clock-frequency = <0>; // should we fill in in uboot?	172	clock-frequency = <0>; // should we fill in in uboot?
158	interrupts = <1a 2>;	173	interrupts = <2a 2>;
159	interrupt-parent = <&mpic>;	174	interrupt-parent = <&mpic>;
160	};	175	};
161	pci@8000 {	176	pci@8000 {
@@ -163,78 +178,78 @@
163	interrupt-map = <	178	interrupt-map = <
164		179
165	/* IDSEL 0x02 */	180	/* IDSEL 0x02 */
166	1000 0 0 1 &mpic 31 1	181	1000 0 0 1 &mpic 1 1
167	1000 0 0 2 &mpic 32 1	182	1000 0 0 2 &mpic 2 1
168	1000 0 0 3 &mpic 33 1	183	1000 0 0 3 &mpic 3 1
169	1000 0 0 4 &mpic 34 1	184	1000 0 0 4 &mpic 4 1
170		185
171	/* IDSEL 0x03 */	186	/* IDSEL 0x03 */
172	1800 0 0 1 &mpic 34 1	187	1800 0 0 1 &mpic 4 1
173	1800 0 0 2 &mpic 31 1	188	1800 0 0 2 &mpic 1 1
174	1800 0 0 3 &mpic 32 1	189	1800 0 0 3 &mpic 2 1
175	1800 0 0 4 &mpic 33 1	190	1800 0 0 4 &mpic 3 1
176		191
177	/* IDSEL 0x04 */	192	/* IDSEL 0x04 */
178	2000 0 0 1 &mpic 33 1	193	2000 0 0 1 &mpic 3 1
179	2000 0 0 2 &mpic 34 1	194	2000 0 0 2 &mpic 4 1
180	2000 0 0 3 &mpic 31 1	195	2000 0 0 3 &mpic 1 1
181	2000 0 0 4 &mpic 32 1	196	2000 0 0 4 &mpic 2 1
182		197
183	/* IDSEL 0x05 */	198	/* IDSEL 0x05 */
184	2800 0 0 1 &mpic 32 1	199	2800 0 0 1 &mpic 2 1
185	2800 0 0 2 &mpic 33 1	200	2800 0 0 2 &mpic 3 1
186	2800 0 0 3 &mpic 34 1	201	2800 0 0 3 &mpic 4 1
187	2800 0 0 4 &mpic 31 1	202	2800 0 0 4 &mpic 1 1
188		203
189	/* IDSEL 0x0c */	204	/* IDSEL 0x0c */
190	6000 0 0 1 &mpic 31 1	205	6000 0 0 1 &mpic 1 1
191	6000 0 0 2 &mpic 32 1	206	6000 0 0 2 &mpic 2 1
192	6000 0 0 3 &mpic 33 1	207	6000 0 0 3 &mpic 3 1
193	6000 0 0 4 &mpic 34 1	208	6000 0 0 4 &mpic 4 1
194		209
195	/* IDSEL 0x0d */	210	/* IDSEL 0x0d */
196	6800 0 0 1 &mpic 34 1	211	6800 0 0 1 &mpic 4 1
197	6800 0 0 2 &mpic 31 1	212	6800 0 0 2 &mpic 1 1
198	6800 0 0 3 &mpic 32 1	213	6800 0 0 3 &mpic 2 1
199	6800 0 0 4 &mpic 33 1	214	6800 0 0 4 &mpic 3 1
200		215
201	/* IDSEL 0x0e */	216	/* IDSEL 0x0e */
202	7000 0 0 1 &mpic 33 1	217	7000 0 0 1 &mpic 3 1
203	7000 0 0 2 &mpic 34 1	218	7000 0 0 2 &mpic 4 1
204	7000 0 0 3 &mpic 31 1	219	7000 0 0 3 &mpic 1 1
205	7000 0 0 4 &mpic 32 1	220	7000 0 0 4 &mpic 2 1
206		221
207	/* IDSEL 0x0f */	222	/* IDSEL 0x0f */
208	7800 0 0 1 &mpic 32 1	223	7800 0 0 1 &mpic 2 1
209	7800 0 0 2 &mpic 33 1	224	7800 0 0 2 &mpic 3 1
210	7800 0 0 3 &mpic 34 1	225	7800 0 0 3 &mpic 4 1
211	7800 0 0 4 &mpic 31 1	226	7800 0 0 4 &mpic 1 1
212		227
213	/* IDSEL 0x12 */	228	/* IDSEL 0x12 */
214	9000 0 0 1 &mpic 31 1	229	9000 0 0 1 &mpic 1 1
215	9000 0 0 2 &mpic 32 1	230	9000 0 0 2 &mpic 2 1
216	9000 0 0 3 &mpic 33 1	231	9000 0 0 3 &mpic 3 1
217	9000 0 0 4 &mpic 34 1	232	9000 0 0 4 &mpic 4 1
218		233
219	/* IDSEL 0x13 */	234	/* IDSEL 0x13 */
220	9800 0 0 1 &mpic 34 1	235	9800 0 0 1 &mpic 4 1
221	9800 0 0 2 &mpic 31 1	236	9800 0 0 2 &mpic 1 1
222	9800 0 0 3 &mpic 32 1	237	9800 0 0 3 &mpic 2 1
223	9800 0 0 4 &mpic 33 1	238	9800 0 0 4 &mpic 3 1
224		239
225	/* IDSEL 0x14 */	240	/* IDSEL 0x14 */
226	a000 0 0 1 &mpic 33 1	241	a000 0 0 1 &mpic 3 1
227	a000 0 0 2 &mpic 34 1	242	a000 0 0 2 &mpic 4 1
228	a000 0 0 3 &mpic 31 1	243	a000 0 0 3 &mpic 1 1
229	a000 0 0 4 &mpic 32 1	244	a000 0 0 4 &mpic 2 1
230		245
231	/* IDSEL 0x15 */	246	/* IDSEL 0x15 */
232	a800 0 0 1 &mpic 32 1	247	a800 0 0 1 &mpic 2 1
233	a800 0 0 2 &mpic 33 1	248	a800 0 0 2 &mpic 3 1
234	a800 0 0 3 &mpic 34 1	249	a800 0 0 3 &mpic 4 1
235	a800 0 0 4 &mpic 31 1>;	250	a800 0 0 4 &mpic 1 1>;
236	interrupt-parent = <&mpic>;	251	interrupt-parent = <&mpic>;
237	interrupts = <08 2>;	252	interrupts = <18 2>;
238	bus-range = <0 0>;	253	bus-range = <0 0>;
239	ranges = <02000000 0 80000000 80000000 0 20000000	254	ranges = <02000000 0 80000000 80000000 0 20000000
240	01000000 0 00000000 e2000000 0 00100000>;	255	01000000 0 00000000 e2000000 0 00100000>;