diff options
author | Vitaly Bordug <vitb@kernel.crashing.org> | 2007-07-09 14:37:36 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-10 01:34:08 -0400 |
commit | b8ce2272becc87894d95cbdbba42ae72115131f2 (patch) | |
tree | 800258ff40f8a8ab28b4d8b790865cff31e4f578 | |
parent | 80128ff79d282cf71b1819dbca9b8dd47d8ed3e8 (diff) |
[POWERPC] dts: kill hardcoded phandles
Removed explicit linux,phandle usage. Using references and labels now in PQ
and PQ2 boards currently supported in arch/powerpc.
Signed-off-by: Vitaly Bordug <vitb@kernel.crashing.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/boot/dts/mpc8272ads.dts | 42 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc866ads.dts | 31 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc885ads.dts | 45 |
3 files changed, 43 insertions, 75 deletions
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts index 423eedcf634f..1934b800278e 100644 --- a/arch/powerpc/boot/dts/mpc8272ads.dts +++ b/arch/powerpc/boot/dts/mpc8272ads.dts | |||
@@ -14,12 +14,10 @@ | |||
14 | compatible = "MPC8260ADS"; | 14 | compatible = "MPC8260ADS"; |
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | linux,phandle = <100>; | ||
18 | 17 | ||
19 | cpus { | 18 | cpus { |
20 | #address-cells = <1>; | 19 | #address-cells = <1>; |
21 | #size-cells = <0>; | 20 | #size-cells = <0>; |
22 | linux,phandle = <200>; | ||
23 | 21 | ||
24 | PowerPC,8272@0 { | 22 | PowerPC,8272@0 { |
25 | device_type = "cpu"; | 23 | device_type = "cpu"; |
@@ -32,12 +30,10 @@ | |||
32 | bus-frequency = <0>; | 30 | bus-frequency = <0>; |
33 | clock-frequency = <0>; | 31 | clock-frequency = <0>; |
34 | 32-bit; | 32 | 32-bit; |
35 | linux,phandle = <201>; | ||
36 | }; | 33 | }; |
37 | }; | 34 | }; |
38 | 35 | ||
39 | interrupt-controller@f8200000 { | 36 | pci_pic: interrupt-controller@f8200000 { |
40 | linux,phandle = <f8200000>; | ||
41 | #address-cells = <0>; | 37 | #address-cells = <0>; |
42 | #interrupt-cells = <2>; | 38 | #interrupt-cells = <2>; |
43 | interrupt-controller; | 39 | interrupt-controller; |
@@ -47,15 +43,13 @@ | |||
47 | }; | 43 | }; |
48 | memory { | 44 | memory { |
49 | device_type = "memory"; | 45 | device_type = "memory"; |
50 | linux,phandle = <300>; | ||
51 | reg = <00000000 4000000 f4500000 00000020>; | 46 | reg = <00000000 4000000 f4500000 00000020>; |
52 | }; | 47 | }; |
53 | 48 | ||
54 | chosen { | 49 | chosen { |
55 | name = "chosen"; | 50 | name = "chosen"; |
56 | linux,platform = <0>; | 51 | linux,platform = <0>; |
57 | interrupt-controller = <10c00>; | 52 | interrupt-controller = <&Cpm_pic>; |
58 | linux,phandle = <400>; | ||
59 | }; | 53 | }; |
60 | 54 | ||
61 | soc8272@f0000000 { | 55 | soc8272@f0000000 { |
@@ -70,20 +64,17 @@ | |||
70 | device_type = "mdio"; | 64 | device_type = "mdio"; |
71 | compatible = "fs_enet"; | 65 | compatible = "fs_enet"; |
72 | reg = <0 0>; | 66 | reg = <0 0>; |
73 | linux,phandle = <24520>; | ||
74 | #address-cells = <1>; | 67 | #address-cells = <1>; |
75 | #size-cells = <0>; | 68 | #size-cells = <0>; |
76 | ethernet-phy@0 { | 69 | phy0:ethernet-phy@0 { |
77 | linux,phandle = <2452000>; | 70 | interrupt-parent = <&Cpm_pic>; |
78 | interrupt-parent = <10c00>; | ||
79 | interrupts = <17 4>; | 71 | interrupts = <17 4>; |
80 | reg = <0>; | 72 | reg = <0>; |
81 | bitbang = [ 12 12 13 02 02 01 ]; | 73 | bitbang = [ 12 12 13 02 02 01 ]; |
82 | device_type = "ethernet-phy"; | 74 | device_type = "ethernet-phy"; |
83 | }; | 75 | }; |
84 | ethernet-phy@1 { | 76 | phy1:ethernet-phy@1 { |
85 | linux,phandle = <2452001>; | 77 | interrupt-parent = <&Cpm_pic>; |
86 | interrupt-parent = <10c00>; | ||
87 | interrupts = <17 4>; | 78 | interrupts = <17 4>; |
88 | bitbang = [ 12 12 13 02 02 01 ]; | 79 | bitbang = [ 12 12 13 02 02 01 ]; |
89 | reg = <3>; | 80 | reg = <3>; |
@@ -101,8 +92,8 @@ | |||
101 | reg = <11300 20 8400 100 11380 30>; | 92 | reg = <11300 20 8400 100 11380 30>; |
102 | mac-address = [ 00 11 2F 99 43 54 ]; | 93 | mac-address = [ 00 11 2F 99 43 54 ]; |
103 | interrupts = <20 2>; | 94 | interrupts = <20 2>; |
104 | interrupt-parent = <10c00>; | 95 | interrupt-parent = <&Cpm_pic>; |
105 | phy-handle = <2452000>; | 96 | phy-handle = <&Phy0>; |
106 | rx-clock = <13>; | 97 | rx-clock = <13>; |
107 | tx-clock = <12>; | 98 | tx-clock = <12>; |
108 | }; | 99 | }; |
@@ -115,14 +106,13 @@ | |||
115 | reg = <11320 20 8500 100 113b0 30>; | 106 | reg = <11320 20 8500 100 113b0 30>; |
116 | mac-address = [ 00 11 2F 99 44 54 ]; | 107 | mac-address = [ 00 11 2F 99 44 54 ]; |
117 | interrupts = <21 2>; | 108 | interrupts = <21 2>; |
118 | interrupt-parent = <10c00>; | 109 | interrupt-parent = <&Cpm_pic>; |
119 | phy-handle = <2452001>; | 110 | phy-handle = <&Phy1>; |
120 | rx-clock = <17>; | 111 | rx-clock = <17>; |
121 | tx-clock = <18>; | 112 | tx-clock = <18>; |
122 | }; | 113 | }; |
123 | 114 | ||
124 | cpm@f0000000 { | 115 | cpm@f0000000 { |
125 | linux,phandle = <f0000000>; | ||
126 | #address-cells = <1>; | 116 | #address-cells = <1>; |
127 | #size-cells = <1>; | 117 | #size-cells = <1>; |
128 | #interrupt-cells = <2>; | 118 | #interrupt-cells = <2>; |
@@ -142,7 +132,7 @@ | |||
142 | reg = <11a00 20 8000 100>; | 132 | reg = <11a00 20 8000 100>; |
143 | current-speed = <1c200>; | 133 | current-speed = <1c200>; |
144 | interrupts = <28 2>; | 134 | interrupts = <28 2>; |
145 | interrupt-parent = <10c00>; | 135 | interrupt-parent = <&Cpm_pic>; |
146 | clock-setup = <0 00ffffff>; | 136 | clock-setup = <0 00ffffff>; |
147 | rx-clock = <1>; | 137 | rx-clock = <1>; |
148 | tx-clock = <1>; | 138 | tx-clock = <1>; |
@@ -156,15 +146,14 @@ | |||
156 | reg = <11a60 20 8300 100>; | 146 | reg = <11a60 20 8300 100>; |
157 | current-speed = <1c200>; | 147 | current-speed = <1c200>; |
158 | interrupts = <2b 2>; | 148 | interrupts = <2b 2>; |
159 | interrupt-parent = <10c00>; | 149 | interrupt-parent = <&Cpm_pic>; |
160 | clock-setup = <1b ffffff00>; | 150 | clock-setup = <1b ffffff00>; |
161 | rx-clock = <4>; | 151 | rx-clock = <4>; |
162 | tx-clock = <4>; | 152 | tx-clock = <4>; |
163 | }; | 153 | }; |
164 | 154 | ||
165 | }; | 155 | }; |
166 | interrupt-controller@10c00 { | 156 | cpm_pic:interrupt-controller@10c00 { |
167 | linux,phandle = <10c00>; | ||
168 | #address-cells = <0>; | 157 | #address-cells = <0>; |
169 | #interrupt-cells = <2>; | 158 | #interrupt-cells = <2>; |
170 | interrupt-controller; | 159 | interrupt-controller; |
@@ -174,7 +163,6 @@ | |||
174 | compatible = "CPM2"; | 163 | compatible = "CPM2"; |
175 | }; | 164 | }; |
176 | pci@0500 { | 165 | pci@0500 { |
177 | linux,phandle = <0500>; | ||
178 | #interrupt-cells = <1>; | 166 | #interrupt-cells = <1>; |
179 | #size-cells = <2>; | 167 | #size-cells = <2>; |
180 | #address-cells = <3>; | 168 | #address-cells = <3>; |
@@ -202,7 +190,7 @@ | |||
202 | c000 0 0 2 f8200000 43 8 | 190 | c000 0 0 2 f8200000 43 8 |
203 | c000 0 0 3 f8200000 40 8 | 191 | c000 0 0 3 f8200000 40 8 |
204 | c000 0 0 4 f8200000 41 8>; | 192 | c000 0 0 4 f8200000 41 8>; |
205 | interrupt-parent = <10c00>; | 193 | interrupt-parent = <&Cpm_pic>; |
206 | interrupts = <14 8>; | 194 | interrupts = <14 8>; |
207 | bus-range = <0 0>; | 195 | bus-range = <0 0>; |
208 | ranges = <02000000 0 80000000 80000000 0 40000000 | 196 | ranges = <02000000 0 80000000 80000000 0 40000000 |
@@ -216,7 +204,7 @@ | |||
216 | compatible = "talitos"; | 204 | compatible = "talitos"; |
217 | reg = <30000 10000>; | 205 | reg = <30000 10000>; |
218 | interrupts = <b 2>; | 206 | interrupts = <b 2>; |
219 | interrupt-parent = <10c00>; | 207 | interrupt-parent = <&Cpm_pic>; |
220 | num-channels = <4>; | 208 | num-channels = <4>; |
221 | channel-fifo-len = <18>; | 209 | channel-fifo-len = <18>; |
222 | exec-units-mask = <0000007e>; | 210 | exec-units-mask = <0000007e>; |
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts index c0d06fd12927..e5e7726ddb03 100644 --- a/arch/powerpc/boot/dts/mpc866ads.dts +++ b/arch/powerpc/boot/dts/mpc866ads.dts | |||
@@ -15,12 +15,10 @@ | |||
15 | compatible = "mpc8xx"; | 15 | compatible = "mpc8xx"; |
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 | #address-cells = <1>; | 20 | #address-cells = <1>; |
22 | #size-cells = <0>; | 21 | #size-cells = <0>; |
23 | linux,phandle = <200>; | ||
24 | 22 | ||
25 | PowerPC,866@0 { | 23 | PowerPC,866@0 { |
26 | device_type = "cpu"; | 24 | device_type = "cpu"; |
@@ -34,14 +32,12 @@ | |||
34 | clock-frequency = <0>; | 32 | clock-frequency = <0>; |
35 | 32-bit; | 33 | 32-bit; |
36 | interrupts = <f 2>; // decrementer interrupt | 34 | interrupts = <f 2>; // decrementer interrupt |
37 | interrupt-parent = <ff000000>; | 35 | interrupt-parent = <&Mpc8xx_pic>; |
38 | linux,phandle = <201>; | ||
39 | }; | 36 | }; |
40 | }; | 37 | }; |
41 | 38 | ||
42 | memory { | 39 | memory { |
43 | device_type = "memory"; | 40 | device_type = "memory"; |
44 | linux,phandle = <300>; | ||
45 | reg = <00000000 800000>; | 41 | reg = <00000000 800000>; |
46 | }; | 42 | }; |
47 | 43 | ||
@@ -57,11 +53,9 @@ | |||
57 | device_type = "mdio"; | 53 | device_type = "mdio"; |
58 | compatible = "fs_enet"; | 54 | compatible = "fs_enet"; |
59 | reg = <e80 8>; | 55 | reg = <e80 8>; |
60 | linux,phandle = <e80>; | ||
61 | #address-cells = <1>; | 56 | #address-cells = <1>; |
62 | #size-cells = <0>; | 57 | #size-cells = <0>; |
63 | ethernet-phy@f { | 58 | phy: ethernet-phy@f { |
64 | linux,phandle = <e800f>; | ||
65 | reg = <f>; | 59 | reg = <f>; |
66 | device_type = "ethernet-phy"; | 60 | device_type = "ethernet-phy"; |
67 | }; | 61 | }; |
@@ -75,12 +69,11 @@ | |||
75 | reg = <e00 188>; | 69 | reg = <e00 188>; |
76 | mac-address = [ 00 00 0C 00 01 FD ]; | 70 | mac-address = [ 00 00 0C 00 01 FD ]; |
77 | interrupts = <3 1>; | 71 | interrupts = <3 1>; |
78 | interrupt-parent = <ff000000>; | 72 | interrupt-parent = <&Mpc8xx_pic>; |
79 | phy-handle = <e800f>; | 73 | phy-handle = <&Phy>; |
80 | }; | 74 | }; |
81 | 75 | ||
82 | pic@ff000000 { | 76 | mpc8xx_pic: pic@ff000000 { |
83 | linux,phandle = <ff000000>; | ||
84 | interrupt-controller; | 77 | interrupt-controller; |
85 | #address-cells = <0>; | 78 | #address-cells = <0>; |
86 | #interrupt-cells = <2>; | 79 | #interrupt-cells = <2>; |
@@ -91,7 +84,6 @@ | |||
91 | }; | 84 | }; |
92 | 85 | ||
93 | cpm@ff000000 { | 86 | cpm@ff000000 { |
94 | linux,phandle = <ff000000>; | ||
95 | #address-cells = <1>; | 87 | #address-cells = <1>; |
96 | #size-cells = <1>; | 88 | #size-cells = <1>; |
97 | #interrupt-cells = <2>; | 89 | #interrupt-cells = <2>; |
@@ -102,15 +94,14 @@ | |||
102 | command-proc = <9c0>; | 94 | command-proc = <9c0>; |
103 | brg-frequency = <0>; | 95 | brg-frequency = <0>; |
104 | interrupts = <0 2>; // cpm error interrupt | 96 | interrupts = <0 2>; // cpm error interrupt |
105 | interrupt-parent = <930>; | 97 | interrupt-parent = <&Cpm_pic>; |
106 | 98 | ||
107 | pic@930 { | 99 | cpm_pic: pic@930 { |
108 | linux,phandle = <930>; | ||
109 | interrupt-controller; | 100 | interrupt-controller; |
110 | #address-cells = <0>; | 101 | #address-cells = <0>; |
111 | #interrupt-cells = <2>; | 102 | #interrupt-cells = <2>; |
112 | interrupts = <5 2 0 2>; | 103 | interrupts = <5 2 0 2>; |
113 | interrupt-parent = <ff000000>; | 104 | interrupt-parent = <&Mpc8xx_pic>; |
114 | reg = <930 20>; | 105 | reg = <930 20>; |
115 | built-in; | 106 | built-in; |
116 | device_type = "cpm-pic"; | 107 | device_type = "cpm-pic"; |
@@ -128,7 +119,7 @@ | |||
128 | tx-clock = <1>; | 119 | tx-clock = <1>; |
129 | current-speed = <0>; | 120 | current-speed = <0>; |
130 | interrupts = <4 3>; | 121 | interrupts = <4 3>; |
131 | interrupt-parent = <930>; | 122 | interrupt-parent = <&Cpm_pic>; |
132 | }; | 123 | }; |
133 | 124 | ||
134 | smc@a90 { | 125 | smc@a90 { |
@@ -142,7 +133,7 @@ | |||
142 | tx-clock = <2>; | 133 | tx-clock = <2>; |
143 | current-speed = <0>; | 134 | current-speed = <0>; |
144 | interrupts = <3 3>; | 135 | interrupts = <3 3>; |
145 | interrupt-parent = <930>; | 136 | interrupt-parent = <&Cpm_pic>; |
146 | }; | 137 | }; |
147 | 138 | ||
148 | scc@a00 { | 139 | scc@a00 { |
@@ -153,7 +144,7 @@ | |||
153 | reg = <a00 18 3c00 80>; | 144 | reg = <a00 18 3c00 80>; |
154 | mac-address = [ 00 00 0C 00 03 FD ]; | 145 | mac-address = [ 00 00 0C 00 03 FD ]; |
155 | interrupts = <1e 3>; | 146 | interrupts = <1e 3>; |
156 | interrupt-parent = <930>; | 147 | interrupt-parent = <&Cpm_pic>; |
157 | }; | 148 | }; |
158 | }; | 149 | }; |
159 | }; | 150 | }; |
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts index aee01087a932..dc7ab9c80611 100644 --- a/arch/powerpc/boot/dts/mpc885ads.dts +++ b/arch/powerpc/boot/dts/mpc885ads.dts | |||
@@ -15,12 +15,10 @@ | |||
15 | compatible = "mpc8xx"; | 15 | compatible = "mpc8xx"; |
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 | #address-cells = <1>; | 20 | #address-cells = <1>; |
22 | #size-cells = <0>; | 21 | #size-cells = <0>; |
23 | linux,phandle = <200>; | ||
24 | 22 | ||
25 | PowerPC,885@0 { | 23 | PowerPC,885@0 { |
26 | device_type = "cpu"; | 24 | device_type = "cpu"; |
@@ -34,14 +32,12 @@ | |||
34 | clock-frequency = <0>; | 32 | clock-frequency = <0>; |
35 | 32-bit; | 33 | 32-bit; |
36 | interrupts = <f 2>; // decrementer interrupt | 34 | interrupts = <f 2>; // decrementer interrupt |
37 | interrupt-parent = <ff000000>; | 35 | interrupt-parent = <&Mpc8xx_pic>; |
38 | linux,phandle = <201>; | ||
39 | }; | 36 | }; |
40 | }; | 37 | }; |
41 | 38 | ||
42 | memory { | 39 | memory { |
43 | device_type = "memory"; | 40 | device_type = "memory"; |
44 | linux,phandle = <300>; | ||
45 | reg = <00000000 800000>; | 41 | reg = <00000000 800000>; |
46 | }; | 42 | }; |
47 | 43 | ||
@@ -57,21 +53,17 @@ | |||
57 | device_type = "mdio"; | 53 | device_type = "mdio"; |
58 | compatible = "fs_enet"; | 54 | compatible = "fs_enet"; |
59 | reg = <e80 8>; | 55 | reg = <e80 8>; |
60 | linux,phandle = <e80>; | ||
61 | #address-cells = <1>; | 56 | #address-cells = <1>; |
62 | #size-cells = <0>; | 57 | #size-cells = <0>; |
63 | ethernet-phy@0 { | 58 | Phy0: ethernet-phy@0 { |
64 | linux,phandle = <e8000>; | ||
65 | reg = <0>; | 59 | reg = <0>; |
66 | device_type = "ethernet-phy"; | 60 | device_type = "ethernet-phy"; |
67 | }; | 61 | }; |
68 | ethernet-phy@1 { | 62 | Phy1: ethernet-phy@1 { |
69 | linux,phandle = <e8001>; | ||
70 | reg = <1>; | 63 | reg = <1>; |
71 | device_type = "ethernet-phy"; | 64 | device_type = "ethernet-phy"; |
72 | }; | 65 | }; |
73 | ethernet-phy@2 { | 66 | Phy2: ethernet-phy@2 { |
74 | linux,phandle = <e8002>; | ||
75 | reg = <2>; | 67 | reg = <2>; |
76 | device_type = "ethernet-phy"; | 68 | device_type = "ethernet-phy"; |
77 | }; | 69 | }; |
@@ -85,8 +77,8 @@ | |||
85 | reg = <e00 188>; | 77 | reg = <e00 188>; |
86 | mac-address = [ 00 00 0C 00 01 FD ]; | 78 | mac-address = [ 00 00 0C 00 01 FD ]; |
87 | interrupts = <3 1>; | 79 | interrupts = <3 1>; |
88 | interrupt-parent = <ff000000>; | 80 | interrupt-parent = <&Mpc8xx_pic>; |
89 | phy-handle = <e8000>; | 81 | phy-handle = <&Phy1>; |
90 | }; | 82 | }; |
91 | 83 | ||
92 | fec@1e00 { | 84 | fec@1e00 { |
@@ -97,12 +89,11 @@ | |||
97 | reg = <1e00 188>; | 89 | reg = <1e00 188>; |
98 | mac-address = [ 00 00 0C 00 02 FD ]; | 90 | mac-address = [ 00 00 0C 00 02 FD ]; |
99 | interrupts = <7 1>; | 91 | interrupts = <7 1>; |
100 | interrupt-parent = <ff000000>; | 92 | interrupt-parent = <&Mpc8xx_pic>; |
101 | phy-handle = <e8001>; | 93 | phy-handle = <&Phy2>; |
102 | }; | 94 | }; |
103 | 95 | ||
104 | pic@ff000000 { | 96 | Mpc8xx_pic: pic@ff000000 { |
105 | linux,phandle = <ff000000>; | ||
106 | interrupt-controller; | 97 | interrupt-controller; |
107 | #address-cells = <0>; | 98 | #address-cells = <0>; |
108 | #interrupt-cells = <2>; | 99 | #interrupt-cells = <2>; |
@@ -119,12 +110,11 @@ | |||
119 | compatible = "fsl,pq-pcmcia"; | 110 | compatible = "fsl,pq-pcmcia"; |
120 | device_type = "pcmcia"; | 111 | device_type = "pcmcia"; |
121 | reg = <80 80>; | 112 | reg = <80 80>; |
122 | interrupt-parent = <ff000000>; | 113 | interrupt-parent = <&Mpc8xx_pic>; |
123 | interrupts = <d 1>; | 114 | interrupts = <d 1>; |
124 | }; | 115 | }; |
125 | 116 | ||
126 | cpm@ff000000 { | 117 | cpm@ff000000 { |
127 | linux,phandle = <ff000000>; | ||
128 | #address-cells = <1>; | 118 | #address-cells = <1>; |
129 | #size-cells = <1>; | 119 | #size-cells = <1>; |
130 | #interrupt-cells = <2>; | 120 | #interrupt-cells = <2>; |
@@ -135,15 +125,14 @@ | |||
135 | command-proc = <9c0>; | 125 | command-proc = <9c0>; |
136 | brg-frequency = <0>; | 126 | brg-frequency = <0>; |
137 | interrupts = <0 2>; // cpm error interrupt | 127 | interrupts = <0 2>; // cpm error interrupt |
138 | interrupt-parent = <930>; | 128 | interrupt-parent = <&Cpm_pic>; |
139 | 129 | ||
140 | pic@930 { | 130 | Cpm_pic: pic@930 { |
141 | linux,phandle = <930>; | ||
142 | interrupt-controller; | 131 | interrupt-controller; |
143 | #address-cells = <0>; | 132 | #address-cells = <0>; |
144 | #interrupt-cells = <2>; | 133 | #interrupt-cells = <2>; |
145 | interrupts = <5 2 0 2>; | 134 | interrupts = <5 2 0 2>; |
146 | interrupt-parent = <ff000000>; | 135 | interrupt-parent = <&Mpc8xx_pic>; |
147 | reg = <930 20>; | 136 | reg = <930 20>; |
148 | built-in; | 137 | built-in; |
149 | device_type = "cpm-pic"; | 138 | device_type = "cpm-pic"; |
@@ -161,7 +150,7 @@ | |||
161 | tx-clock = <1>; | 150 | tx-clock = <1>; |
162 | current-speed = <0>; | 151 | current-speed = <0>; |
163 | interrupts = <4 3>; | 152 | interrupts = <4 3>; |
164 | interrupt-parent = <930>; | 153 | interrupt-parent = <&Cpm_pic>; |
165 | }; | 154 | }; |
166 | 155 | ||
167 | smc@a90 { | 156 | smc@a90 { |
@@ -175,7 +164,7 @@ | |||
175 | tx-clock = <2>; | 164 | tx-clock = <2>; |
176 | current-speed = <0>; | 165 | current-speed = <0>; |
177 | interrupts = <3 3>; | 166 | interrupts = <3 3>; |
178 | interrupt-parent = <930>; | 167 | interrupt-parent = <&Cpm_pic>; |
179 | }; | 168 | }; |
180 | 169 | ||
181 | scc@a40 { | 170 | scc@a40 { |
@@ -186,8 +175,8 @@ | |||
186 | reg = <a40 18 3e00 80>; | 175 | reg = <a40 18 3e00 80>; |
187 | mac-address = [ 00 00 0C 00 03 FD ]; | 176 | mac-address = [ 00 00 0C 00 03 FD ]; |
188 | interrupts = <1c 3>; | 177 | interrupts = <1c 3>; |
189 | interrupt-parent = <930>; | 178 | interrupt-parent = <&Cpm_pic>; |
190 | phy-handle = <e8002>; | 179 | phy-handle = <&Phy2>; |
191 | }; | 180 | }; |
192 | }; | 181 | }; |
193 | }; | 182 | }; |