1 files changed, 39 insertions, 57 deletions
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 06d24653e422..bf49d8c997b9 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -16,16 +16,14 @@
 / {
        model = "MPC8568EMDS";
-        compatible = "MPC85xxMDS";
+        compatible = "MPC8568EMDS", "MPC85xxMDS";
        #address-cells = <1>;
        #size-cells = <1>;
-        linux,phandle = <100>;
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-                linux,phandle = <200>;
                PowerPC,8568@0 {
                        device_type = "cpu";
@@ -38,13 +36,11 @@
                        bus-frequency = <0>;
                        clock-frequency = <0>;
                        32-bit;
-                        linux,phandle = <201>;
                };
        };
        memory {
                device_type = "memory";
-                linux,phandle = <300>;
                reg = <00000000 10000000>;
        };
@@ -67,7 +63,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -76,7 +72,7 @@
                        compatible = "fsl-i2c";
                        reg = <3100 100>;
                        interrupts = <1b 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -86,32 +82,26 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                        linux,phandle = <24520>;
+                        phy0: ethernet-phy@0 {
-                        ethernet-phy@0 {
+                                interrupt-parent = <&mpic>;
-                                linux,phandle = <2452000>;
-                                interrupt-parent = <40000>;
                                interrupts = <31 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                        ethernet-phy@1 {
+                        phy1: ethernet-phy@1 {
-                                linux,phandle = <2452001>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <32 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
+                        phy2: ethernet-phy@2 {
-                        ethernet-phy@2 {
+                                interrupt-parent = <&mpic>;
-                                linux,phandle = <2452002>;
-                                interrupt-parent = <40000>;
                                interrupts = <31 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
-                        ethernet-phy@3 {
+                        phy3: ethernet-phy@3 {
-                                linux,phandle = <2452003>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <32 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -127,8 +117,8 @@
                        reg = <24000 1000>;
                        mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <d 2 e 2 12 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
-                        phy-handle = <2452002>;
+                        phy-handle = <&phy2>;
                };
                ethernet@25000 {
@@ -140,8 +130,8 @@
                        reg = <25000 1000>;
                        mac-address = [ 00 00 00 00 00 00];
                        interrupts = <13 2 14 2 18 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
-                        phy-handle = <2452003>;
+                        phy-handle = <&phy3>;
                };
                serial@4500 {
@@ -150,7 +140,7 @@
                        reg = <4500 100>;
                        clock-frequency = <0>;
                        interrupts = <1a 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                };
                serial@4600 {
@@ -159,7 +149,7 @@
                        reg = <4600 100>;
                        clock-frequency = <0>;
                        interrupts = <1a 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                };
                crypto@30000 {
@@ -168,15 +158,14 @@
                        compatible = "talitos";
                        reg = <30000 f000>;
                        interrupts = <1d 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                        num-channels = <4>;
                        channel-fifo-len = <18>;
                        exec-units-mask = <000000fe>;
                        descriptor-types-mask = <012b0ebf>;
                };
-                pic@40000 {
+                mpic: pic@40000 {
-                        linux,phandle = <40000>;
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;
@@ -192,8 +181,7 @@
                        device_type = "par_io";
                        num-ports = <7>;
-                        ucc_pin@01 {
+                        pio1: ucc_pin@01 {
-                                linux,phandle = <e010001>;
                                pio-map = <
                        /* port  pin  dir  open_drain  assignment  has_irq */
                                        4  0a  1  0  2  0       /* TxD0 */
@@ -220,8 +208,7 @@
                                        4  13  1  0  2  0       /* GTX_CLK */
                                        1  1f  2  0  3  0>;     /* GTX125 */
                        };
-                        ucc_pin@02 {
+                        pio2: ucc_pin@02 {
-                                linux,phandle = <e010002>;
                                pio-map = <
                        /* port  pin  dir  open_drain  assignment  has_irq */
                                        5  0a 1  0  2  0   /* TxD0 */
@@ -277,7 +264,7 @@
                        compatible = "fsl_spi";
                        reg = <4c0 40>;
                        interrupts = <2>;
-                        interrupt-parent = <80>;
+                        interrupt-parent = <&qeic>;
                        mode = "cpu";
                };
@@ -286,7 +273,7 @@
                        compatible = "fsl_spi";
                        reg = <500 40>;
                        interrupts = <1>;
-                        interrupt-parent = <80>;
+                        interrupt-parent = <&qeic>;
                        mode = "cpu";
                };
@@ -297,12 +284,12 @@
                        device-id = <1>;
                        reg = <2000 200>;
                        interrupts = <20>;
-                        interrupt-parent = <80>;
+                        interrupt-parent = <&qeic>;
                        mac-address = [ 00 04 9f 00 23 23 ];
                        rx-clock = <0>;
                        tx-clock = <19>;
-                        phy-handle = <212000>;
+                        phy-handle = <&qe_phy0>;
-                        pio-handle = <e010001>;
+                        pio-handle = <&pio1>;
                };
                ucc@3000 {
@@ -312,12 +299,12 @@
                        device-id = <2>;
                        reg = <3000 200>;
                        interrupts = <21>;
-                        interrupt-parent = <80>;
+                        interrupt-parent = <&qeic>;
                        mac-address = [ 00 11 22 33 44 55 ];
                        rx-clock = <0>;
                        tx-clock = <14>;
-                        phy-handle = <212001>;
+                        phy-handle = <&qe_phy1>;
-                        pio-handle = <e010002>;
+                        pio-handle = <&pio2>;
                };
                mdio@2120 {
@@ -329,33 +316,29 @@
                        /* These are the same PHYs as on
                         * gianfar's MDIO bus */
-                        ethernet-phy@00 {
+                        qe_phy0: ethernet-phy@00 {
-                                linux,phandle = <212000>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <31 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                                interface = <6>; //ENET_1000_GMII
                        };
-                        ethernet-phy@01 {
+                        qe_phy1: ethernet-phy@01 {
-                                linux,phandle = <212001>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <32 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                                interface = <6>;
                        };
-                        ethernet-phy@02 {
+                        qe_phy2: ethernet-phy@02 {
-                                linux,phandle = <212002>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <31 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                                interface = <6>; //ENET_1000_GMII
                        };
-                        ethernet-phy@03 {
+                        qe_phy3: ethernet-phy@03 {
-                                linux,phandle = <212003>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <32 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -363,8 +346,7 @@
                        };
                };
-                qeic@80 {
+                qeic: qeic@80 {
-                        linux,phandle = <80>;
                        interrupt-controller;
                        device_type = "qeic";
                        #address-cells = <0>;
@@ -373,7 +355,7 @@
                        built-in;
                        big-endian;
                        interrupts = <1e 2 1e 2>; //high:30 low:30
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                };
        };

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 06d24653e422..bf49d8c997b9 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -16,16 +16,14 @@
16		16
17	/ {	17	/ {
18	model = "MPC8568EMDS";	18	model = "MPC8568EMDS";
19	compatible = "MPC85xxMDS";	19	compatible = "MPC8568EMDS", "MPC85xxMDS";
20	#address-cells = <1>;	20	#address-cells = <1>;
21	#size-cells = <1>;	21	#size-cells = <1>;
22	linux,phandle = <100>;
23		22
24	cpus {	23	cpus {
25	#cpus = <1>;	24	#cpus = <1>;
26	#address-cells = <1>;	25	#address-cells = <1>;
27	#size-cells = <0>;	26	#size-cells = <0>;
28	linux,phandle = <200>;
29		27
30	PowerPC,8568@0 {	28	PowerPC,8568@0 {
31	device_type = "cpu";	29	device_type = "cpu";
@@ -38,13 +36,11 @@
38	bus-frequency = <0>;	36	bus-frequency = <0>;
39	clock-frequency = <0>;	37	clock-frequency = <0>;
40	32-bit;	38	32-bit;
41	linux,phandle = <201>;
42	};	39	};
43	};	40	};
44		41
45	memory {	42	memory {
46	device_type = "memory";	43	device_type = "memory";
47	linux,phandle = <300>;
48	reg = <00000000 10000000>;	44	reg = <00000000 10000000>;
49	};	45	};
50		46
@@ -67,7 +63,7 @@
67	compatible = "fsl-i2c";	63	compatible = "fsl-i2c";
68	reg = <3000 100>;	64	reg = <3000 100>;
69	interrupts = <1b 2>;	65	interrupts = <1b 2>;
70	interrupt-parent = <40000>;	66	interrupt-parent = <&mpic>;
71	dfsrr;	67	dfsrr;
72	};	68	};
73		69
@@ -76,7 +72,7 @@
76	compatible = "fsl-i2c";	72	compatible = "fsl-i2c";
77	reg = <3100 100>;	73	reg = <3100 100>;
78	interrupts = <1b 2>;	74	interrupts = <1b 2>;
79	interrupt-parent = <40000>;	75	interrupt-parent = <&mpic>;
80	dfsrr;	76	dfsrr;
81	};	77	};
82		78
@@ -86,32 +82,26 @@
86	device_type = "mdio";	82	device_type = "mdio";
87	compatible = "gianfar";	83	compatible = "gianfar";
88	reg = <24520 20>;	84	reg = <24520 20>;
89	linux,phandle = <24520>;	85	phy0: ethernet-phy@0 {
90	ethernet-phy@0 {	86	interrupt-parent = <&mpic>;
91	linux,phandle = <2452000>;
92	interrupt-parent = <40000>;
93	interrupts = <31 1>;	87	interrupts = <31 1>;
94	reg = <0>;	88	reg = <0>;
95	device_type = "ethernet-phy";	89	device_type = "ethernet-phy";
96	};	90	};
97	ethernet-phy@1 {	91	phy1: ethernet-phy@1 {
98	linux,phandle = <2452001>;	92	interrupt-parent = <&mpic>;
99	interrupt-parent = <40000>;
100	interrupts = <32 1>;	93	interrupts = <32 1>;
101	reg = <1>;	94	reg = <1>;
102	device_type = "ethernet-phy";	95	device_type = "ethernet-phy";
103	};	96	};
104		97	phy2: ethernet-phy@2 {
105	ethernet-phy@2 {	98	interrupt-parent = <&mpic>;
106	linux,phandle = <2452002>;
107	interrupt-parent = <40000>;
108	interrupts = <31 1>;	99	interrupts = <31 1>;
109	reg = <2>;	100	reg = <2>;
110	device_type = "ethernet-phy";	101	device_type = "ethernet-phy";
111	};	102	};
112	ethernet-phy@3 {	103	phy3: ethernet-phy@3 {
113	linux,phandle = <2452003>;	104	interrupt-parent = <&mpic>;
114	interrupt-parent = <40000>;
115	interrupts = <32 1>;	105	interrupts = <32 1>;
116	reg = <3>;	106	reg = <3>;
117	device_type = "ethernet-phy";	107	device_type = "ethernet-phy";
@@ -127,8 +117,8 @@
127	reg = <24000 1000>;	117	reg = <24000 1000>;
128	mac-address = [ 00 00 00 00 00 00 ];	118	mac-address = [ 00 00 00 00 00 00 ];
129	interrupts = <d 2 e 2 12 2>;	119	interrupts = <d 2 e 2 12 2>;
130	interrupt-parent = <40000>;	120	interrupt-parent = <&mpic>;
131	phy-handle = <2452002>;	121	phy-handle = <&phy2>;
132	};	122	};
133		123
134	ethernet@25000 {	124	ethernet@25000 {
@@ -140,8 +130,8 @@
140	reg = <25000 1000>;	130	reg = <25000 1000>;
141	mac-address = [ 00 00 00 00 00 00];	131	mac-address = [ 00 00 00 00 00 00];
142	interrupts = <13 2 14 2 18 2>;	132	interrupts = <13 2 14 2 18 2>;
143	interrupt-parent = <40000>;	133	interrupt-parent = <&mpic>;
144	phy-handle = <2452003>;	134	phy-handle = <&phy3>;
145	};	135	};
146		136
147	serial@4500 {	137	serial@4500 {
@@ -150,7 +140,7 @@
150	reg = <4500 100>;	140	reg = <4500 100>;
151	clock-frequency = <0>;	141	clock-frequency = <0>;
152	interrupts = <1a 2>;	142	interrupts = <1a 2>;
153	interrupt-parent = <40000>;	143	interrupt-parent = <&mpic>;
154	};	144	};
155		145
156	serial@4600 {	146	serial@4600 {
@@ -159,7 +149,7 @@
159	reg = <4600 100>;	149	reg = <4600 100>;
160	clock-frequency = <0>;	150	clock-frequency = <0>;
161	interrupts = <1a 2>;	151	interrupts = <1a 2>;
162	interrupt-parent = <40000>;	152	interrupt-parent = <&mpic>;
163	};	153	};
164		154
165	crypto@30000 {	155	crypto@30000 {
@@ -168,15 +158,14 @@
168	compatible = "talitos";	158	compatible = "talitos";
169	reg = <30000 f000>;	159	reg = <30000 f000>;
170	interrupts = <1d 2>;	160	interrupts = <1d 2>;
171	interrupt-parent = <40000>;	161	interrupt-parent = <&mpic>;
172	num-channels = <4>;	162	num-channels = <4>;
173	channel-fifo-len = <18>;	163	channel-fifo-len = <18>;
174	exec-units-mask = <000000fe>;	164	exec-units-mask = <000000fe>;
175	descriptor-types-mask = <012b0ebf>;	165	descriptor-types-mask = <012b0ebf>;
176	};	166	};
177		167
178	pic@40000 {	168	mpic: pic@40000 {
179	linux,phandle = <40000>;
180	clock-frequency = <0>;	169	clock-frequency = <0>;
181	interrupt-controller;	170	interrupt-controller;
182	#address-cells = <0>;	171	#address-cells = <0>;
@@ -192,8 +181,7 @@
192	device_type = "par_io";	181	device_type = "par_io";
193	num-ports = <7>;	182	num-ports = <7>;
194		183
195	ucc_pin@01 {	184	pio1: ucc_pin@01 {
196	linux,phandle = <e010001>;
197	pio-map = <	185	pio-map = <
198	/* port pin dir open_drain assignment has_irq */	186	/* port pin dir open_drain assignment has_irq */
199	4 0a 1 0 2 0 /* TxD0 */	187	4 0a 1 0 2 0 /* TxD0 */
@@ -220,8 +208,7 @@
220	4 13 1 0 2 0 /* GTX_CLK */	208	4 13 1 0 2 0 /* GTX_CLK */
221	1 1f 2 0 3 0>; /* GTX125 */	209	1 1f 2 0 3 0>; /* GTX125 */
222	};	210	};
223	ucc_pin@02 {	211	pio2: ucc_pin@02 {
224	linux,phandle = <e010002>;
225	pio-map = <	212	pio-map = <
226	/* port pin dir open_drain assignment has_irq */	213	/* port pin dir open_drain assignment has_irq */
227	5 0a 1 0 2 0 /* TxD0 */	214	5 0a 1 0 2 0 /* TxD0 */
@@ -277,7 +264,7 @@
277	compatible = "fsl_spi";	264	compatible = "fsl_spi";
278	reg = <4c0 40>;	265	reg = <4c0 40>;
279	interrupts = <2>;	266	interrupts = <2>;
280	interrupt-parent = <80>;	267	interrupt-parent = <&qeic>;
281	mode = "cpu";	268	mode = "cpu";
282	};	269	};
283		270
@@ -286,7 +273,7 @@
286	compatible = "fsl_spi";	273	compatible = "fsl_spi";
287	reg = <500 40>;	274	reg = <500 40>;
288	interrupts = <1>;	275	interrupts = <1>;
289	interrupt-parent = <80>;	276	interrupt-parent = <&qeic>;
290	mode = "cpu";	277	mode = "cpu";
291	};	278	};
292		279
@@ -297,12 +284,12 @@
297	device-id = <1>;	284	device-id = <1>;
298	reg = <2000 200>;	285	reg = <2000 200>;
299	interrupts = <20>;	286	interrupts = <20>;
300	interrupt-parent = <80>;	287	interrupt-parent = <&qeic>;
301	mac-address = [ 00 04 9f 00 23 23 ];	288	mac-address = [ 00 04 9f 00 23 23 ];
302	rx-clock = <0>;	289	rx-clock = <0>;
303	tx-clock = <19>;	290	tx-clock = <19>;
304	phy-handle = <212000>;	291	phy-handle = <&qe_phy0>;
305	pio-handle = <e010001>;	292	pio-handle = <&pio1>;
306	};	293	};
307		294
308	ucc@3000 {	295	ucc@3000 {
@@ -312,12 +299,12 @@
312	device-id = <2>;	299	device-id = <2>;
313	reg = <3000 200>;	300	reg = <3000 200>;
314	interrupts = <21>;	301	interrupts = <21>;
315	interrupt-parent = <80>;	302	interrupt-parent = <&qeic>;
316	mac-address = [ 00 11 22 33 44 55 ];	303	mac-address = [ 00 11 22 33 44 55 ];
317	rx-clock = <0>;	304	rx-clock = <0>;
318	tx-clock = <14>;	305	tx-clock = <14>;
319	phy-handle = <212001>;	306	phy-handle = <&qe_phy1>;
320	pio-handle = <e010002>;	307	pio-handle = <&pio2>;
321	};	308	};
322		309
323	mdio@2120 {	310	mdio@2120 {
@@ -329,33 +316,29 @@
329		316
330	/* These are the same PHYs as on	317	/* These are the same PHYs as on
331	* gianfar's MDIO bus */	318	* gianfar's MDIO bus */
332	ethernet-phy@00 {	319	qe_phy0: ethernet-phy@00 {
333	linux,phandle = <212000>;	320	interrupt-parent = <&mpic>;
334	interrupt-parent = <40000>;
335	interrupts = <31 1>;	321	interrupts = <31 1>;
336	reg = <0>;	322	reg = <0>;
337	device_type = "ethernet-phy";	323	device_type = "ethernet-phy";
338	interface = <6>; //ENET_1000_GMII	324	interface = <6>; //ENET_1000_GMII
339	};	325	};
340	ethernet-phy@01 {	326	qe_phy1: ethernet-phy@01 {
341	linux,phandle = <212001>;	327	interrupt-parent = <&mpic>;
342	interrupt-parent = <40000>;
343	interrupts = <32 1>;	328	interrupts = <32 1>;
344	reg = <1>;	329	reg = <1>;
345	device_type = "ethernet-phy";	330	device_type = "ethernet-phy";
346	interface = <6>;	331	interface = <6>;
347	};	332	};
348	ethernet-phy@02 {	333	qe_phy2: ethernet-phy@02 {
349	linux,phandle = <212002>;	334	interrupt-parent = <&mpic>;
350	interrupt-parent = <40000>;
351	interrupts = <31 1>;	335	interrupts = <31 1>;
352	reg = <2>;	336	reg = <2>;
353	device_type = "ethernet-phy";	337	device_type = "ethernet-phy";
354	interface = <6>; //ENET_1000_GMII	338	interface = <6>; //ENET_1000_GMII
355	};	339	};
356	ethernet-phy@03 {	340	qe_phy3: ethernet-phy@03 {
357	linux,phandle = <212003>;	341	interrupt-parent = <&mpic>;
358	interrupt-parent = <40000>;
359	interrupts = <32 1>;	342	interrupts = <32 1>;
360	reg = <3>;	343	reg = <3>;
361	device_type = "ethernet-phy";	344	device_type = "ethernet-phy";
@@ -363,8 +346,7 @@
363	};	346	};
364	};	347	};
365		348
366	qeic@80 {	349	qeic: qeic@80 {
367	linux,phandle = <80>;
368	interrupt-controller;	350	interrupt-controller;
369	device_type = "qeic";	351	device_type = "qeic";
370	#address-cells = <0>;	352	#address-cells = <0>;
@@ -373,7 +355,7 @@
373	built-in;	355	built-in;
374	big-endian;	356	big-endian;
375	interrupts = <1e 2 1e 2>; //high:30 low:30	357	interrupts = <1e 2 1e 2>; //high:30 low:30
376	interrupt-parent = <40000>;	358	interrupt-parent = <&mpic>;
377	};	359	};
378		360
379	};	361	};