1 files changed, 66 insertions, 76 deletions
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 5f41c1f7a5f3..3c0917fa791c 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -12,16 +12,14 @@
 / {
        model = "MPC8540ADS";
-        compatible = "MPC85xxADS";
+        compatible = "MPC8540ADS", "MPC85xxADS";
        #address-cells = <1>;
        #size-cells = <1>;
-        linux,phandle = <100>;
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-                linux,phandle = <200>;
                PowerPC,8540@0 {
                        device_type = "cpu";
@@ -34,13 +32,11 @@
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
                        32-bit;
-                        linux,phandle = <201>;
                };
        };
        memory {
                device_type = "memory";
-                linux,phandle = <300>;
                reg = <00000000 08000000>;      // 128M at 0x0
        };
@@ -58,7 +54,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
@@ -68,24 +64,20 @@
                        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 = <35 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                        ethernet-phy@1 {
+                        phy1: ethernet-phy@1 {
-                                linux,phandle = <2452001>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <35 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
-                        ethernet-phy@3 {
+                        phy3: ethernet-phy@3 {
-                                linux,phandle = <2452003>;
+                                interrupt-parent = <&mpic>;
-                                interrupt-parent = <40000>;
                                interrupts = <37 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -102,8 +94,8 @@
                        address = [ 00 E0 0C 00 73 00 ];
                        local-mac-address = [ 00 E0 0C 00 73 00 ];
                        interrupts = <d 2 e 2 12 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
-                        phy-handle = <2452000>;
+                        phy-handle = <&phy0>;
                };
                ethernet@25000 {
@@ -116,8 +108,8 @@
                        address = [ 00 E0 0C 00 73 01 ];
                        local-mac-address = [ 00 E0 0C 00 73 01 ];
                        interrupts = <13 2 14 2 18 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
-                        phy-handle = <2452001>;
+                        phy-handle = <&phy1>;
                };
                ethernet@26000 {
@@ -130,8 +122,8 @@
                        address = [ 00 E0 0C 00 73 02 ];
                        local-mac-address = [ 00 E0 0C 00 73 02 ];
                        interrupts = <19 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
-                        phy-handle = <2452003>;
+                        phy-handle = <&phy3>;
                };
                serial@4500 {
@@ -140,7 +132,7 @@
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                };
                serial@4600 {
@@ -149,85 +141,84 @@
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                };
                pci@8000 {
-                        linux,phandle = <8000>;
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
                                /* IDSEL 0x02 */
-                                1000 0 0 1 40000 31 1
+                                1000 0 0 1 &mpic 31 1
-                                1000 0 0 2 40000 32 1
+                                1000 0 0 2 &mpic 32 1
-                                1000 0 0 3 40000 33 1
+                                1000 0 0 3 &mpic 33 1
-                                1000 0 0 4 40000 34 1
+                                1000 0 0 4 &mpic 34 1
                                /* IDSEL 0x03 */
-                                1800 0 0 1 40000 34 1
+                                1800 0 0 1 &mpic 34 1
-                                1800 0 0 2 40000 31 1
+                                1800 0 0 2 &mpic 31 1
-                                1800 0 0 3 40000 32 1
+                                1800 0 0 3 &mpic 32 1
-                                1800 0 0 4 40000 33 1
+                                1800 0 0 4 &mpic 33 1
                                /* IDSEL 0x04 */
-                                2000 0 0 1 40000 33 1
+                                2000 0 0 1 &mpic 33 1
-                                2000 0 0 2 40000 34 1
+                                2000 0 0 2 &mpic 34 1
-                                2000 0 0 3 40000 31 1
+                                2000 0 0 3 &mpic 31 1
-                                2000 0 0 4 40000 32 1
+                                2000 0 0 4 &mpic 32 1
                                /* IDSEL 0x05 */
-                                2800 0 0 1 40000 32 1
+                                2800 0 0 1 &mpic 32 1
-                                2800 0 0 2 40000 33 1
+                                2800 0 0 2 &mpic 33 1
-                                2800 0 0 3 40000 34 1
+                                2800 0 0 3 &mpic 34 1
-                                2800 0 0 4 40000 31 1
+                                2800 0 0 4 &mpic 31 1
                                /* IDSEL 0x0c */
-                                6000 0 0 1 40000 31 1
+                                6000 0 0 1 &mpic 31 1
-                                6000 0 0 2 40000 32 1
+                                6000 0 0 2 &mpic 32 1
-                                6000 0 0 3 40000 33 1
+                                6000 0 0 3 &mpic 33 1
-                                6000 0 0 4 40000 34 1
+                                6000 0 0 4 &mpic 34 1
                                /* IDSEL 0x0d */
-                                6800 0 0 1 40000 34 1
+                                6800 0 0 1 &mpic 34 1
-                                6800 0 0 2 40000 31 1
+                                6800 0 0 2 &mpic 31 1
-                                6800 0 0 3 40000 32 1
+                                6800 0 0 3 &mpic 32 1
-                                6800 0 0 4 40000 33 1
+                                6800 0 0 4 &mpic 33 1
                                /* IDSEL 0x0e */
-                                7000 0 0 1 40000 33 1
+                                7000 0 0 1 &mpic 33 1
-                                7000 0 0 2 40000 34 1
+                                7000 0 0 2 &mpic 34 1
-                                7000 0 0 3 40000 31 1
+                                7000 0 0 3 &mpic 31 1
-                                7000 0 0 4 40000 32 1
+                                7000 0 0 4 &mpic 32 1
                                /* IDSEL 0x0f */
-                                7800 0 0 1 40000 32 1
+                                7800 0 0 1 &mpic 32 1
-                                7800 0 0 2 40000 33 1
+                                7800 0 0 2 &mpic 33 1
-                                7800 0 0 3 40000 34 1
+                                7800 0 0 3 &mpic 34 1
-                                7800 0 0 4 40000 31 1
+                                7800 0 0 4 &mpic 31 1
                                /* IDSEL 0x12 */
-                                9000 0 0 1 40000 31 1
+                                9000 0 0 1 &mpic 31 1
-                                9000 0 0 2 40000 32 1
+                                9000 0 0 2 &mpic 32 1
-                                9000 0 0 3 40000 33 1
+                                9000 0 0 3 &mpic 33 1
-                                9000 0 0 4 40000 34 1
+                                9000 0 0 4 &mpic 34 1
                                /* IDSEL 0x13 */
-                                9800 0 0 1 40000 34 1
+                                9800 0 0 1 &mpic 34 1
-                                9800 0 0 2 40000 31 1
+                                9800 0 0 2 &mpic 31 1
-                                9800 0 0 3 40000 32 1
+                                9800 0 0 3 &mpic 32 1
-                                9800 0 0 4 40000 33 1
+                                9800 0 0 4 &mpic 33 1
                                /* IDSEL 0x14 */
-                                a000 0 0 1 40000 33 1
+                                a000 0 0 1 &mpic 33 1
-                                a000 0 0 2 40000 34 1
+                                a000 0 0 2 &mpic 34 1
-                                a000 0 0 3 40000 31 1
+                                a000 0 0 3 &mpic 31 1
-                                a000 0 0 4 40000 32 1
+                                a000 0 0 4 &mpic 32 1
                                /* IDSEL 0x15 */
-                                a800 0 0 1 40000 32 1
+                                a800 0 0 1 &mpic 32 1
-                                a800 0 0 2 40000 33 1
+                                a800 0 0 2 &mpic 33 1
-                                a800 0 0 3 40000 34 1
+                                a800 0 0 3 &mpic 34 1
-                                a800 0 0 4 40000 31 1>;
+                                a800 0 0 4 &mpic 31 1>;
-                        interrupt-parent = <40000>;
+                        interrupt-parent = <&mpic>;
                        interrupts = <08 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
@@ -241,8 +232,7 @@
                        device_type = "pci";
                };
-                pic@40000 {
+                mpic: pic@40000 {
-                        linux,phandle = <40000>;
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;

diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index 5f41c1f7a5f3..3c0917fa791c 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -12,16 +12,14 @@
12		12
13	/ {	13	/ {
14	model = "MPC8540ADS";	14	model = "MPC8540ADS";
15	compatible = "MPC85xxADS";	15	compatible = "MPC8540ADS", "MPC85xxADS";
16	#address-cells = <1>;	16	#address-cells = <1>;
17	#size-cells = <1>;	17	#size-cells = <1>;
18	linux,phandle = <100>;
19		18
20	cpus {	19	cpus {
21	#cpus = <1>;	20	#cpus = <1>;
22	#address-cells = <1>;	21	#address-cells = <1>;
23	#size-cells = <0>;	22	#size-cells = <0>;
24	linux,phandle = <200>;
25		23
26	PowerPC,8540@0 {	24	PowerPC,8540@0 {
27	device_type = "cpu";	25	device_type = "cpu";
@@ -34,13 +32,11 @@
34	bus-frequency = <0>; // 166 MHz	32	bus-frequency = <0>; // 166 MHz
35	clock-frequency = <0>; // 825 MHz, from uboot	33	clock-frequency = <0>; // 825 MHz, from uboot
36	32-bit;	34	32-bit;
37	linux,phandle = <201>;
38	};	35	};
39	};	36	};
40		37
41	memory {	38	memory {
42	device_type = "memory";	39	device_type = "memory";
43	linux,phandle = <300>;
44	reg = <00000000 08000000>; // 128M at 0x0	40	reg = <00000000 08000000>; // 128M at 0x0
45	};	41	};
46		42
@@ -58,7 +54,7 @@
58	compatible = "fsl-i2c";	54	compatible = "fsl-i2c";
59	reg = <3000 100>;	55	reg = <3000 100>;
60	interrupts = <1b 2>;	56	interrupts = <1b 2>;
61	interrupt-parent = <40000>;	57	interrupt-parent = <&mpic>;
62	dfsrr;	58	dfsrr;
63	};	59	};
64		60
@@ -68,24 +64,20 @@
68	device_type = "mdio";	64	device_type = "mdio";
69	compatible = "gianfar";	65	compatible = "gianfar";
70	reg = <24520 20>;	66	reg = <24520 20>;
71	linux,phandle = <24520>;	67	phy0: ethernet-phy@0 {
72	ethernet-phy@0 {	68	interrupt-parent = <&mpic>;
73	linux,phandle = <2452000>;
74	interrupt-parent = <40000>;
75	interrupts = <35 1>;	69	interrupts = <35 1>;
76	reg = <0>;	70	reg = <0>;
77	device_type = "ethernet-phy";	71	device_type = "ethernet-phy";
78	};	72	};
79	ethernet-phy@1 {	73	phy1: ethernet-phy@1 {
80	linux,phandle = <2452001>;	74	interrupt-parent = <&mpic>;
81	interrupt-parent = <40000>;
82	interrupts = <35 1>;	75	interrupts = <35 1>;
83	reg = <1>;	76	reg = <1>;
84	device_type = "ethernet-phy";	77	device_type = "ethernet-phy";
85	};	78	};
86	ethernet-phy@3 {	79	phy3: ethernet-phy@3 {
87	linux,phandle = <2452003>;	80	interrupt-parent = <&mpic>;
88	interrupt-parent = <40000>;
89	interrupts = <37 1>;	81	interrupts = <37 1>;
90	reg = <3>;	82	reg = <3>;
91	device_type = "ethernet-phy";	83	device_type = "ethernet-phy";
@@ -102,8 +94,8 @@
102	address = [ 00 E0 0C 00 73 00 ];	94	address = [ 00 E0 0C 00 73 00 ];
103	local-mac-address = [ 00 E0 0C 00 73 00 ];	95	local-mac-address = [ 00 E0 0C 00 73 00 ];
104	interrupts = <d 2 e 2 12 2>;	96	interrupts = <d 2 e 2 12 2>;
105	interrupt-parent = <40000>;	97	interrupt-parent = <&mpic>;
106	phy-handle = <2452000>;	98	phy-handle = <&phy0>;
107	};	99	};
108		100
109	ethernet@25000 {	101	ethernet@25000 {
@@ -116,8 +108,8 @@
116	address = [ 00 E0 0C 00 73 01 ];	108	address = [ 00 E0 0C 00 73 01 ];
117	local-mac-address = [ 00 E0 0C 00 73 01 ];	109	local-mac-address = [ 00 E0 0C 00 73 01 ];
118	interrupts = <13 2 14 2 18 2>;	110	interrupts = <13 2 14 2 18 2>;
119	interrupt-parent = <40000>;	111	interrupt-parent = <&mpic>;
120	phy-handle = <2452001>;	112	phy-handle = <&phy1>;
121	};	113	};
122		114
123	ethernet@26000 {	115	ethernet@26000 {
@@ -130,8 +122,8 @@
130	address = [ 00 E0 0C 00 73 02 ];	122	address = [ 00 E0 0C 00 73 02 ];
131	local-mac-address = [ 00 E0 0C 00 73 02 ];	123	local-mac-address = [ 00 E0 0C 00 73 02 ];
132	interrupts = <19 2>;	124	interrupts = <19 2>;
133	interrupt-parent = <40000>;	125	interrupt-parent = <&mpic>;
134	phy-handle = <2452003>;	126	phy-handle = <&phy3>;
135	};	127	};
136		128
137	serial@4500 {	129	serial@4500 {
@@ -140,7 +132,7 @@
140	reg = <4500 100>; // reg base, size	132	reg = <4500 100>; // reg base, size
141	clock-frequency = <0>; // should we fill in in uboot?	133	clock-frequency = <0>; // should we fill in in uboot?
142	interrupts = <1a 2>;	134	interrupts = <1a 2>;
143	interrupt-parent = <40000>;	135	interrupt-parent = <&mpic>;
144	};	136	};
145		137
146	serial@4600 {	138	serial@4600 {
@@ -149,85 +141,84 @@
149	reg = <4600 100>; // reg base, size	141	reg = <4600 100>; // reg base, size
150	clock-frequency = <0>; // should we fill in in uboot?	142	clock-frequency = <0>; // should we fill in in uboot?
151	interrupts = <1a 2>;	143	interrupts = <1a 2>;
152	interrupt-parent = <40000>;	144	interrupt-parent = <&mpic>;
153	};	145	};
154	pci@8000 {	146	pci@8000 {
155	linux,phandle = <8000>;
156	interrupt-map-mask = <f800 0 0 7>;	147	interrupt-map-mask = <f800 0 0 7>;
157	interrupt-map = <	148	interrupt-map = <
158		149
159	/* IDSEL 0x02 */	150	/* IDSEL 0x02 */
160	1000 0 0 1 40000 31 1	151	1000 0 0 1 &mpic 31 1
161	1000 0 0 2 40000 32 1	152	1000 0 0 2 &mpic 32 1
162	1000 0 0 3 40000 33 1	153	1000 0 0 3 &mpic 33 1
163	1000 0 0 4 40000 34 1	154	1000 0 0 4 &mpic 34 1
164		155
165	/* IDSEL 0x03 */	156	/* IDSEL 0x03 */
166	1800 0 0 1 40000 34 1	157	1800 0 0 1 &mpic 34 1
167	1800 0 0 2 40000 31 1	158	1800 0 0 2 &mpic 31 1
168	1800 0 0 3 40000 32 1	159	1800 0 0 3 &mpic 32 1
169	1800 0 0 4 40000 33 1	160	1800 0 0 4 &mpic 33 1
170		161
171	/* IDSEL 0x04 */	162	/* IDSEL 0x04 */
172	2000 0 0 1 40000 33 1	163	2000 0 0 1 &mpic 33 1
173	2000 0 0 2 40000 34 1	164	2000 0 0 2 &mpic 34 1
174	2000 0 0 3 40000 31 1	165	2000 0 0 3 &mpic 31 1
175	2000 0 0 4 40000 32 1	166	2000 0 0 4 &mpic 32 1
176		167
177	/* IDSEL 0x05 */	168	/* IDSEL 0x05 */
178	2800 0 0 1 40000 32 1	169	2800 0 0 1 &mpic 32 1
179	2800 0 0 2 40000 33 1	170	2800 0 0 2 &mpic 33 1
180	2800 0 0 3 40000 34 1	171	2800 0 0 3 &mpic 34 1
181	2800 0 0 4 40000 31 1	172	2800 0 0 4 &mpic 31 1
182		173
183	/* IDSEL 0x0c */	174	/* IDSEL 0x0c */
184	6000 0 0 1 40000 31 1	175	6000 0 0 1 &mpic 31 1
185	6000 0 0 2 40000 32 1	176	6000 0 0 2 &mpic 32 1
186	6000 0 0 3 40000 33 1	177	6000 0 0 3 &mpic 33 1
187	6000 0 0 4 40000 34 1	178	6000 0 0 4 &mpic 34 1
188		179
189	/* IDSEL 0x0d */	180	/* IDSEL 0x0d */
190	6800 0 0 1 40000 34 1	181	6800 0 0 1 &mpic 34 1
191	6800 0 0 2 40000 31 1	182	6800 0 0 2 &mpic 31 1
192	6800 0 0 3 40000 32 1	183	6800 0 0 3 &mpic 32 1
193	6800 0 0 4 40000 33 1	184	6800 0 0 4 &mpic 33 1
194		185
195	/* IDSEL 0x0e */	186	/* IDSEL 0x0e */
196	7000 0 0 1 40000 33 1	187	7000 0 0 1 &mpic 33 1
197	7000 0 0 2 40000 34 1	188	7000 0 0 2 &mpic 34 1
198	7000 0 0 3 40000 31 1	189	7000 0 0 3 &mpic 31 1
199	7000 0 0 4 40000 32 1	190	7000 0 0 4 &mpic 32 1
200		191
201	/* IDSEL 0x0f */	192	/* IDSEL 0x0f */
202	7800 0 0 1 40000 32 1	193	7800 0 0 1 &mpic 32 1
203	7800 0 0 2 40000 33 1	194	7800 0 0 2 &mpic 33 1
204	7800 0 0 3 40000 34 1	195	7800 0 0 3 &mpic 34 1
205	7800 0 0 4 40000 31 1	196	7800 0 0 4 &mpic 31 1
206		197
207	/* IDSEL 0x12 */	198	/* IDSEL 0x12 */
208	9000 0 0 1 40000 31 1	199	9000 0 0 1 &mpic 31 1
209	9000 0 0 2 40000 32 1	200	9000 0 0 2 &mpic 32 1
210	9000 0 0 3 40000 33 1	201	9000 0 0 3 &mpic 33 1
211	9000 0 0 4 40000 34 1	202	9000 0 0 4 &mpic 34 1
212		203
213	/* IDSEL 0x13 */	204	/* IDSEL 0x13 */
214	9800 0 0 1 40000 34 1	205	9800 0 0 1 &mpic 34 1
215	9800 0 0 2 40000 31 1	206	9800 0 0 2 &mpic 31 1
216	9800 0 0 3 40000 32 1	207	9800 0 0 3 &mpic 32 1
217	9800 0 0 4 40000 33 1	208	9800 0 0 4 &mpic 33 1
218		209
219	/* IDSEL 0x14 */	210	/* IDSEL 0x14 */
220	a000 0 0 1 40000 33 1	211	a000 0 0 1 &mpic 33 1
221	a000 0 0 2 40000 34 1	212	a000 0 0 2 &mpic 34 1
222	a000 0 0 3 40000 31 1	213	a000 0 0 3 &mpic 31 1
223	a000 0 0 4 40000 32 1	214	a000 0 0 4 &mpic 32 1
224		215
225	/* IDSEL 0x15 */	216	/* IDSEL 0x15 */
226	a800 0 0 1 40000 32 1	217	a800 0 0 1 &mpic 32 1
227	a800 0 0 2 40000 33 1	218	a800 0 0 2 &mpic 33 1
228	a800 0 0 3 40000 34 1	219	a800 0 0 3 &mpic 34 1
229	a800 0 0 4 40000 31 1>;	220	a800 0 0 4 &mpic 31 1>;
230	interrupt-parent = <40000>;	221	interrupt-parent = <&mpic>;
231	interrupts = <08 2>;	222	interrupts = <08 2>;
232	bus-range = <0 0>;	223	bus-range = <0 0>;
233	ranges = <02000000 0 80000000 80000000 0 20000000	224	ranges = <02000000 0 80000000 80000000 0 20000000
@@ -241,8 +232,7 @@
241	device_type = "pci";	232	device_type = "pci";
242	};	233	};
243		234
244	pic@40000 {	235	mpic: pic@40000 {
245	linux,phandle = <40000>;
246	clock-frequency = <0>;	236	clock-frequency = <0>;
247	interrupt-controller;	237	interrupt-controller;
248	#address-cells = <0>;	238	#address-cells = <0>;