diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-16 10:57:22 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-16 11:10:52 -0500 |
commit | d71a1dc62b0380ab9c4022dcba02775a791c3d7e (patch) | |
tree | c1e15f94082f0e44986a5c6254a39c1bed978076 | |
parent | a32525449b30dfbae804f6b05cde041f35f5a811 (diff) |
[POWERPC] 83xx: Cleaned up 83xx platform dts files
* Fixed up top level compatible property for all boards
* Removed explicit linux,phandle usage. Use references and labels now
* Fixed interrupt sense attribute, some interrupts were marked edge, that are level
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/boot/dts/mpc8313erdb.dts | 62 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8323emds.dts | 119 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 60 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitxgp.dts | 39 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc834x_mds.dts | 164 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8360emds.dts | 123 |
6 files changed, 265 insertions, 302 deletions
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index 3d2f5a06df3f..6d721900d00e 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "MPC8313ERDB"; | 13 | model = "MPC8313ERDB"; |
14 | compatible = "MPC83xx"; | 14 | compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB"; |
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
@@ -59,7 +59,7 @@ | |||
59 | compatible = "fsl-i2c"; | 59 | compatible = "fsl-i2c"; |
60 | reg = <3000 100>; | 60 | reg = <3000 100>; |
61 | interrupts = <e 8>; | 61 | interrupts = <e 8>; |
62 | interrupt-parent = <700>; | 62 | interrupt-parent = < &ipic >; |
63 | dfsrr; | 63 | dfsrr; |
64 | }; | 64 | }; |
65 | 65 | ||
@@ -68,7 +68,7 @@ | |||
68 | compatible = "fsl-i2c"; | 68 | compatible = "fsl-i2c"; |
69 | reg = <3100 100>; | 69 | reg = <3100 100>; |
70 | interrupts = <f 8>; | 70 | interrupts = <f 8>; |
71 | interrupt-parent = <700>; | 71 | interrupt-parent = < &ipic >; |
72 | dfsrr; | 72 | dfsrr; |
73 | }; | 73 | }; |
74 | 74 | ||
@@ -77,7 +77,7 @@ | |||
77 | compatible = "mpc83xx_spi"; | 77 | compatible = "mpc83xx_spi"; |
78 | reg = <7000 1000>; | 78 | reg = <7000 1000>; |
79 | interrupts = <10 8>; | 79 | interrupts = <10 8>; |
80 | interrupt-parent = <700>; | 80 | interrupt-parent = < &ipic >; |
81 | mode = <0>; | 81 | mode = <0>; |
82 | }; | 82 | }; |
83 | 83 | ||
@@ -88,8 +88,8 @@ | |||
88 | reg = <23000 1000>; | 88 | reg = <23000 1000>; |
89 | #address-cells = <1>; | 89 | #address-cells = <1>; |
90 | #size-cells = <0>; | 90 | #size-cells = <0>; |
91 | interrupt-parent = <700>; | 91 | interrupt-parent = < &ipic >; |
92 | interrupts = <26 2>; | 92 | interrupts = <26 8>; |
93 | phy_type = "utmi_wide"; | 93 | phy_type = "utmi_wide"; |
94 | }; | 94 | }; |
95 | 95 | ||
@@ -99,18 +99,15 @@ | |||
99 | reg = <24520 20>; | 99 | reg = <24520 20>; |
100 | #address-cells = <1>; | 100 | #address-cells = <1>; |
101 | #size-cells = <0>; | 101 | #size-cells = <0>; |
102 | linux,phandle = <24520>; | 102 | phy1: ethernet-phy@1 { |
103 | ethernet-phy@1 { | 103 | interrupt-parent = < &ipic >; |
104 | linux,phandle = <2452001>; | 104 | interrupts = <13 8>; |
105 | interrupt-parent = <700>; | ||
106 | interrupts = <13 2>; | ||
107 | reg = <1>; | 105 | reg = <1>; |
108 | device_type = "ethernet-phy"; | 106 | device_type = "ethernet-phy"; |
109 | }; | 107 | }; |
110 | ethernet-phy@4 { | 108 | phy4: ethernet-phy@4 { |
111 | linux,phandle = <2452004>; | 109 | interrupt-parent = < &ipic >; |
112 | interrupt-parent = <700>; | 110 | interrupts = <14 8>; |
113 | interrupts = <14 2>; | ||
114 | reg = <4>; | 111 | reg = <4>; |
115 | device_type = "ethernet-phy"; | 112 | device_type = "ethernet-phy"; |
116 | }; | 113 | }; |
@@ -123,8 +120,8 @@ | |||
123 | reg = <24000 1000>; | 120 | reg = <24000 1000>; |
124 | local-mac-address = [ 00 00 00 00 00 00 ]; | 121 | local-mac-address = [ 00 00 00 00 00 00 ]; |
125 | interrupts = <25 8 24 8 23 8>; | 122 | interrupts = <25 8 24 8 23 8>; |
126 | interrupt-parent = <700>; | 123 | interrupt-parent = < &ipic >; |
127 | phy-handle = <2452001>; | 124 | phy-handle = < &phy1 >; |
128 | }; | 125 | }; |
129 | 126 | ||
130 | ethernet@25000 { | 127 | ethernet@25000 { |
@@ -134,8 +131,8 @@ | |||
134 | reg = <25000 1000>; | 131 | reg = <25000 1000>; |
135 | local-mac-address = [ 00 00 00 00 00 00 ]; | 132 | local-mac-address = [ 00 00 00 00 00 00 ]; |
136 | interrupts = <22 8 21 8 20 8>; | 133 | interrupts = <22 8 21 8 20 8>; |
137 | interrupt-parent = <700>; | 134 | interrupt-parent = < &ipic >; |
138 | phy-handle = <2452004>; | 135 | phy-handle = < &phy4 >; |
139 | }; | 136 | }; |
140 | 137 | ||
141 | serial@4500 { | 138 | serial@4500 { |
@@ -144,7 +141,7 @@ | |||
144 | reg = <4500 100>; | 141 | reg = <4500 100>; |
145 | clock-frequency = <0>; | 142 | clock-frequency = <0>; |
146 | interrupts = <9 8>; | 143 | interrupts = <9 8>; |
147 | interrupt-parent = <700>; | 144 | interrupt-parent = < &ipic >; |
148 | }; | 145 | }; |
149 | 146 | ||
150 | serial@4600 { | 147 | serial@4600 { |
@@ -153,7 +150,7 @@ | |||
153 | reg = <4600 100>; | 150 | reg = <4600 100>; |
154 | clock-frequency = <0>; | 151 | clock-frequency = <0>; |
155 | interrupts = <a 8>; | 152 | interrupts = <a 8>; |
156 | interrupt-parent = <700>; | 153 | interrupt-parent = < &ipic >; |
157 | }; | 154 | }; |
158 | 155 | ||
159 | pci@8500 { | 156 | pci@8500 { |
@@ -161,17 +158,17 @@ | |||
161 | interrupt-map = < | 158 | interrupt-map = < |
162 | 159 | ||
163 | /* IDSEL 0x0E -mini PCI */ | 160 | /* IDSEL 0x0E -mini PCI */ |
164 | 7000 0 0 1 700 12 8 | 161 | 7000 0 0 1 &ipic 12 8 |
165 | 7000 0 0 2 700 12 8 | 162 | 7000 0 0 2 &ipic 12 8 |
166 | 7000 0 0 3 700 12 8 | 163 | 7000 0 0 3 &ipic 12 8 |
167 | 7000 0 0 4 700 12 8 | 164 | 7000 0 0 4 &ipic 12 8 |
168 | 165 | ||
169 | /* IDSEL 0x0F - PCI slot */ | 166 | /* IDSEL 0x0F - PCI slot */ |
170 | 7800 0 0 1 700 11 8 | 167 | 7800 0 0 1 &ipic 11 8 |
171 | 7800 0 0 2 700 12 8 | 168 | 7800 0 0 2 &ipic 12 8 |
172 | 7800 0 0 3 700 11 8 | 169 | 7800 0 0 3 &ipic 11 8 |
173 | 7800 0 0 4 700 12 8>; | 170 | 7800 0 0 4 &ipic 12 8>; |
174 | interrupt-parent = <700>; | 171 | interrupt-parent = < &ipic >; |
175 | interrupts = <42 8>; | 172 | interrupts = <42 8>; |
176 | bus-range = <0 0>; | 173 | bus-range = <0 0>; |
177 | ranges = <02000000 0 90000000 90000000 0 10000000 | 174 | ranges = <02000000 0 90000000 90000000 0 10000000 |
@@ -192,7 +189,7 @@ | |||
192 | compatible = "talitos"; | 189 | compatible = "talitos"; |
193 | reg = <30000 7000>; | 190 | reg = <30000 7000>; |
194 | interrupts = <b 8>; | 191 | interrupts = <b 8>; |
195 | interrupt-parent = <700>; | 192 | interrupt-parent = < &ipic >; |
196 | /* Rev. 2.2 */ | 193 | /* Rev. 2.2 */ |
197 | num-channels = <1>; | 194 | num-channels = <1>; |
198 | channel-fifo-len = <18>; | 195 | channel-fifo-len = <18>; |
@@ -206,8 +203,7 @@ | |||
206 | * sense == 8: Level, low assertion | 203 | * sense == 8: Level, low assertion |
207 | * sense == 2: Edge, high-to-low change | 204 | * sense == 2: Edge, high-to-low change |
208 | */ | 205 | */ |
209 | pic@700 { | 206 | ipic: pic@700 { |
210 | linux,phandle = <700>; | ||
211 | interrupt-controller; | 207 | interrupt-controller; |
212 | #address-cells = <0>; | 208 | #address-cells = <0>; |
213 | #interrupt-cells = <2>; | 209 | #interrupt-cells = <2>; |
diff --git a/arch/powerpc/boot/dts/mpc8323emds.dts b/arch/powerpc/boot/dts/mpc8323emds.dts index 57a3665f82ed..06b310698a02 100644 --- a/arch/powerpc/boot/dts/mpc8323emds.dts +++ b/arch/powerpc/boot/dts/mpc8323emds.dts | |||
@@ -11,16 +11,14 @@ | |||
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "MPC8323EMDS"; | 13 | model = "MPC8323EMDS"; |
14 | compatible = "MPC83xx"; | 14 | compatible = "MPC8323EMDS", "MPC832xMDS", "MPC83xxMDS"; |
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 | #cpus = <1>; | 19 | #cpus = <1>; |
21 | #address-cells = <1>; | 20 | #address-cells = <1>; |
22 | #size-cells = <0>; | 21 | #size-cells = <0>; |
23 | linux,phandle = <200>; | ||
24 | 22 | ||
25 | PowerPC,8323@0 { | 23 | PowerPC,8323@0 { |
26 | device_type = "cpu"; | 24 | device_type = "cpu"; |
@@ -33,13 +31,11 @@ | |||
33 | bus-frequency = <0>; | 31 | bus-frequency = <0>; |
34 | clock-frequency = <0>; | 32 | clock-frequency = <0>; |
35 | 32-bit; | 33 | 32-bit; |
36 | linux,phandle = <201>; | ||
37 | }; | 34 | }; |
38 | }; | 35 | }; |
39 | 36 | ||
40 | memory { | 37 | memory { |
41 | device_type = "memory"; | 38 | device_type = "memory"; |
42 | linux,phandle = <300>; | ||
43 | reg = <00000000 08000000>; | 39 | reg = <00000000 08000000>; |
44 | }; | 40 | }; |
45 | 41 | ||
@@ -68,7 +64,7 @@ | |||
68 | compatible = "fsl-i2c"; | 64 | compatible = "fsl-i2c"; |
69 | reg = <3000 100>; | 65 | reg = <3000 100>; |
70 | interrupts = <e 8>; | 66 | interrupts = <e 8>; |
71 | interrupt-parent = <700>; | 67 | interrupt-parent = < &ipic >; |
72 | dfsrr; | 68 | dfsrr; |
73 | }; | 69 | }; |
74 | 70 | ||
@@ -78,7 +74,7 @@ | |||
78 | reg = <4500 100>; | 74 | reg = <4500 100>; |
79 | clock-frequency = <0>; | 75 | clock-frequency = <0>; |
80 | interrupts = <9 8>; | 76 | interrupts = <9 8>; |
81 | interrupt-parent = <700>; | 77 | interrupt-parent = < &ipic >; |
82 | }; | 78 | }; |
83 | 79 | ||
84 | serial@4600 { | 80 | serial@4600 { |
@@ -87,7 +83,7 @@ | |||
87 | reg = <4600 100>; | 83 | reg = <4600 100>; |
88 | clock-frequency = <0>; | 84 | clock-frequency = <0>; |
89 | interrupts = <a 8>; | 85 | interrupts = <a 8>; |
90 | interrupt-parent = <700>; | 86 | interrupt-parent = < &ipic >; |
91 | }; | 87 | }; |
92 | 88 | ||
93 | crypto@30000 { | 89 | crypto@30000 { |
@@ -96,7 +92,7 @@ | |||
96 | compatible = "talitos"; | 92 | compatible = "talitos"; |
97 | reg = <30000 7000>; | 93 | reg = <30000 7000>; |
98 | interrupts = <b 8>; | 94 | interrupts = <b 8>; |
99 | interrupt-parent = <700>; | 95 | interrupt-parent = < &ipic >; |
100 | /* Rev. 2.2 */ | 96 | /* Rev. 2.2 */ |
101 | num-channels = <1>; | 97 | num-channels = <1>; |
102 | channel-fifo-len = <18>; | 98 | channel-fifo-len = <18>; |
@@ -105,51 +101,50 @@ | |||
105 | }; | 101 | }; |
106 | 102 | ||
107 | pci@8500 { | 103 | pci@8500 { |
108 | linux,phandle = <8500>; | ||
109 | interrupt-map-mask = <f800 0 0 7>; | 104 | interrupt-map-mask = <f800 0 0 7>; |
110 | interrupt-map = < | 105 | interrupt-map = < |
111 | /* IDSEL 0x11 AD17 */ | 106 | /* IDSEL 0x11 AD17 */ |
112 | 8800 0 0 1 700 14 8 | 107 | 8800 0 0 1 &ipic 14 8 |
113 | 8800 0 0 2 700 15 8 | 108 | 8800 0 0 2 &ipic 15 8 |
114 | 8800 0 0 3 700 16 8 | 109 | 8800 0 0 3 &ipic 16 8 |
115 | 8800 0 0 4 700 17 8 | 110 | 8800 0 0 4 &ipic 17 8 |
116 | 111 | ||
117 | /* IDSEL 0x12 AD18 */ | 112 | /* IDSEL 0x12 AD18 */ |
118 | 9000 0 0 1 700 16 8 | 113 | 9000 0 0 1 &ipic 16 8 |
119 | 9000 0 0 2 700 17 8 | 114 | 9000 0 0 2 &ipic 17 8 |
120 | 9000 0 0 3 700 14 8 | 115 | 9000 0 0 3 &ipic 14 8 |
121 | 9000 0 0 4 700 15 8 | 116 | 9000 0 0 4 &ipic 15 8 |
122 | 117 | ||
123 | /* IDSEL 0x13 AD19 */ | 118 | /* IDSEL 0x13 AD19 */ |
124 | 9800 0 0 1 700 17 8 | 119 | 9800 0 0 1 &ipic 17 8 |
125 | 9800 0 0 2 700 14 8 | 120 | 9800 0 0 2 &ipic 14 8 |
126 | 9800 0 0 3 700 15 8 | 121 | 9800 0 0 3 &ipic 15 8 |
127 | 9800 0 0 4 700 16 8 | 122 | 9800 0 0 4 &ipic 16 8 |
128 | 123 | ||
129 | /* IDSEL 0x15 AD21*/ | 124 | /* IDSEL 0x15 AD21*/ |
130 | a800 0 0 1 700 14 8 | 125 | a800 0 0 1 &ipic 14 8 |
131 | a800 0 0 2 700 15 8 | 126 | a800 0 0 2 &ipic 15 8 |
132 | a800 0 0 3 700 16 8 | 127 | a800 0 0 3 &ipic 16 8 |
133 | a800 0 0 4 700 17 8 | 128 | a800 0 0 4 &ipic 17 8 |
134 | 129 | ||
135 | /* IDSEL 0x16 AD22*/ | 130 | /* IDSEL 0x16 AD22*/ |
136 | b000 0 0 1 700 17 8 | 131 | b000 0 0 1 &ipic 17 8 |
137 | b000 0 0 2 700 14 8 | 132 | b000 0 0 2 &ipic 14 8 |
138 | b000 0 0 3 700 15 8 | 133 | b000 0 0 3 &ipic 15 8 |
139 | b000 0 0 4 700 16 8 | 134 | b000 0 0 4 &ipic 16 8 |
140 | 135 | ||
141 | /* IDSEL 0x17 AD23*/ | 136 | /* IDSEL 0x17 AD23*/ |
142 | b800 0 0 1 700 16 8 | 137 | b800 0 0 1 &ipic 16 8 |
143 | b800 0 0 2 700 17 8 | 138 | b800 0 0 2 &ipic 17 8 |
144 | b800 0 0 3 700 14 8 | 139 | b800 0 0 3 &ipic 14 8 |
145 | b800 0 0 4 700 15 8 | 140 | b800 0 0 4 &ipic 15 8 |
146 | 141 | ||
147 | /* IDSEL 0x18 AD24*/ | 142 | /* IDSEL 0x18 AD24*/ |
148 | c000 0 0 1 700 15 8 | 143 | c000 0 0 1 &ipic 15 8 |
149 | c000 0 0 2 700 16 8 | 144 | c000 0 0 2 &ipic 16 8 |
150 | c000 0 0 3 700 17 8 | 145 | c000 0 0 3 &ipic 17 8 |
151 | c000 0 0 4 700 14 8>; | 146 | c000 0 0 4 &ipic 14 8>; |
152 | interrupt-parent = <700>; | 147 | interrupt-parent = < &ipic >; |
153 | interrupts = <42 8>; | 148 | interrupts = <42 8>; |
154 | bus-range = <0 0>; | 149 | bus-range = <0 0>; |
155 | ranges = <02000000 0 a0000000 90000000 0 10000000 | 150 | ranges = <02000000 0 a0000000 90000000 0 10000000 |
@@ -164,8 +159,7 @@ | |||
164 | device_type = "pci"; | 159 | device_type = "pci"; |
165 | }; | 160 | }; |
166 | 161 | ||
167 | pic@700 { | 162 | ipic: pic@700 { |
168 | linux,phandle = <700>; | ||
169 | interrupt-controller; | 163 | interrupt-controller; |
170 | #address-cells = <0>; | 164 | #address-cells = <0>; |
171 | #interrupt-cells = <2>; | 165 | #interrupt-cells = <2>; |
@@ -179,8 +173,7 @@ | |||
179 | device_type = "par_io"; | 173 | device_type = "par_io"; |
180 | num-ports = <7>; | 174 | num-ports = <7>; |
181 | 175 | ||
182 | ucc_pin@03 { | 176 | pio3: ucc_pin@03 { |
183 | linux,phandle = <140003>; | ||
184 | pio-map = < | 177 | pio-map = < |
185 | /* port pin dir open_drain assignment has_irq */ | 178 | /* port pin dir open_drain assignment has_irq */ |
186 | 3 4 3 0 2 0 /* MDIO */ | 179 | 3 4 3 0 2 0 /* MDIO */ |
@@ -203,8 +196,7 @@ | |||
203 | 1 c 1 0 1 0 /* TX_EN */ | 196 | 1 c 1 0 1 0 /* TX_EN */ |
204 | 1 d 2 0 1 0>;/* CRS */ | 197 | 1 d 2 0 1 0>;/* CRS */ |
205 | }; | 198 | }; |
206 | ucc_pin@04 { | 199 | pio4: ucc_pin@04 { |
207 | linux,phandle = <140004>; | ||
208 | pio-map = < | 200 | pio-map = < |
209 | /* port pin dir open_drain assignment has_irq */ | 201 | /* port pin dir open_drain assignment has_irq */ |
210 | 3 1f 2 0 1 0 /* RX_CLK (CLK7) */ | 202 | 3 1f 2 0 1 0 /* RX_CLK (CLK7) */ |
@@ -251,7 +243,7 @@ | |||
251 | compatible = "fsl_spi"; | 243 | compatible = "fsl_spi"; |
252 | reg = <4c0 40>; | 244 | reg = <4c0 40>; |
253 | interrupts = <2>; | 245 | interrupts = <2>; |
254 | interrupt-parent = <80>; | 246 | interrupt-parent = < &qeic >; |
255 | mode = "cpu"; | 247 | mode = "cpu"; |
256 | }; | 248 | }; |
257 | 249 | ||
@@ -260,7 +252,7 @@ | |||
260 | compatible = "fsl_spi"; | 252 | compatible = "fsl_spi"; |
261 | reg = <500 40>; | 253 | reg = <500 40>; |
262 | interrupts = <1>; | 254 | interrupts = <1>; |
263 | interrupt-parent = <80>; | 255 | interrupt-parent = < &qeic >; |
264 | mode = "cpu"; | 256 | mode = "cpu"; |
265 | }; | 257 | }; |
266 | 258 | ||
@@ -269,7 +261,7 @@ | |||
269 | compatible = "qe_udc"; | 261 | compatible = "qe_udc"; |
270 | reg = <6c0 40 8B00 100>; | 262 | reg = <6c0 40 8B00 100>; |
271 | interrupts = <b>; | 263 | interrupts = <b>; |
272 | interrupt-parent = <80>; | 264 | interrupt-parent = < &qeic >; |
273 | mode = "slave"; | 265 | mode = "slave"; |
274 | }; | 266 | }; |
275 | 267 | ||
@@ -280,12 +272,12 @@ | |||
280 | device-id = <3>; | 272 | device-id = <3>; |
281 | reg = <2200 200>; | 273 | reg = <2200 200>; |
282 | interrupts = <22>; | 274 | interrupts = <22>; |
283 | interrupt-parent = <80>; | 275 | interrupt-parent = < &qeic >; |
284 | mac-address = [ 00 04 9f 00 23 23 ]; | 276 | mac-address = [ 00 04 9f 00 23 23 ]; |
285 | rx-clock = <19>; | 277 | rx-clock = <19>; |
286 | tx-clock = <1a>; | 278 | tx-clock = <1a>; |
287 | phy-handle = <212003>; | 279 | phy-handle = < &phy3 >; |
288 | pio-handle = <140003>; | 280 | pio-handle = < &pio3 >; |
289 | }; | 281 | }; |
290 | 282 | ||
291 | ucc@3200 { | 283 | ucc@3200 { |
@@ -295,12 +287,12 @@ | |||
295 | device-id = <4>; | 287 | device-id = <4>; |
296 | reg = <3000 200>; | 288 | reg = <3000 200>; |
297 | interrupts = <23>; | 289 | interrupts = <23>; |
298 | interrupt-parent = <80>; | 290 | interrupt-parent = < &qeic >; |
299 | mac-address = [ 00 11 22 33 44 55 ]; | 291 | mac-address = [ 00 11 22 33 44 55 ]; |
300 | rx-clock = <17>; | 292 | rx-clock = <17>; |
301 | tx-clock = <18>; | 293 | tx-clock = <18>; |
302 | phy-handle = <212004>; | 294 | phy-handle = < &phy4 >; |
303 | pio-handle = <140004>; | 295 | pio-handle = < &pio4 >; |
304 | }; | 296 | }; |
305 | 297 | ||
306 | mdio@2320 { | 298 | mdio@2320 { |
@@ -310,26 +302,23 @@ | |||
310 | device_type = "mdio"; | 302 | device_type = "mdio"; |
311 | compatible = "ucc_geth_phy"; | 303 | compatible = "ucc_geth_phy"; |
312 | 304 | ||
313 | ethernet-phy@03 { | 305 | phy3: ethernet-phy@03 { |
314 | linux,phandle = <212003>; | 306 | interrupt-parent = < &ipic >; |
315 | interrupt-parent = <700>; | 307 | interrupts = <11 8>; |
316 | interrupts = <11 2>; | ||
317 | reg = <3>; | 308 | reg = <3>; |
318 | device_type = "ethernet-phy"; | 309 | device_type = "ethernet-phy"; |
319 | interface = <3>; //ENET_100_MII | 310 | interface = <3>; //ENET_100_MII |
320 | }; | 311 | }; |
321 | ethernet-phy@04 { | 312 | phy4: ethernet-phy@04 { |
322 | linux,phandle = <212004>; | 313 | interrupt-parent = < &ipic >; |
323 | interrupt-parent = <700>; | 314 | interrupts = <12 8>; |
324 | interrupts = <12 2>; | ||
325 | reg = <4>; | 315 | reg = <4>; |
326 | device_type = "ethernet-phy"; | 316 | device_type = "ethernet-phy"; |
327 | interface = <3>; | 317 | interface = <3>; |
328 | }; | 318 | }; |
329 | }; | 319 | }; |
330 | 320 | ||
331 | qeic@80 { | 321 | qeic: qeic@80 { |
332 | linux,phandle = <80>; | ||
333 | interrupt-controller; | 322 | interrupt-controller; |
334 | device_type = "qeic"; | 323 | device_type = "qeic"; |
335 | #address-cells = <0>; | 324 | #address-cells = <0>; |
@@ -338,7 +327,7 @@ | |||
338 | built-in; | 327 | built-in; |
339 | big-endian; | 328 | big-endian; |
340 | interrupts = <20 8 21 8>; //high:32 low:33 | 329 | interrupts = <20 8 21 8>; //high:32 low:33 |
341 | interrupt-parent = <700>; | 330 | interrupt-parent = < &ipic >; |
342 | }; | 331 | }; |
343 | }; | 332 | }; |
344 | }; | 333 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 27807fc45888..61b550bf1645 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | / { | 11 | / { |
12 | model = "MPC8349EMITX"; | 12 | model = "MPC8349EMITX"; |
13 | compatible = "MPC834xMITX"; | 13 | compatible = "MPC8349EMITX", "MPC834xMITX", "MPC83xxMITX"; |
14 | #address-cells = <1>; | 14 | #address-cells = <1>; |
15 | #size-cells = <1>; | 15 | #size-cells = <1>; |
16 | 16 | ||
@@ -58,7 +58,7 @@ | |||
58 | compatible = "fsl-i2c"; | 58 | compatible = "fsl-i2c"; |
59 | reg = <3000 100>; | 59 | reg = <3000 100>; |
60 | interrupts = <e 8>; | 60 | interrupts = <e 8>; |
61 | interrupt-parent = <700>; | 61 | interrupt-parent = < &ipic >; |
62 | dfsrr; | 62 | dfsrr; |
63 | }; | 63 | }; |
64 | 64 | ||
@@ -67,7 +67,7 @@ | |||
67 | compatible = "fsl-i2c"; | 67 | compatible = "fsl-i2c"; |
68 | reg = <3100 100>; | 68 | reg = <3100 100>; |
69 | interrupts = <f 8>; | 69 | interrupts = <f 8>; |
70 | interrupt-parent = <700>; | 70 | interrupt-parent = < &ipic >; |
71 | dfsrr; | 71 | dfsrr; |
72 | }; | 72 | }; |
73 | 73 | ||
@@ -76,7 +76,7 @@ | |||
76 | compatible = "mpc83xx_spi"; | 76 | compatible = "mpc83xx_spi"; |
77 | reg = <7000 1000>; | 77 | reg = <7000 1000>; |
78 | interrupts = <10 8>; | 78 | interrupts = <10 8>; |
79 | interrupt-parent = <700>; | 79 | interrupt-parent = < &ipic >; |
80 | mode = <0>; | 80 | mode = <0>; |
81 | }; | 81 | }; |
82 | 82 | ||
@@ -86,8 +86,8 @@ | |||
86 | reg = <22000 1000>; | 86 | reg = <22000 1000>; |
87 | #address-cells = <1>; | 87 | #address-cells = <1>; |
88 | #size-cells = <0>; | 88 | #size-cells = <0>; |
89 | interrupt-parent = <700>; | 89 | interrupt-parent = < &ipic >; |
90 | interrupts = <27 2>; | 90 | interrupts = <27 8>; |
91 | phy_type = "ulpi"; | 91 | phy_type = "ulpi"; |
92 | port1; | 92 | port1; |
93 | }; | 93 | }; |
@@ -98,8 +98,8 @@ | |||
98 | reg = <23000 1000>; | 98 | reg = <23000 1000>; |
99 | #address-cells = <1>; | 99 | #address-cells = <1>; |
100 | #size-cells = <0>; | 100 | #size-cells = <0>; |
101 | interrupt-parent = <700>; | 101 | interrupt-parent = < &ipic >; |
102 | interrupts = <26 2>; | 102 | interrupts = <26 8>; |
103 | phy_type = "ulpi"; | 103 | phy_type = "ulpi"; |
104 | }; | 104 | }; |
105 | 105 | ||
@@ -109,22 +109,19 @@ | |||
109 | reg = <24520 20>; | 109 | reg = <24520 20>; |
110 | #address-cells = <1>; | 110 | #address-cells = <1>; |
111 | #size-cells = <0>; | 111 | #size-cells = <0>; |
112 | linux,phandle = <24520>; | ||
113 | 112 | ||
114 | /* Vitesse 8201 */ | 113 | /* Vitesse 8201 */ |
115 | ethernet-phy@1c { | 114 | phy1c: ethernet-phy@1c { |
116 | linux,phandle = <245201c>; | 115 | interrupt-parent = < &ipic >; |
117 | interrupt-parent = <700>; | 116 | interrupts = <12 8>; |
118 | interrupts = <12 2>; | ||
119 | reg = <1c>; | 117 | reg = <1c>; |
120 | device_type = "ethernet-phy"; | 118 | device_type = "ethernet-phy"; |
121 | }; | 119 | }; |
122 | 120 | ||
123 | /* Vitesse 7385 */ | 121 | /* Vitesse 7385 */ |
124 | ethernet-phy@1f { | 122 | phy1f: ethernet-phy@1f { |
125 | linux,phandle = <245201f>; | 123 | interrupt-parent = < &ipic >; |
126 | interrupt-parent = <700>; | 124 | interrupts = <12 8>; |
127 | interrupts = <12 2>; | ||
128 | reg = <1f>; | 125 | reg = <1f>; |
129 | device_type = "ethernet-phy"; | 126 | device_type = "ethernet-phy"; |
130 | }; | 127 | }; |
@@ -138,8 +135,8 @@ | |||
138 | address = [ 00 00 00 00 00 00 ]; | 135 | address = [ 00 00 00 00 00 00 ]; |
139 | local-mac-address = [ 00 00 00 00 00 00 ]; | 136 | local-mac-address = [ 00 00 00 00 00 00 ]; |
140 | interrupts = <20 8 21 8 22 8>; | 137 | interrupts = <20 8 21 8 22 8>; |
141 | interrupt-parent = <700>; | 138 | interrupt-parent = < &ipic >; |
142 | phy-handle = <245201c>; | 139 | phy-handle = < &phy1c >; |
143 | }; | 140 | }; |
144 | 141 | ||
145 | ethernet@25000 { | 142 | ethernet@25000 { |
@@ -152,8 +149,8 @@ | |||
152 | address = [ 00 00 00 00 00 00 ]; | 149 | address = [ 00 00 00 00 00 00 ]; |
153 | local-mac-address = [ 00 00 00 00 00 00 ]; | 150 | local-mac-address = [ 00 00 00 00 00 00 ]; |
154 | interrupts = <23 8 24 8 25 8>; | 151 | interrupts = <23 8 24 8 25 8>; |
155 | interrupt-parent = <700>; | 152 | interrupt-parent = < &ipic >; |
156 | phy-handle = <245201f>; | 153 | phy-handle = < &phy1f >; |
157 | }; | 154 | }; |
158 | 155 | ||
159 | serial@4500 { | 156 | serial@4500 { |
@@ -162,7 +159,7 @@ | |||
162 | reg = <4500 100>; | 159 | reg = <4500 100>; |
163 | clock-frequency = <0>; // from bootloader | 160 | clock-frequency = <0>; // from bootloader |
164 | interrupts = <9 8>; | 161 | interrupts = <9 8>; |
165 | interrupt-parent = <700>; | 162 | interrupt-parent = < &ipic >; |
166 | }; | 163 | }; |
167 | 164 | ||
168 | serial@4600 { | 165 | serial@4600 { |
@@ -171,16 +168,16 @@ | |||
171 | reg = <4600 100>; | 168 | reg = <4600 100>; |
172 | clock-frequency = <0>; // from bootloader | 169 | clock-frequency = <0>; // from bootloader |
173 | interrupts = <a 8>; | 170 | interrupts = <a 8>; |
174 | interrupt-parent = <700>; | 171 | interrupt-parent = < &ipic >; |
175 | }; | 172 | }; |
176 | 173 | ||
177 | pci@8500 { | 174 | pci@8500 { |
178 | interrupt-map-mask = <f800 0 0 7>; | 175 | interrupt-map-mask = <f800 0 0 7>; |
179 | interrupt-map = < | 176 | interrupt-map = < |
180 | /* IDSEL 0x10 - SATA */ | 177 | /* IDSEL 0x10 - SATA */ |
181 | 8000 0 0 1 700 16 8 /* SATA_INTA */ | 178 | 8000 0 0 1 &ipic 16 8 /* SATA_INTA */ |
182 | >; | 179 | >; |
183 | interrupt-parent = <700>; | 180 | interrupt-parent = < &ipic >; |
184 | interrupts = <42 8>; | 181 | interrupts = <42 8>; |
185 | bus-range = <0 0>; | 182 | bus-range = <0 0>; |
186 | ranges = <42000000 0 80000000 80000000 0 10000000 | 183 | ranges = <42000000 0 80000000 80000000 0 10000000 |
@@ -199,13 +196,13 @@ | |||
199 | interrupt-map-mask = <f800 0 0 7>; | 196 | interrupt-map-mask = <f800 0 0 7>; |
200 | interrupt-map = < | 197 | interrupt-map = < |
201 | /* IDSEL 0x0E - MiniPCI Slot */ | 198 | /* IDSEL 0x0E - MiniPCI Slot */ |
202 | 7000 0 0 1 700 15 8 /* PCI_INTA */ | 199 | 7000 0 0 1 &ipic 15 8 /* PCI_INTA */ |
203 | 200 | ||
204 | /* IDSEL 0x0F - PCI Slot */ | 201 | /* IDSEL 0x0F - PCI Slot */ |
205 | 7800 0 0 1 700 14 8 /* PCI_INTA */ | 202 | 7800 0 0 1 &ipic 14 8 /* PCI_INTA */ |
206 | 7800 0 0 2 700 15 8 /* PCI_INTB */ | 203 | 7800 0 0 2 &ipic 15 8 /* PCI_INTB */ |
207 | >; | 204 | >; |
208 | interrupt-parent = <700>; | 205 | interrupt-parent = < &ipic >; |
209 | interrupts = <43 8>; | 206 | interrupts = <43 8>; |
210 | bus-range = <1 1>; | 207 | bus-range = <1 1>; |
211 | ranges = <42000000 0 a0000000 a0000000 0 10000000 | 208 | ranges = <42000000 0 a0000000 a0000000 0 10000000 |
@@ -226,15 +223,14 @@ | |||
226 | compatible = "talitos"; | 223 | compatible = "talitos"; |
227 | reg = <30000 10000>; | 224 | reg = <30000 10000>; |
228 | interrupts = <b 8>; | 225 | interrupts = <b 8>; |
229 | interrupt-parent = <700>; | 226 | interrupt-parent = < &ipic >; |
230 | num-channels = <4>; | 227 | num-channels = <4>; |
231 | channel-fifo-len = <18>; | 228 | channel-fifo-len = <18>; |
232 | exec-units-mask = <0000007e>; | 229 | exec-units-mask = <0000007e>; |
233 | descriptor-types-mask = <01010ebf>; | 230 | descriptor-types-mask = <01010ebf>; |
234 | }; | 231 | }; |
235 | 232 | ||
236 | pic@700 { | 233 | ipic: pic@700 { |
237 | linux,phandle = <700>; | ||
238 | interrupt-controller; | 234 | interrupt-controller; |
239 | #address-cells = <0>; | 235 | #address-cells = <0>; |
240 | #interrupt-cells = <2>; | 236 | #interrupt-cells = <2>; |
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts index 3190774de1d8..b2e1a5ec3779 100644 --- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts +++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | / { | 11 | / { |
12 | model = "MPC8349EMITXGP"; | 12 | model = "MPC8349EMITXGP"; |
13 | compatible = "MPC834xMITXGP"; | 13 | compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX"; |
14 | #address-cells = <1>; | 14 | #address-cells = <1>; |
15 | #size-cells = <1>; | 15 | #size-cells = <1>; |
16 | 16 | ||
@@ -58,7 +58,7 @@ | |||
58 | compatible = "fsl-i2c"; | 58 | compatible = "fsl-i2c"; |
59 | reg = <3000 100>; | 59 | reg = <3000 100>; |
60 | interrupts = <e 8>; | 60 | interrupts = <e 8>; |
61 | interrupt-parent = <700>; | 61 | interrupt-parent = < &ipic >; |
62 | dfsrr; | 62 | dfsrr; |
63 | }; | 63 | }; |
64 | 64 | ||
@@ -67,7 +67,7 @@ | |||
67 | compatible = "fsl-i2c"; | 67 | compatible = "fsl-i2c"; |
68 | reg = <3100 100>; | 68 | reg = <3100 100>; |
69 | interrupts = <f 8>; | 69 | interrupts = <f 8>; |
70 | interrupt-parent = <700>; | 70 | interrupt-parent = < &ipic >; |
71 | dfsrr; | 71 | dfsrr; |
72 | }; | 72 | }; |
73 | 73 | ||
@@ -76,7 +76,7 @@ | |||
76 | compatible = "mpc83xx_spi"; | 76 | compatible = "mpc83xx_spi"; |
77 | reg = <7000 1000>; | 77 | reg = <7000 1000>; |
78 | interrupts = <10 8>; | 78 | interrupts = <10 8>; |
79 | interrupt-parent = <700>; | 79 | interrupt-parent = < &ipic >; |
80 | mode = <0>; | 80 | mode = <0>; |
81 | }; | 81 | }; |
82 | 82 | ||
@@ -86,8 +86,8 @@ | |||
86 | reg = <23000 1000>; | 86 | reg = <23000 1000>; |
87 | #address-cells = <1>; | 87 | #address-cells = <1>; |
88 | #size-cells = <0>; | 88 | #size-cells = <0>; |
89 | interrupt-parent = <700>; | 89 | interrupt-parent = < &ipic >; |
90 | interrupts = <26 2>; | 90 | interrupts = <26 8>; |
91 | dr_mode = "otg"; | 91 | dr_mode = "otg"; |
92 | phy_type = "ulpi"; | 92 | phy_type = "ulpi"; |
93 | }; | 93 | }; |
@@ -98,13 +98,11 @@ | |||
98 | reg = <24520 20>; | 98 | reg = <24520 20>; |
99 | #address-cells = <1>; | 99 | #address-cells = <1>; |
100 | #size-cells = <0>; | 100 | #size-cells = <0>; |
101 | linux,phandle = <24520>; | ||
102 | 101 | ||
103 | /* Vitesse 8201 */ | 102 | /* Vitesse 8201 */ |
104 | ethernet-phy@1c { | 103 | phy1c: ethernet-phy@1c { |
105 | linux,phandle = <245201c>; | 104 | interrupt-parent = < &ipic >; |
106 | interrupt-parent = <700>; | 105 | interrupts = <12 8>; |
107 | interrupts = <12 2>; | ||
108 | reg = <1c>; | 106 | reg = <1c>; |
109 | device_type = "ethernet-phy"; | 107 | device_type = "ethernet-phy"; |
110 | }; | 108 | }; |
@@ -117,8 +115,8 @@ | |||
117 | reg = <24000 1000>; | 115 | reg = <24000 1000>; |
118 | local-mac-address = [ 00 00 00 00 00 00 ]; | 116 | local-mac-address = [ 00 00 00 00 00 00 ]; |
119 | interrupts = <20 8 21 8 22 8>; | 117 | interrupts = <20 8 21 8 22 8>; |
120 | interrupt-parent = <700>; | 118 | interrupt-parent = < &ipic >; |
121 | phy-handle = <245201c>; | 119 | phy-handle = < &phy1c >; |
122 | }; | 120 | }; |
123 | 121 | ||
124 | serial@4500 { | 122 | serial@4500 { |
@@ -127,7 +125,7 @@ | |||
127 | reg = <4500 100>; | 125 | reg = <4500 100>; |
128 | clock-frequency = <0>; // from bootloader | 126 | clock-frequency = <0>; // from bootloader |
129 | interrupts = <9 8>; | 127 | interrupts = <9 8>; |
130 | interrupt-parent = <700>; | 128 | interrupt-parent = < &ipic >; |
131 | }; | 129 | }; |
132 | 130 | ||
133 | serial@4600 { | 131 | serial@4600 { |
@@ -136,17 +134,17 @@ | |||
136 | reg = <4600 100>; | 134 | reg = <4600 100>; |
137 | clock-frequency = <0>; // from bootloader | 135 | clock-frequency = <0>; // from bootloader |
138 | interrupts = <a 8>; | 136 | interrupts = <a 8>; |
139 | interrupt-parent = <700>; | 137 | interrupt-parent = < &ipic >; |
140 | }; | 138 | }; |
141 | 139 | ||
142 | pci@8600 { | 140 | pci@8600 { |
143 | interrupt-map-mask = <f800 0 0 7>; | 141 | interrupt-map-mask = <f800 0 0 7>; |
144 | interrupt-map = < | 142 | interrupt-map = < |
145 | /* IDSEL 0x0F - PCI Slot */ | 143 | /* IDSEL 0x0F - PCI Slot */ |
146 | 7800 0 0 1 700 14 8 /* PCI_INTA */ | 144 | 7800 0 0 1 &ipic 14 8 /* PCI_INTA */ |
147 | 7800 0 0 2 700 15 8 /* PCI_INTB */ | 145 | 7800 0 0 2 &ipic 15 8 /* PCI_INTB */ |
148 | >; | 146 | >; |
149 | interrupt-parent = <700>; | 147 | interrupt-parent = < &ipic >; |
150 | interrupts = <43 8>; | 148 | interrupts = <43 8>; |
151 | bus-range = <1 1>; | 149 | bus-range = <1 1>; |
152 | ranges = <42000000 0 a0000000 a0000000 0 10000000 | 150 | ranges = <42000000 0 a0000000 a0000000 0 10000000 |
@@ -167,15 +165,14 @@ | |||
167 | compatible = "talitos"; | 165 | compatible = "talitos"; |
168 | reg = <30000 10000>; | 166 | reg = <30000 10000>; |
169 | interrupts = <b 8>; | 167 | interrupts = <b 8>; |
170 | interrupt-parent = <700>; | 168 | interrupt-parent = < &ipic >; |
171 | num-channels = <4>; | 169 | num-channels = <4>; |
172 | channel-fifo-len = <18>; | 170 | channel-fifo-len = <18>; |
173 | exec-units-mask = <0000007e>; | 171 | exec-units-mask = <0000007e>; |
174 | descriptor-types-mask = <01010ebf>; | 172 | descriptor-types-mask = <01010ebf>; |
175 | }; | 173 | }; |
176 | 174 | ||
177 | pic@700 { | 175 | ipic: pic@700 { |
178 | linux,phandle = <700>; | ||
179 | interrupt-controller; | 176 | interrupt-controller; |
180 | #address-cells = <0>; | 177 | #address-cells = <0>; |
181 | #interrupt-cells = <2>; | 178 | #interrupt-cells = <2>; |
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index dc121b3cb4a9..e4b43c24bc0b 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "MPC8349EMDS"; | 13 | model = "MPC8349EMDS"; |
14 | compatible = "MPC834xMDS"; | 14 | compatible = "MPC8349EMDS", "MPC834xMDS", "MPC83xxMDS"; |
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
@@ -64,7 +64,7 @@ | |||
64 | compatible = "fsl-i2c"; | 64 | compatible = "fsl-i2c"; |
65 | reg = <3000 100>; | 65 | reg = <3000 100>; |
66 | interrupts = <e 8>; | 66 | interrupts = <e 8>; |
67 | interrupt-parent = <700>; | 67 | interrupt-parent = < &ipic >; |
68 | dfsrr; | 68 | dfsrr; |
69 | }; | 69 | }; |
70 | 70 | ||
@@ -73,7 +73,7 @@ | |||
73 | compatible = "fsl-i2c"; | 73 | compatible = "fsl-i2c"; |
74 | reg = <3100 100>; | 74 | reg = <3100 100>; |
75 | interrupts = <f 8>; | 75 | interrupts = <f 8>; |
76 | interrupt-parent = <700>; | 76 | interrupt-parent = < &ipic >; |
77 | dfsrr; | 77 | dfsrr; |
78 | }; | 78 | }; |
79 | 79 | ||
@@ -82,7 +82,7 @@ | |||
82 | compatible = "mpc83xx_spi"; | 82 | compatible = "mpc83xx_spi"; |
83 | reg = <7000 1000>; | 83 | reg = <7000 1000>; |
84 | interrupts = <10 8>; | 84 | interrupts = <10 8>; |
85 | interrupt-parent = <700>; | 85 | interrupt-parent = < &ipic >; |
86 | mode = <0>; | 86 | mode = <0>; |
87 | }; | 87 | }; |
88 | 88 | ||
@@ -94,8 +94,8 @@ | |||
94 | reg = <22000 1000>; | 94 | reg = <22000 1000>; |
95 | #address-cells = <1>; | 95 | #address-cells = <1>; |
96 | #size-cells = <0>; | 96 | #size-cells = <0>; |
97 | interrupt-parent = <700>; | 97 | interrupt-parent = < &ipic >; |
98 | interrupts = <27 2>; | 98 | interrupts = <27 8>; |
99 | phy_type = "ulpi"; | 99 | phy_type = "ulpi"; |
100 | port1; | 100 | port1; |
101 | }; | 101 | }; |
@@ -106,8 +106,8 @@ | |||
106 | reg = <23000 1000>; | 106 | reg = <23000 1000>; |
107 | #address-cells = <1>; | 107 | #address-cells = <1>; |
108 | #size-cells = <0>; | 108 | #size-cells = <0>; |
109 | interrupt-parent = <700>; | 109 | interrupt-parent = < &ipic >; |
110 | interrupts = <26 2>; | 110 | interrupts = <26 8>; |
111 | dr_mode = "otg"; | 111 | dr_mode = "otg"; |
112 | phy_type = "ulpi"; | 112 | phy_type = "ulpi"; |
113 | }; | 113 | }; |
@@ -118,18 +118,15 @@ | |||
118 | reg = <24520 20>; | 118 | reg = <24520 20>; |
119 | #address-cells = <1>; | 119 | #address-cells = <1>; |
120 | #size-cells = <0>; | 120 | #size-cells = <0>; |
121 | linux,phandle = <24520>; | 121 | phy0: ethernet-phy@0 { |
122 | ethernet-phy@0 { | 122 | interrupt-parent = < &ipic >; |
123 | linux,phandle = <2452000>; | 123 | interrupts = <11 8>; |
124 | interrupt-parent = <700>; | ||
125 | interrupts = <11 2>; | ||
126 | reg = <0>; | 124 | reg = <0>; |
127 | device_type = "ethernet-phy"; | 125 | device_type = "ethernet-phy"; |
128 | }; | 126 | }; |
129 | ethernet-phy@1 { | 127 | phy1: ethernet-phy@1 { |
130 | linux,phandle = <2452001>; | 128 | interrupt-parent = < &ipic >; |
131 | interrupt-parent = <700>; | 129 | interrupts = <12 8>; |
132 | interrupts = <12 2>; | ||
133 | reg = <1>; | 130 | reg = <1>; |
134 | device_type = "ethernet-phy"; | 131 | device_type = "ethernet-phy"; |
135 | }; | 132 | }; |
@@ -143,8 +140,8 @@ | |||
143 | address = [ 00 00 00 00 00 00 ]; | 140 | address = [ 00 00 00 00 00 00 ]; |
144 | local-mac-address = [ 00 00 00 00 00 00 ]; | 141 | local-mac-address = [ 00 00 00 00 00 00 ]; |
145 | interrupts = <20 8 21 8 22 8>; | 142 | interrupts = <20 8 21 8 22 8>; |
146 | interrupt-parent = <700>; | 143 | interrupt-parent = < &ipic >; |
147 | phy-handle = <2452000>; | 144 | phy-handle = < &phy0 >; |
148 | }; | 145 | }; |
149 | 146 | ||
150 | ethernet@25000 { | 147 | ethernet@25000 { |
@@ -157,8 +154,8 @@ | |||
157 | address = [ 00 00 00 00 00 00 ]; | 154 | address = [ 00 00 00 00 00 00 ]; |
158 | local-mac-address = [ 00 00 00 00 00 00 ]; | 155 | local-mac-address = [ 00 00 00 00 00 00 ]; |
159 | interrupts = <23 8 24 8 25 8>; | 156 | interrupts = <23 8 24 8 25 8>; |
160 | interrupt-parent = <700>; | 157 | interrupt-parent = < &ipic >; |
161 | phy-handle = <2452001>; | 158 | phy-handle = < &phy1 >; |
162 | }; | 159 | }; |
163 | 160 | ||
164 | serial@4500 { | 161 | serial@4500 { |
@@ -167,7 +164,7 @@ | |||
167 | reg = <4500 100>; | 164 | reg = <4500 100>; |
168 | clock-frequency = <0>; | 165 | clock-frequency = <0>; |
169 | interrupts = <9 8>; | 166 | interrupts = <9 8>; |
170 | interrupt-parent = <700>; | 167 | interrupt-parent = < &ipic >; |
171 | }; | 168 | }; |
172 | 169 | ||
173 | serial@4600 { | 170 | serial@4600 { |
@@ -176,7 +173,7 @@ | |||
176 | reg = <4600 100>; | 173 | reg = <4600 100>; |
177 | clock-frequency = <0>; | 174 | clock-frequency = <0>; |
178 | interrupts = <a 8>; | 175 | interrupts = <a 8>; |
179 | interrupt-parent = <700>; | 176 | interrupt-parent = < &ipic >; |
180 | }; | 177 | }; |
181 | 178 | ||
182 | pci@8500 { | 179 | pci@8500 { |
@@ -184,47 +181,47 @@ | |||
184 | interrupt-map = < | 181 | interrupt-map = < |
185 | 182 | ||
186 | /* IDSEL 0x11 */ | 183 | /* IDSEL 0x11 */ |
187 | 8800 0 0 1 700 14 8 | 184 | 8800 0 0 1 &ipic 14 8 |
188 | 8800 0 0 2 700 15 8 | 185 | 8800 0 0 2 &ipic 15 8 |
189 | 8800 0 0 3 700 16 8 | 186 | 8800 0 0 3 &ipic 16 8 |
190 | 8800 0 0 4 700 17 8 | 187 | 8800 0 0 4 &ipic 17 8 |
191 | 188 | ||
192 | /* IDSEL 0x12 */ | 189 | /* IDSEL 0x12 */ |
193 | 9000 0 0 1 700 16 8 | 190 | 9000 0 0 1 &ipic 16 8 |
194 | 9000 0 0 2 700 17 8 | 191 | 9000 0 0 2 &ipic 17 8 |
195 | 9000 0 0 3 700 14 8 | 192 | 9000 0 0 3 &ipic 14 8 |
196 | 9000 0 0 4 700 15 8 | 193 | 9000 0 0 4 &ipic 15 8 |
197 | 194 | ||
198 | /* IDSEL 0x13 */ | 195 | /* IDSEL 0x13 */ |
199 | 9800 0 0 1 700 17 8 | 196 | 9800 0 0 1 &ipic 17 8 |
200 | 9800 0 0 2 700 14 8 | 197 | 9800 0 0 2 &ipic 14 8 |
201 | 9800 0 0 3 700 15 8 | 198 | 9800 0 0 3 &ipic 15 8 |
202 | 9800 0 0 4 700 16 8 | 199 | 9800 0 0 4 &ipic 16 8 |
203 | 200 | ||
204 | /* IDSEL 0x15 */ | 201 | /* IDSEL 0x15 */ |
205 | a800 0 0 1 700 14 8 | 202 | a800 0 0 1 &ipic 14 8 |
206 | a800 0 0 2 700 15 8 | 203 | a800 0 0 2 &ipic 15 8 |
207 | a800 0 0 3 700 16 8 | 204 | a800 0 0 3 &ipic 16 8 |
208 | a800 0 0 4 700 17 8 | 205 | a800 0 0 4 &ipic 17 8 |
209 | 206 | ||
210 | /* IDSEL 0x16 */ | 207 | /* IDSEL 0x16 */ |
211 | b000 0 0 1 700 17 8 | 208 | b000 0 0 1 &ipic 17 8 |
212 | b000 0 0 2 700 14 8 | 209 | b000 0 0 2 &ipic 14 8 |
213 | b000 0 0 3 700 15 8 | 210 | b000 0 0 3 &ipic 15 8 |
214 | b000 0 0 4 700 16 8 | 211 | b000 0 0 4 &ipic 16 8 |
215 | 212 | ||
216 | /* IDSEL 0x17 */ | 213 | /* IDSEL 0x17 */ |
217 | b800 0 0 1 700 16 8 | 214 | b800 0 0 1 &ipic 16 8 |
218 | b800 0 0 2 700 17 8 | 215 | b800 0 0 2 &ipic 17 8 |
219 | b800 0 0 3 700 14 8 | 216 | b800 0 0 3 &ipic 14 8 |
220 | b800 0 0 4 700 15 8 | 217 | b800 0 0 4 &ipic 15 8 |
221 | 218 | ||
222 | /* IDSEL 0x18 */ | 219 | /* IDSEL 0x18 */ |
223 | c000 0 0 1 700 15 8 | 220 | c000 0 0 1 &ipic 15 8 |
224 | c000 0 0 2 700 16 8 | 221 | c000 0 0 2 &ipic 16 8 |
225 | c000 0 0 3 700 17 8 | 222 | c000 0 0 3 &ipic 17 8 |
226 | c000 0 0 4 700 14 8>; | 223 | c000 0 0 4 &ipic 14 8>; |
227 | interrupt-parent = <700>; | 224 | interrupt-parent = < &ipic >; |
228 | interrupts = <42 8>; | 225 | interrupts = <42 8>; |
229 | bus-range = <0 0>; | 226 | bus-range = <0 0>; |
230 | ranges = <02000000 0 a0000000 a0000000 0 10000000 | 227 | ranges = <02000000 0 a0000000 a0000000 0 10000000 |
@@ -244,47 +241,47 @@ | |||
244 | interrupt-map = < | 241 | interrupt-map = < |
245 | 242 | ||
246 | /* IDSEL 0x11 */ | 243 | /* IDSEL 0x11 */ |
247 | 8800 0 0 1 700 14 8 | 244 | 8800 0 0 1 &ipic 14 8 |
248 | 8800 0 0 2 700 15 8 | 245 | 8800 0 0 2 &ipic 15 8 |
249 | 8800 0 0 3 700 16 8 | 246 | 8800 0 0 3 &ipic 16 8 |
250 | 8800 0 0 4 700 17 8 | 247 | 8800 0 0 4 &ipic 17 8 |
251 | 248 | ||
252 | /* IDSEL 0x12 */ | 249 | /* IDSEL 0x12 */ |
253 | 9000 0 0 1 700 16 8 | 250 | 9000 0 0 1 &ipic 16 8 |
254 | 9000 0 0 2 700 17 8 | 251 | 9000 0 0 2 &ipic 17 8 |
255 | 9000 0 0 3 700 14 8 | 252 | 9000 0 0 3 &ipic 14 8 |
256 | 9000 0 0 4 700 15 8 | 253 | 9000 0 0 4 &ipic 15 8 |
257 | 254 | ||
258 | /* IDSEL 0x13 */ | 255 | /* IDSEL 0x13 */ |
259 | 9800 0 0 1 700 17 8 | 256 | 9800 0 0 1 &ipic 17 8 |
260 | 9800 0 0 2 700 14 8 | 257 | 9800 0 0 2 &ipic 14 8 |
261 | 9800 0 0 3 700 15 8 | 258 | 9800 0 0 3 &ipic 15 8 |
262 | 9800 0 0 4 700 16 8 | 259 | 9800 0 0 4 &ipic 16 8 |
263 | 260 | ||
264 | /* IDSEL 0x15 */ | 261 | /* IDSEL 0x15 */ |
265 | a800 0 0 1 700 14 8 | 262 | a800 0 0 1 &ipic 14 8 |
266 | a800 0 0 2 700 15 8 | 263 | a800 0 0 2 &ipic 15 8 |
267 | a800 0 0 3 700 16 8 | 264 | a800 0 0 3 &ipic 16 8 |
268 | a800 0 0 4 700 17 8 | 265 | a800 0 0 4 &ipic 17 8 |
269 | 266 | ||
270 | /* IDSEL 0x16 */ | 267 | /* IDSEL 0x16 */ |
271 | b000 0 0 1 700 17 8 | 268 | b000 0 0 1 &ipic 17 8 |
272 | b000 0 0 2 700 14 8 | 269 | b000 0 0 2 &ipic 14 8 |
273 | b000 0 0 3 700 15 8 | 270 | b000 0 0 3 &ipic 15 8 |
274 | b000 0 0 4 700 16 8 | 271 | b000 0 0 4 &ipic 16 8 |
275 | 272 | ||
276 | /* IDSEL 0x17 */ | 273 | /* IDSEL 0x17 */ |
277 | b800 0 0 1 700 16 8 | 274 | b800 0 0 1 &ipic 16 8 |
278 | b800 0 0 2 700 17 8 | 275 | b800 0 0 2 &ipic 17 8 |
279 | b800 0 0 3 700 14 8 | 276 | b800 0 0 3 &ipic 14 8 |
280 | b800 0 0 4 700 15 8 | 277 | b800 0 0 4 &ipic 15 8 |
281 | 278 | ||
282 | /* IDSEL 0x18 */ | 279 | /* IDSEL 0x18 */ |
283 | c000 0 0 1 700 15 8 | 280 | c000 0 0 1 &ipic 15 8 |
284 | c000 0 0 2 700 16 8 | 281 | c000 0 0 2 &ipic 16 8 |
285 | c000 0 0 3 700 17 8 | 282 | c000 0 0 3 &ipic 17 8 |
286 | c000 0 0 4 700 14 8>; | 283 | c000 0 0 4 &ipic 14 8>; |
287 | interrupt-parent = <700>; | 284 | interrupt-parent = < &ipic >; |
288 | interrupts = <42 8>; | 285 | interrupts = <42 8>; |
289 | bus-range = <0 0>; | 286 | bus-range = <0 0>; |
290 | ranges = <02000000 0 b0000000 b0000000 0 10000000 | 287 | ranges = <02000000 0 b0000000 b0000000 0 10000000 |
@@ -306,7 +303,7 @@ | |||
306 | compatible = "talitos"; | 303 | compatible = "talitos"; |
307 | reg = <30000 10000>; | 304 | reg = <30000 10000>; |
308 | interrupts = <b 8>; | 305 | interrupts = <b 8>; |
309 | interrupt-parent = <700>; | 306 | interrupt-parent = < &ipic >; |
310 | num-channels = <4>; | 307 | num-channels = <4>; |
311 | channel-fifo-len = <18>; | 308 | channel-fifo-len = <18>; |
312 | exec-units-mask = <0000007e>; | 309 | exec-units-mask = <0000007e>; |
@@ -321,8 +318,7 @@ | |||
321 | * sense == 8: Level, low assertion | 318 | * sense == 8: Level, low assertion |
322 | * sense == 2: Edge, high-to-low change | 319 | * sense == 2: Edge, high-to-low change |
323 | */ | 320 | */ |
324 | pic@700 { | 321 | ipic: pic@700 { |
325 | linux,phandle = <700>; | ||
326 | interrupt-controller; | 322 | interrupt-controller; |
327 | #address-cells = <0>; | 323 | #address-cells = <0>; |
328 | #interrupt-cells = <2>; | 324 | #interrupt-cells = <2>; |
diff --git a/arch/powerpc/boot/dts/mpc8360emds.dts b/arch/powerpc/boot/dts/mpc8360emds.dts index 303bd668deb7..4fe45c021848 100644 --- a/arch/powerpc/boot/dts/mpc8360emds.dts +++ b/arch/powerpc/boot/dts/mpc8360emds.dts | |||
@@ -15,17 +15,15 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "MPC8360EPB"; | 18 | model = "MPC8360MDS"; |
19 | compatible = "MPC83xx"; | 19 | compatible = "MPC8360EMDS", "MPC836xMDS", "MPC83xxMDS"; |
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,8360@0 { | 28 | PowerPC,8360@0 { |
31 | device_type = "cpu"; | 29 | device_type = "cpu"; |
@@ -38,13 +36,11 @@ | |||
38 | bus-frequency = <FBC5200>; | 36 | bus-frequency = <FBC5200>; |
39 | clock-frequency = <1F78A400>; | 37 | clock-frequency = <1F78A400>; |
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 | ||
@@ -73,7 +69,7 @@ | |||
73 | compatible = "fsl-i2c"; | 69 | compatible = "fsl-i2c"; |
74 | reg = <3000 100>; | 70 | reg = <3000 100>; |
75 | interrupts = <e 8>; | 71 | interrupts = <e 8>; |
76 | interrupt-parent = <700>; | 72 | interrupt-parent = < &ipic >; |
77 | dfsrr; | 73 | dfsrr; |
78 | }; | 74 | }; |
79 | 75 | ||
@@ -82,7 +78,7 @@ | |||
82 | compatible = "fsl-i2c"; | 78 | compatible = "fsl-i2c"; |
83 | reg = <3100 100>; | 79 | reg = <3100 100>; |
84 | interrupts = <f 8>; | 80 | interrupts = <f 8>; |
85 | interrupt-parent = <700>; | 81 | interrupt-parent = < &ipic >; |
86 | dfsrr; | 82 | dfsrr; |
87 | }; | 83 | }; |
88 | 84 | ||
@@ -92,7 +88,7 @@ | |||
92 | reg = <4500 100>; | 88 | reg = <4500 100>; |
93 | clock-frequency = <FBC5200>; | 89 | clock-frequency = <FBC5200>; |
94 | interrupts = <9 8>; | 90 | interrupts = <9 8>; |
95 | interrupt-parent = <700>; | 91 | interrupt-parent = < &ipic >; |
96 | }; | 92 | }; |
97 | 93 | ||
98 | serial@4600 { | 94 | serial@4600 { |
@@ -101,7 +97,7 @@ | |||
101 | reg = <4600 100>; | 97 | reg = <4600 100>; |
102 | clock-frequency = <FBC5200>; | 98 | clock-frequency = <FBC5200>; |
103 | interrupts = <a 8>; | 99 | interrupts = <a 8>; |
104 | interrupt-parent = <700>; | 100 | interrupt-parent = < &ipic >; |
105 | }; | 101 | }; |
106 | 102 | ||
107 | crypto@30000 { | 103 | crypto@30000 { |
@@ -110,7 +106,7 @@ | |||
110 | compatible = "talitos"; | 106 | compatible = "talitos"; |
111 | reg = <30000 10000>; | 107 | reg = <30000 10000>; |
112 | interrupts = <b 8>; | 108 | interrupts = <b 8>; |
113 | interrupt-parent = <700>; | 109 | interrupt-parent = < &ipic >; |
114 | num-channels = <4>; | 110 | num-channels = <4>; |
115 | channel-fifo-len = <18>; | 111 | channel-fifo-len = <18>; |
116 | exec-units-mask = <0000007e>; | 112 | exec-units-mask = <0000007e>; |
@@ -119,52 +115,51 @@ | |||
119 | }; | 115 | }; |
120 | 116 | ||
121 | pci@8500 { | 117 | pci@8500 { |
122 | linux,phandle = <8500>; | ||
123 | interrupt-map-mask = <f800 0 0 7>; | 118 | interrupt-map-mask = <f800 0 0 7>; |
124 | interrupt-map = < | 119 | interrupt-map = < |
125 | 120 | ||
126 | /* IDSEL 0x11 AD17 */ | 121 | /* IDSEL 0x11 AD17 */ |
127 | 8800 0 0 1 700 14 8 | 122 | 8800 0 0 1 &ipic 14 8 |
128 | 8800 0 0 2 700 15 8 | 123 | 8800 0 0 2 &ipic 15 8 |
129 | 8800 0 0 3 700 16 8 | 124 | 8800 0 0 3 &ipic 16 8 |
130 | 8800 0 0 4 700 17 8 | 125 | 8800 0 0 4 &ipic 17 8 |
131 | 126 | ||
132 | /* IDSEL 0x12 AD18 */ | 127 | /* IDSEL 0x12 AD18 */ |
133 | 9000 0 0 1 700 16 8 | 128 | 9000 0 0 1 &ipic 16 8 |
134 | 9000 0 0 2 700 17 8 | 129 | 9000 0 0 2 &ipic 17 8 |
135 | 9000 0 0 3 700 14 8 | 130 | 9000 0 0 3 &ipic 14 8 |
136 | 9000 0 0 4 700 15 8 | 131 | 9000 0 0 4 &ipic 15 8 |
137 | 132 | ||
138 | /* IDSEL 0x13 AD19 */ | 133 | /* IDSEL 0x13 AD19 */ |
139 | 9800 0 0 1 700 17 8 | 134 | 9800 0 0 1 &ipic 17 8 |
140 | 9800 0 0 2 700 14 8 | 135 | 9800 0 0 2 &ipic 14 8 |
141 | 9800 0 0 3 700 15 8 | 136 | 9800 0 0 3 &ipic 15 8 |
142 | 9800 0 0 4 700 16 8 | 137 | 9800 0 0 4 &ipic 16 8 |
143 | 138 | ||
144 | /* IDSEL 0x15 AD21*/ | 139 | /* IDSEL 0x15 AD21*/ |
145 | a800 0 0 1 700 14 8 | 140 | a800 0 0 1 &ipic 14 8 |
146 | a800 0 0 2 700 15 8 | 141 | a800 0 0 2 &ipic 15 8 |
147 | a800 0 0 3 700 16 8 | 142 | a800 0 0 3 &ipic 16 8 |
148 | a800 0 0 4 700 17 8 | 143 | a800 0 0 4 &ipic 17 8 |
149 | 144 | ||
150 | /* IDSEL 0x16 AD22*/ | 145 | /* IDSEL 0x16 AD22*/ |
151 | b000 0 0 1 700 17 8 | 146 | b000 0 0 1 &ipic 17 8 |
152 | b000 0 0 2 700 14 8 | 147 | b000 0 0 2 &ipic 14 8 |
153 | b000 0 0 3 700 15 8 | 148 | b000 0 0 3 &ipic 15 8 |
154 | b000 0 0 4 700 16 8 | 149 | b000 0 0 4 &ipic 16 8 |
155 | 150 | ||
156 | /* IDSEL 0x17 AD23*/ | 151 | /* IDSEL 0x17 AD23*/ |
157 | b800 0 0 1 700 16 8 | 152 | b800 0 0 1 &ipic 16 8 |
158 | b800 0 0 2 700 17 8 | 153 | b800 0 0 2 &ipic 17 8 |
159 | b800 0 0 3 700 14 8 | 154 | b800 0 0 3 &ipic 14 8 |
160 | b800 0 0 4 700 15 8 | 155 | b800 0 0 4 &ipic 15 8 |
161 | 156 | ||
162 | /* IDSEL 0x18 AD24*/ | 157 | /* IDSEL 0x18 AD24*/ |
163 | c000 0 0 1 700 15 8 | 158 | c000 0 0 1 &ipic 15 8 |
164 | c000 0 0 2 700 16 8 | 159 | c000 0 0 2 &ipic 16 8 |
165 | c000 0 0 3 700 17 8 | 160 | c000 0 0 3 &ipic 17 8 |
166 | c000 0 0 4 700 14 8>; | 161 | c000 0 0 4 &ipic 14 8>; |
167 | interrupt-parent = <700>; | 162 | interrupt-parent = < &ipic >; |
168 | interrupts = <42 8>; | 163 | interrupts = <42 8>; |
169 | bus-range = <0 0>; | 164 | bus-range = <0 0>; |
170 | ranges = <02000000 0 a0000000 a0000000 0 10000000 | 165 | ranges = <02000000 0 a0000000 a0000000 0 10000000 |
@@ -179,8 +174,7 @@ | |||
179 | device_type = "pci"; | 174 | device_type = "pci"; |
180 | }; | 175 | }; |
181 | 176 | ||
182 | pic@700 { | 177 | ipic: pic@700 { |
183 | linux,phandle = <700>; | ||
184 | interrupt-controller; | 178 | interrupt-controller; |
185 | #address-cells = <0>; | 179 | #address-cells = <0>; |
186 | #interrupt-cells = <2>; | 180 | #interrupt-cells = <2>; |
@@ -194,8 +188,7 @@ | |||
194 | device_type = "par_io"; | 188 | device_type = "par_io"; |
195 | num-ports = <7>; | 189 | num-ports = <7>; |
196 | 190 | ||
197 | ucc_pin@01 { | 191 | pio1: ucc_pin@01 { |
198 | linux,phandle = <140001>; | ||
199 | pio-map = < | 192 | pio-map = < |
200 | /* port pin dir open_drain assignment has_irq */ | 193 | /* port pin dir open_drain assignment has_irq */ |
201 | 0 3 1 0 1 0 /* TxD0 */ | 194 | 0 3 1 0 1 0 /* TxD0 */ |
@@ -222,8 +215,7 @@ | |||
222 | 2 9 1 0 3 0 /* GTX_CLK - CLK10 */ | 215 | 2 9 1 0 3 0 /* GTX_CLK - CLK10 */ |
223 | 2 8 2 0 1 0>; /* GTX125 - CLK9 */ | 216 | 2 8 2 0 1 0>; /* GTX125 - CLK9 */ |
224 | }; | 217 | }; |
225 | ucc_pin@02 { | 218 | pio2: ucc_pin@02 { |
226 | linux,phandle = <140002>; | ||
227 | pio-map = < | 219 | pio-map = < |
228 | /* port pin dir open_drain assignment has_irq */ | 220 | /* port pin dir open_drain assignment has_irq */ |
229 | 0 11 1 0 1 0 /* TxD0 */ | 221 | 0 11 1 0 1 0 /* TxD0 */ |
@@ -280,7 +272,7 @@ | |||
280 | compatible = "fsl_spi"; | 272 | compatible = "fsl_spi"; |
281 | reg = <4c0 40>; | 273 | reg = <4c0 40>; |
282 | interrupts = <2>; | 274 | interrupts = <2>; |
283 | interrupt-parent = <80>; | 275 | interrupt-parent = < &qeic >; |
284 | mode = "cpu"; | 276 | mode = "cpu"; |
285 | }; | 277 | }; |
286 | 278 | ||
@@ -289,7 +281,7 @@ | |||
289 | compatible = "fsl_spi"; | 281 | compatible = "fsl_spi"; |
290 | reg = <500 40>; | 282 | reg = <500 40>; |
291 | interrupts = <1>; | 283 | interrupts = <1>; |
292 | interrupt-parent = <80>; | 284 | interrupt-parent = < &qeic >; |
293 | mode = "cpu"; | 285 | mode = "cpu"; |
294 | }; | 286 | }; |
295 | 287 | ||
@@ -298,7 +290,7 @@ | |||
298 | compatible = "qe_udc"; | 290 | compatible = "qe_udc"; |
299 | reg = <6c0 40 8B00 100>; | 291 | reg = <6c0 40 8B00 100>; |
300 | interrupts = <b>; | 292 | interrupts = <b>; |
301 | interrupt-parent = <80>; | 293 | interrupt-parent = < &qeic >; |
302 | mode = "slave"; | 294 | mode = "slave"; |
303 | }; | 295 | }; |
304 | 296 | ||
@@ -309,12 +301,12 @@ | |||
309 | device-id = <1>; | 301 | device-id = <1>; |
310 | reg = <2000 200>; | 302 | reg = <2000 200>; |
311 | interrupts = <20>; | 303 | interrupts = <20>; |
312 | interrupt-parent = <80>; | 304 | interrupt-parent = < &qeic >; |
313 | mac-address = [ 00 04 9f 00 23 23 ]; | 305 | mac-address = [ 00 04 9f 00 23 23 ]; |
314 | rx-clock = <0>; | 306 | rx-clock = <0>; |
315 | tx-clock = <19>; | 307 | tx-clock = <19>; |
316 | phy-handle = <212000>; | 308 | phy-handle = < &phy0 >; |
317 | pio-handle = <140001>; | 309 | pio-handle = < &pio1 >; |
318 | }; | 310 | }; |
319 | 311 | ||
320 | ucc@3000 { | 312 | ucc@3000 { |
@@ -324,12 +316,12 @@ | |||
324 | device-id = <2>; | 316 | device-id = <2>; |
325 | reg = <3000 200>; | 317 | reg = <3000 200>; |
326 | interrupts = <21>; | 318 | interrupts = <21>; |
327 | interrupt-parent = <80>; | 319 | interrupt-parent = < &qeic >; |
328 | mac-address = [ 00 11 22 33 44 55 ]; | 320 | mac-address = [ 00 11 22 33 44 55 ]; |
329 | rx-clock = <0>; | 321 | rx-clock = <0>; |
330 | tx-clock = <14>; | 322 | tx-clock = <14>; |
331 | phy-handle = <212001>; | 323 | phy-handle = < &phy1 >; |
332 | pio-handle = <140002>; | 324 | pio-handle = < &pio2 >; |
333 | }; | 325 | }; |
334 | 326 | ||
335 | mdio@2120 { | 327 | mdio@2120 { |
@@ -339,26 +331,23 @@ | |||
339 | device_type = "mdio"; | 331 | device_type = "mdio"; |
340 | compatible = "ucc_geth_phy"; | 332 | compatible = "ucc_geth_phy"; |
341 | 333 | ||
342 | ethernet-phy@00 { | 334 | phy0: ethernet-phy@00 { |
343 | linux,phandle = <212000>; | 335 | interrupt-parent = < &ipic >; |
344 | interrupt-parent = <700>; | 336 | interrupts = <11 8>; |
345 | interrupts = <11 2>; | ||
346 | reg = <0>; | 337 | reg = <0>; |
347 | device_type = "ethernet-phy"; | 338 | device_type = "ethernet-phy"; |
348 | interface = <6>; //ENET_1000_GMII | 339 | interface = <6>; //ENET_1000_GMII |
349 | }; | 340 | }; |
350 | ethernet-phy@01 { | 341 | phy1: ethernet-phy@01 { |
351 | linux,phandle = <212001>; | 342 | interrupt-parent = < &ipic >; |
352 | interrupt-parent = <700>; | 343 | interrupts = <12 8>; |
353 | interrupts = <12 2>; | ||
354 | reg = <1>; | 344 | reg = <1>; |
355 | device_type = "ethernet-phy"; | 345 | device_type = "ethernet-phy"; |
356 | interface = <6>; | 346 | interface = <6>; |
357 | }; | 347 | }; |
358 | }; | 348 | }; |
359 | 349 | ||
360 | qeic@80 { | 350 | qeic: qeic@80 { |
361 | linux,phandle = <80>; | ||
362 | interrupt-controller; | 351 | interrupt-controller; |
363 | device_type = "qeic"; | 352 | device_type = "qeic"; |
364 | #address-cells = <0>; | 353 | #address-cells = <0>; |
@@ -367,7 +356,7 @@ | |||
367 | built-in; | 356 | built-in; |
368 | big-endian; | 357 | big-endian; |
369 | interrupts = <20 8 21 8>; //high:32 low:33 | 358 | interrupts = <20 8 21 8>; //high:32 low:33 |
370 | interrupt-parent = <700>; | 359 | interrupt-parent = < &ipic >; |
371 | }; | 360 | }; |
372 | 361 | ||
373 | }; | 362 | }; |