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 /arch/powerpc/boot/dts/mpc885ads.dts | |
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>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc885ads.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc885ads.dts | 45 |
1 files changed, 17 insertions, 28 deletions
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 | }; |