aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/devicetree/bindings/clock/qoriq-clock.txt6
-rw-r--r--arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi4
-rw-r--r--arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi8
-rw-r--r--arch/powerpc/boot/dts/fsl/b4si-post.dtsi15
-rw-r--r--arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts128
-rw-r--r--arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts128
-rw-r--r--arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi2
-rw-r--r--arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi4
-rw-r--r--arch/powerpc/boot/dts/fsl/p2041si-post.dtsi18
-rw-r--r--arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi8
-rw-r--r--arch/powerpc/boot/dts/fsl/p3041si-post.dtsi18
-rw-r--r--arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi8
-rw-r--r--arch/powerpc/boot/dts/fsl/p4080si-post.dtsi70
-rw-r--r--arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi16
-rw-r--r--arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi4
-rw-r--r--arch/powerpc/boot/dts/fsl/p5040si-post.dtsi18
-rw-r--r--arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi8
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi47
-rw-r--r--arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi30
-rw-r--r--arch/powerpc/boot/dts/fsl/t1023si-post.dtsi16
-rw-r--r--arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi4
-rw-r--r--arch/powerpc/boot/dts/fsl/t1040si-post.dtsi44
-rw-r--r--arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi8
-rw-r--r--arch/powerpc/boot/dts/fsl/t2081si-post.dtsi22
-rw-r--r--arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi8
-rw-r--r--arch/powerpc/boot/dts/fsl/t4240si-post.dtsi61
-rw-r--r--arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi24
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts4
-rw-r--r--arch/powerpc/configs/fsl-emb-nonhw.config1
-rw-r--r--arch/powerpc/include/asm/cputable.h1
-rw-r--r--arch/powerpc/include/asm/reg.h2
-rw-r--r--arch/powerpc/kernel/cputable.c10
-rw-r--r--arch/powerpc/platforms/83xx/misc.c17
-rw-r--r--arch/powerpc/sysdev/fsl_rmu.c4
34 files changed, 216 insertions, 550 deletions
diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
index 97f46adac85f..c655f28d5918 100644
--- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
+++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
@@ -28,6 +28,12 @@ Required properties:
28 * "fsl,p4080-clockgen" 28 * "fsl,p4080-clockgen"
29 * "fsl,p5020-clockgen" 29 * "fsl,p5020-clockgen"
30 * "fsl,p5040-clockgen" 30 * "fsl,p5040-clockgen"
31 * "fsl,t1023-clockgen"
32 * "fsl,t1024-clockgen"
33 * "fsl,t1040-clockgen"
34 * "fsl,t1042-clockgen"
35 * "fsl,t2080-clockgen"
36 * "fsl,t2081-clockgen"
31 * "fsl,t4240-clockgen" 37 * "fsl,t4240-clockgen"
32 * "fsl,b4420-clockgen" 38 * "fsl,b4420-clockgen"
33 * "fsl,b4860-clockgen" 39 * "fsl,b4860-clockgen"
diff --git a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
index 88d8423f8ac5..bb7b9b9f3f5f 100644
--- a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
@@ -70,14 +70,14 @@
70 cpu0: PowerPC,e6500@0 { 70 cpu0: PowerPC,e6500@0 {
71 device_type = "cpu"; 71 device_type = "cpu";
72 reg = <0 1>; 72 reg = <0 1>;
73 clocks = <&mux0>; 73 clocks = <&clockgen 1 0>;
74 next-level-cache = <&L2_1>; 74 next-level-cache = <&L2_1>;
75 fsl,portid-mapping = <0x80000000>; 75 fsl,portid-mapping = <0x80000000>;
76 }; 76 };
77 cpu1: PowerPC,e6500@2 { 77 cpu1: PowerPC,e6500@2 {
78 device_type = "cpu"; 78 device_type = "cpu";
79 reg = <2 3>; 79 reg = <2 3>;
80 clocks = <&mux0>; 80 clocks = <&clockgen 1 0>;
81 next-level-cache = <&L2_1>; 81 next-level-cache = <&L2_1>;
82 fsl,portid-mapping = <0x80000000>; 82 fsl,portid-mapping = <0x80000000>;
83 }; 83 };
diff --git a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
index f3f968c51f4b..388ba1b15f8c 100644
--- a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
@@ -75,28 +75,28 @@
75 cpu0: PowerPC,e6500@0 { 75 cpu0: PowerPC,e6500@0 {
76 device_type = "cpu"; 76 device_type = "cpu";
77 reg = <0 1>; 77 reg = <0 1>;
78 clocks = <&mux0>; 78 clocks = <&clockgen 1 0>;
79 next-level-cache = <&L2_1>; 79 next-level-cache = <&L2_1>;
80 fsl,portid-mapping = <0x80000000>; 80 fsl,portid-mapping = <0x80000000>;
81 }; 81 };
82 cpu1: PowerPC,e6500@2 { 82 cpu1: PowerPC,e6500@2 {
83 device_type = "cpu"; 83 device_type = "cpu";
84 reg = <2 3>; 84 reg = <2 3>;
85 clocks = <&mux0>; 85 clocks = <&clockgen 1 0>;
86 next-level-cache = <&L2_1>; 86 next-level-cache = <&L2_1>;
87 fsl,portid-mapping = <0x80000000>; 87 fsl,portid-mapping = <0x80000000>;
88 }; 88 };
89 cpu2: PowerPC,e6500@4 { 89 cpu2: PowerPC,e6500@4 {
90 device_type = "cpu"; 90 device_type = "cpu";
91 reg = <4 5>; 91 reg = <4 5>;
92 clocks = <&mux0>; 92 clocks = <&clockgen 1 0>;
93 next-level-cache = <&L2_1>; 93 next-level-cache = <&L2_1>;
94 fsl,portid-mapping = <0x80000000>; 94 fsl,portid-mapping = <0x80000000>;
95 }; 95 };
96 cpu3: PowerPC,e6500@6 { 96 cpu3: PowerPC,e6500@6 {
97 device_type = "cpu"; 97 device_type = "cpu";
98 reg = <6 7>; 98 reg = <6 7>;
99 clocks = <&mux0>; 99 clocks = <&clockgen 1 0>;
100 next-level-cache = <&L2_1>; 100 next-level-cache = <&L2_1>;
101 fsl,portid-mapping = <0x80000000>; 101 fsl,portid-mapping = <0x80000000>;
102 }; 102 };
diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
index 1b33f5157c8a..4f044b41a776 100644
--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -398,21 +398,6 @@
398 }; 398 };
399 399
400/include/ "qoriq-clockgen2.dtsi" 400/include/ "qoriq-clockgen2.dtsi"
401 clockgen: global-utilities@e1000 {
402 compatible = "fsl,b4-clockgen", "fsl,qoriq-clockgen-2.0";
403 reg = <0xe1000 0x1000>;
404
405 mux0: mux0@0 {
406 #clock-cells = <0>;
407 reg = <0x0 0x4>;
408 compatible = "fsl,qoriq-core-mux-2.0";
409 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
410 <&pll1 0>, <&pll1 1>, <&pll1 2>;
411 clock-names = "pll0", "pll0-div2", "pll0-div4",
412 "pll1", "pll1-div2", "pll1-div4";
413 clock-output-names = "cmux0";
414 };
415 };
416 401
417 rcpm: global-utilities@e2000 { 402 rcpm: global-utilities@e2000 {
418 compatible = "fsl,b4-rcpm", "fsl,qoriq-rcpm-2.0"; 403 compatible = "fsl,b4-rcpm", "fsl,qoriq-rcpm-2.0";
diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
index 11bea3e6a43f..58ac17496c89 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
@@ -169,100 +169,100 @@
169 interrupt-map-mask = <0xff00 0 0 7>; 169 interrupt-map-mask = <0xff00 0 0 7>;
170 interrupt-map = < 170 interrupt-map = <
171 /* IDSEL 0x11 func 0 - PCI slot 1 */ 171 /* IDSEL 0x11 func 0 - PCI slot 1 */
172 0x8800 0 0 1 &mpic 2 1 172 0x8800 0 0 1 &mpic 2 1 0 0
173 0x8800 0 0 2 &mpic 3 1 173 0x8800 0 0 2 &mpic 3 1 0 0
174 0x8800 0 0 3 &mpic 4 1 174 0x8800 0 0 3 &mpic 4 1 0 0
175 0x8800 0 0 4 &mpic 1 1 175 0x8800 0 0 4 &mpic 1 1 0 0
176 176
177 /* IDSEL 0x11 func 1 - PCI slot 1 */ 177 /* IDSEL 0x11 func 1 - PCI slot 1 */
178 0x8900 0 0 1 &mpic 2 1 178 0x8900 0 0 1 &mpic 2 1 0 0
179 0x8900 0 0 2 &mpic 3 1 179 0x8900 0 0 2 &mpic 3 1 0 0
180 0x8900 0 0 3 &mpic 4 1 180 0x8900 0 0 3 &mpic 4 1 0 0
181 0x8900 0 0 4 &mpic 1 1 181 0x8900 0 0 4 &mpic 1 1 0 0
182 182
183 /* IDSEL 0x11 func 2 - PCI slot 1 */ 183 /* IDSEL 0x11 func 2 - PCI slot 1 */
184 0x8a00 0 0 1 &mpic 2 1 184 0x8a00 0 0 1 &mpic 2 1 0 0
185 0x8a00 0 0 2 &mpic 3 1 185 0x8a00 0 0 2 &mpic 3 1 0 0
186 0x8a00 0 0 3 &mpic 4 1 186 0x8a00 0 0 3 &mpic 4 1 0 0
187 0x8a00 0 0 4 &mpic 1 1 187 0x8a00 0 0 4 &mpic 1 1 0 0
188 188
189 /* IDSEL 0x11 func 3 - PCI slot 1 */ 189 /* IDSEL 0x11 func 3 - PCI slot 1 */
190 0x8b00 0 0 1 &mpic 2 1 190 0x8b00 0 0 1 &mpic 2 1 0 0
191 0x8b00 0 0 2 &mpic 3 1 191 0x8b00 0 0 2 &mpic 3 1 0 0
192 0x8b00 0 0 3 &mpic 4 1 192 0x8b00 0 0 3 &mpic 4 1 0 0
193 0x8b00 0 0 4 &mpic 1 1 193 0x8b00 0 0 4 &mpic 1 1 0 0
194 194
195 /* IDSEL 0x11 func 4 - PCI slot 1 */ 195 /* IDSEL 0x11 func 4 - PCI slot 1 */
196 0x8c00 0 0 1 &mpic 2 1 196 0x8c00 0 0 1 &mpic 2 1 0 0
197 0x8c00 0 0 2 &mpic 3 1 197 0x8c00 0 0 2 &mpic 3 1 0 0
198 0x8c00 0 0 3 &mpic 4 1 198 0x8c00 0 0 3 &mpic 4 1 0 0
199 0x8c00 0 0 4 &mpic 1 1 199 0x8c00 0 0 4 &mpic 1 1 0 0
200 200
201 /* IDSEL 0x11 func 5 - PCI slot 1 */ 201 /* IDSEL 0x11 func 5 - PCI slot 1 */
202 0x8d00 0 0 1 &mpic 2 1 202 0x8d00 0 0 1 &mpic 2 1 0 0
203 0x8d00 0 0 2 &mpic 3 1 203 0x8d00 0 0 2 &mpic 3 1 0 0
204 0x8d00 0 0 3 &mpic 4 1 204 0x8d00 0 0 3 &mpic 4 1 0 0
205 0x8d00 0 0 4 &mpic 1 1 205 0x8d00 0 0 4 &mpic 1 1 0 0
206 206
207 /* IDSEL 0x11 func 6 - PCI slot 1 */ 207 /* IDSEL 0x11 func 6 - PCI slot 1 */
208 0x8e00 0 0 1 &mpic 2 1 208 0x8e00 0 0 1 &mpic 2 1 0 0
209 0x8e00 0 0 2 &mpic 3 1 209 0x8e00 0 0 2 &mpic 3 1 0 0
210 0x8e00 0 0 3 &mpic 4 1 210 0x8e00 0 0 3 &mpic 4 1 0 0
211 0x8e00 0 0 4 &mpic 1 1 211 0x8e00 0 0 4 &mpic 1 1 0 0
212 212
213 /* IDSEL 0x11 func 7 - PCI slot 1 */ 213 /* IDSEL 0x11 func 7 - PCI slot 1 */
214 0x8f00 0 0 1 &mpic 2 1 214 0x8f00 0 0 1 &mpic 2 1 0 0
215 0x8f00 0 0 2 &mpic 3 1 215 0x8f00 0 0 2 &mpic 3 1 0 0
216 0x8f00 0 0 3 &mpic 4 1 216 0x8f00 0 0 3 &mpic 4 1 0 0
217 0x8f00 0 0 4 &mpic 1 1 217 0x8f00 0 0 4 &mpic 1 1 0 0
218 218
219 /* IDSEL 0x12 func 0 - PCI slot 2 */ 219 /* IDSEL 0x12 func 0 - PCI slot 2 */
220 0x9000 0 0 1 &mpic 3 1 220 0x9000 0 0 1 &mpic 3 1 0 0
221 0x9000 0 0 2 &mpic 4 1 221 0x9000 0 0 2 &mpic 4 1 0 0
222 0x9000 0 0 3 &mpic 1 1 222 0x9000 0 0 3 &mpic 1 1 0 0
223 0x9000 0 0 4 &mpic 2 1 223 0x9000 0 0 4 &mpic 2 1 0 0
224 224
225 /* IDSEL 0x12 func 1 - PCI slot 2 */ 225 /* IDSEL 0x12 func 1 - PCI slot 2 */
226 0x9100 0 0 1 &mpic 3 1 226 0x9100 0 0 1 &mpic 3 1 0 0
227 0x9100 0 0 2 &mpic 4 1 227 0x9100 0 0 2 &mpic 4 1 0 0
228 0x9100 0 0 3 &mpic 1 1 228 0x9100 0 0 3 &mpic 1 1 0 0
229 0x9100 0 0 4 &mpic 2 1 229 0x9100 0 0 4 &mpic 2 1 0 0
230 230
231 /* IDSEL 0x12 func 2 - PCI slot 2 */ 231 /* IDSEL 0x12 func 2 - PCI slot 2 */
232 0x9200 0 0 1 &mpic 3 1 232 0x9200 0 0 1 &mpic 3 1 0 0
233 0x9200 0 0 2 &mpic 4 1 233 0x9200 0 0 2 &mpic 4 1 0 0
234 0x9200 0 0 3 &mpic 1 1 234 0x9200 0 0 3 &mpic 1 1 0 0
235 0x9200 0 0 4 &mpic 2 1 235 0x9200 0 0 4 &mpic 2 1 0 0
236 236
237 /* IDSEL 0x12 func 3 - PCI slot 2 */ 237 /* IDSEL 0x12 func 3 - PCI slot 2 */
238 0x9300 0 0 1 &mpic 3 1 238 0x9300 0 0 1 &mpic 3 1 0 0
239 0x9300 0 0 2 &mpic 4 1 239 0x9300 0 0 2 &mpic 4 1 0 0
240 0x9300 0 0 3 &mpic 1 1 240 0x9300 0 0 3 &mpic 1 1 0 0
241 0x9300 0 0 4 &mpic 2 1 241 0x9300 0 0 4 &mpic 2 1 0 0
242 242
243 /* IDSEL 0x12 func 4 - PCI slot 2 */ 243 /* IDSEL 0x12 func 4 - PCI slot 2 */
244 0x9400 0 0 1 &mpic 3 1 244 0x9400 0 0 1 &mpic 3 1 0 0
245 0x9400 0 0 2 &mpic 4 1 245 0x9400 0 0 2 &mpic 4 1 0 0
246 0x9400 0 0 3 &mpic 1 1 246 0x9400 0 0 3 &mpic 1 1 0 0
247 0x9400 0 0 4 &mpic 2 1 247 0x9400 0 0 4 &mpic 2 1 0 0
248 248
249 /* IDSEL 0x12 func 5 - PCI slot 2 */ 249 /* IDSEL 0x12 func 5 - PCI slot 2 */
250 0x9500 0 0 1 &mpic 3 1 250 0x9500 0 0 1 &mpic 3 1 0 0
251 0x9500 0 0 2 &mpic 4 1 251 0x9500 0 0 2 &mpic 4 1 0 0
252 0x9500 0 0 3 &mpic 1 1 252 0x9500 0 0 3 &mpic 1 1 0 0
253 0x9500 0 0 4 &mpic 2 1 253 0x9500 0 0 4 &mpic 2 1 0 0
254 254
255 /* IDSEL 0x12 func 6 - PCI slot 2 */ 255 /* IDSEL 0x12 func 6 - PCI slot 2 */
256 0x9600 0 0 1 &mpic 3 1 256 0x9600 0 0 1 &mpic 3 1 0 0
257 0x9600 0 0 2 &mpic 4 1 257 0x9600 0 0 2 &mpic 4 1 0 0
258 0x9600 0 0 3 &mpic 1 1 258 0x9600 0 0 3 &mpic 1 1 0 0
259 0x9600 0 0 4 &mpic 2 1 259 0x9600 0 0 4 &mpic 2 1 0 0
260 260
261 /* IDSEL 0x12 func 7 - PCI slot 2 */ 261 /* IDSEL 0x12 func 7 - PCI slot 2 */
262 0x9700 0 0 1 &mpic 3 1 262 0x9700 0 0 1 &mpic 3 1 0 0
263 0x9700 0 0 2 &mpic 4 1 263 0x9700 0 0 2 &mpic 4 1 0 0
264 0x9700 0 0 3 &mpic 1 1 264 0x9700 0 0 3 &mpic 1 1 0 0
265 0x9700 0 0 4 &mpic 2 1 265 0x9700 0 0 4 &mpic 2 1 0 0
266 266
267 // IDSEL 0x1c USB 267 // IDSEL 0x1c USB
268 0xe000 0 0 1 &i8259 12 2 268 0xe000 0 0 1 &i8259 12 2
diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
index 7ff62046a9ea..e64b91e321f6 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
@@ -136,100 +136,100 @@
136 interrupt-map-mask = <0xff00 0 0 7>; 136 interrupt-map-mask = <0xff00 0 0 7>;
137 interrupt-map = < 137 interrupt-map = <
138 /* IDSEL 0x11 func 0 - PCI slot 1 */ 138 /* IDSEL 0x11 func 0 - PCI slot 1 */
139 0x8800 0 0 1 &mpic 2 1 139 0x8800 0 0 1 &mpic 2 1 0 0
140 0x8800 0 0 2 &mpic 3 1 140 0x8800 0 0 2 &mpic 3 1 0 0
141 0x8800 0 0 3 &mpic 4 1 141 0x8800 0 0 3 &mpic 4 1 0 0
142 0x8800 0 0 4 &mpic 1 1 142 0x8800 0 0 4 &mpic 1 1 0 0
143 143
144 /* IDSEL 0x11 func 1 - PCI slot 1 */ 144 /* IDSEL 0x11 func 1 - PCI slot 1 */
145 0x8900 0 0 1 &mpic 2 1 145 0x8900 0 0 1 &mpic 2 1 0 0
146 0x8900 0 0 2 &mpic 3 1 146 0x8900 0 0 2 &mpic 3 1 0 0
147 0x8900 0 0 3 &mpic 4 1 147 0x8900 0 0 3 &mpic 4 1 0 0
148 0x8900 0 0 4 &mpic 1 1 148 0x8900 0 0 4 &mpic 1 1 0 0
149 149
150 /* IDSEL 0x11 func 2 - PCI slot 1 */ 150 /* IDSEL 0x11 func 2 - PCI slot 1 */
151 0x8a00 0 0 1 &mpic 2 1 151 0x8a00 0 0 1 &mpic 2 1 0 0
152 0x8a00 0 0 2 &mpic 3 1 152 0x8a00 0 0 2 &mpic 3 1 0 0
153 0x8a00 0 0 3 &mpic 4 1 153 0x8a00 0 0 3 &mpic 4 1 0 0
154 0x8a00 0 0 4 &mpic 1 1 154 0x8a00 0 0 4 &mpic 1 1 0 0
155 155
156 /* IDSEL 0x11 func 3 - PCI slot 1 */ 156 /* IDSEL 0x11 func 3 - PCI slot 1 */
157 0x8b00 0 0 1 &mpic 2 1 157 0x8b00 0 0 1 &mpic 2 1 0 0
158 0x8b00 0 0 2 &mpic 3 1 158 0x8b00 0 0 2 &mpic 3 1 0 0
159 0x8b00 0 0 3 &mpic 4 1 159 0x8b00 0 0 3 &mpic 4 1 0 0
160 0x8b00 0 0 4 &mpic 1 1 160 0x8b00 0 0 4 &mpic 1 1 0 0
161 161
162 /* IDSEL 0x11 func 4 - PCI slot 1 */ 162 /* IDSEL 0x11 func 4 - PCI slot 1 */
163 0x8c00 0 0 1 &mpic 2 1 163 0x8c00 0 0 1 &mpic 2 1 0 0
164 0x8c00 0 0 2 &mpic 3 1 164 0x8c00 0 0 2 &mpic 3 1 0 0
165 0x8c00 0 0 3 &mpic 4 1 165 0x8c00 0 0 3 &mpic 4 1 0 0
166 0x8c00 0 0 4 &mpic 1 1 166 0x8c00 0 0 4 &mpic 1 1 0 0
167 167
168 /* IDSEL 0x11 func 5 - PCI slot 1 */ 168 /* IDSEL 0x11 func 5 - PCI slot 1 */
169 0x8d00 0 0 1 &mpic 2 1 169 0x8d00 0 0 1 &mpic 2 1 0 0
170 0x8d00 0 0 2 &mpic 3 1 170 0x8d00 0 0 2 &mpic 3 1 0 0
171 0x8d00 0 0 3 &mpic 4 1 171 0x8d00 0 0 3 &mpic 4 1 0 0
172 0x8d00 0 0 4 &mpic 1 1 172 0x8d00 0 0 4 &mpic 1 1 0 0
173 173
174 /* IDSEL 0x11 func 6 - PCI slot 1 */ 174 /* IDSEL 0x11 func 6 - PCI slot 1 */
175 0x8e00 0 0 1 &mpic 2 1 175 0x8e00 0 0 1 &mpic 2 1 0 0
176 0x8e00 0 0 2 &mpic 3 1 176 0x8e00 0 0 2 &mpic 3 1 0 0
177 0x8e00 0 0 3 &mpic 4 1 177 0x8e00 0 0 3 &mpic 4 1 0 0
178 0x8e00 0 0 4 &mpic 1 1 178 0x8e00 0 0 4 &mpic 1 1 0 0
179 179
180 /* IDSEL 0x11 func 7 - PCI slot 1 */ 180 /* IDSEL 0x11 func 7 - PCI slot 1 */
181 0x8f00 0 0 1 &mpic 2 1 181 0x8f00 0 0 1 &mpic 2 1 0 0
182 0x8f00 0 0 2 &mpic 3 1 182 0x8f00 0 0 2 &mpic 3 1 0 0
183 0x8f00 0 0 3 &mpic 4 1 183 0x8f00 0 0 3 &mpic 4 1 0 0
184 0x8f00 0 0 4 &mpic 1 1 184 0x8f00 0 0 4 &mpic 1 1 0 0
185 185
186 /* IDSEL 0x12 func 0 - PCI slot 2 */ 186 /* IDSEL 0x12 func 0 - PCI slot 2 */
187 0x9000 0 0 1 &mpic 3 1 187 0x9000 0 0 1 &mpic 3 1 0 0
188 0x9000 0 0 2 &mpic 4 1 188 0x9000 0 0 2 &mpic 4 1 0 0
189 0x9000 0 0 3 &mpic 1 1 189 0x9000 0 0 3 &mpic 1 1 0 0
190 0x9000 0 0 4 &mpic 2 1 190 0x9000 0 0 4 &mpic 2 1 0 0
191 191
192 /* IDSEL 0x12 func 1 - PCI slot 2 */ 192 /* IDSEL 0x12 func 1 - PCI slot 2 */
193 0x9100 0 0 1 &mpic 3 1 193 0x9100 0 0 1 &mpic 3 1 0 0
194 0x9100 0 0 2 &mpic 4 1 194 0x9100 0 0 2 &mpic 4 1 0 0
195 0x9100 0 0 3 &mpic 1 1 195 0x9100 0 0 3 &mpic 1 1 0 0
196 0x9100 0 0 4 &mpic 2 1 196 0x9100 0 0 4 &mpic 2 1 0 0
197 197
198 /* IDSEL 0x12 func 2 - PCI slot 2 */ 198 /* IDSEL 0x12 func 2 - PCI slot 2 */
199 0x9200 0 0 1 &mpic 3 1 199 0x9200 0 0 1 &mpic 3 1 0 0
200 0x9200 0 0 2 &mpic 4 1 200 0x9200 0 0 2 &mpic 4 1 0 0
201 0x9200 0 0 3 &mpic 1 1 201 0x9200 0 0 3 &mpic 1 1 0 0
202 0x9200 0 0 4 &mpic 2 1 202 0x9200 0 0 4 &mpic 2 1 0 0
203 203
204 /* IDSEL 0x12 func 3 - PCI slot 2 */ 204 /* IDSEL 0x12 func 3 - PCI slot 2 */
205 0x9300 0 0 1 &mpic 3 1 205 0x9300 0 0 1 &mpic 3 1 0 0
206 0x9300 0 0 2 &mpic 4 1 206 0x9300 0 0 2 &mpic 4 1 0 0
207 0x9300 0 0 3 &mpic 1 1 207 0x9300 0 0 3 &mpic 1 1 0 0
208 0x9300 0 0 4 &mpic 2 1 208 0x9300 0 0 4 &mpic 2 1 0 0
209 209
210 /* IDSEL 0x12 func 4 - PCI slot 2 */ 210 /* IDSEL 0x12 func 4 - PCI slot 2 */
211 0x9400 0 0 1 &mpic 3 1 211 0x9400 0 0 1 &mpic 3 1 0 0
212 0x9400 0 0 2 &mpic 4 1 212 0x9400 0 0 2 &mpic 4 1 0 0
213 0x9400 0 0 3 &mpic 1 1 213 0x9400 0 0 3 &mpic 1 1 0 0
214 0x9400 0 0 4 &mpic 2 1 214 0x9400 0 0 4 &mpic 2 1 0 0
215 215
216 /* IDSEL 0x12 func 5 - PCI slot 2 */ 216 /* IDSEL 0x12 func 5 - PCI slot 2 */
217 0x9500 0 0 1 &mpic 3 1 217 0x9500 0 0 1 &mpic 3 1 0 0
218 0x9500 0 0 2 &mpic 4 1 218 0x9500 0 0 2 &mpic 4 1 0 0
219 0x9500 0 0 3 &mpic 1 1 219 0x9500 0 0 3 &mpic 1 1 0 0
220 0x9500 0 0 4 &mpic 2 1 220 0x9500 0 0 4 &mpic 2 1 0 0
221 221
222 /* IDSEL 0x12 func 6 - PCI slot 2 */ 222 /* IDSEL 0x12 func 6 - PCI slot 2 */
223 0x9600 0 0 1 &mpic 3 1 223 0x9600 0 0 1 &mpic 3 1 0 0
224 0x9600 0 0 2 &mpic 4 1 224 0x9600 0 0 2 &mpic 4 1 0 0
225 0x9600 0 0 3 &mpic 1 1 225 0x9600 0 0 3 &mpic 1 1 0 0
226 0x9600 0 0 4 &mpic 2 1 226 0x9600 0 0 4 &mpic 2 1 0 0
227 227
228 /* IDSEL 0x12 func 7 - PCI slot 2 */ 228 /* IDSEL 0x12 func 7 - PCI slot 2 */
229 0x9700 0 0 1 &mpic 3 1 229 0x9700 0 0 1 &mpic 3 1 0 0
230 0x9700 0 0 2 &mpic 4 1 230 0x9700 0 0 2 &mpic 4 1 0 0
231 0x9700 0 0 3 &mpic 1 1 231 0x9700 0 0 3 &mpic 1 1 0 0
232 0x9700 0 0 4 &mpic 2 1 232 0x9700 0 0 4 &mpic 2 1 0 0
233 233
234 // IDSEL 0x1c USB 234 // IDSEL 0x1c USB
235 0xe000 0 0 1 &i8259 12 2 235 0xe000 0 0 1 &i8259 12 2
diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
index eeb7c65d5f22..50039d4fa278 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
@@ -97,6 +97,7 @@
97&pci0 { 97&pci0 {
98 compatible = "fsl,mpc8641-pcie"; 98 compatible = "fsl,mpc8641-pcie";
99 device_type = "pci"; 99 device_type = "pci";
100 #interrupt-cells = <1>;
100 #size-cells = <2>; 101 #size-cells = <2>;
101 #address-cells = <3>; 102 #address-cells = <3>;
102 bus-range = <0x0 0xff>; 103 bus-range = <0x0 0xff>;
@@ -123,6 +124,7 @@
123&pci1 { 124&pci1 {
124 compatible = "fsl,mpc8641-pcie"; 125 compatible = "fsl,mpc8641-pcie";
125 device_type = "pci"; 126 device_type = "pci";
127 #interrupt-cells = <1>;
126 #size-cells = <2>; 128 #size-cells = <2>;
127 #address-cells = <3>; 129 #address-cells = <3>;
128 bus-range = <0x0 0xff>; 130 bus-range = <0x0 0xff>;
diff --git a/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi b/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
index 25f81eea60e0..a13876c05c1e 100644
--- a/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
@@ -205,13 +205,13 @@
205 mdio@24000 { 205 mdio@24000 {
206 phy0: ethernet-phy@0 { 206 phy0: ethernet-phy@0 {
207 interrupt-parent = <&mpic>; 207 interrupt-parent = <&mpic>;
208 interrupts = <3 1>; 208 interrupts = <3 1 0 0>;
209 reg = <0x0>; 209 reg = <0x0>;
210 }; 210 };
211 211
212 phy1: ethernet-phy@1 { 212 phy1: ethernet-phy@1 {
213 interrupt-parent = <&mpic>; 213 interrupt-parent = <&mpic>;
214 interrupts = <2 1>; 214 interrupts = <2 1 0 0>;
215 reg = <0x1>; 215 reg = <0x1>;
216 }; 216 };
217 217
diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
index 51e975d7631a..872e4485dc3f 100644
--- a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
@@ -327,24 +327,6 @@
327/include/ "qoriq-clockgen1.dtsi" 327/include/ "qoriq-clockgen1.dtsi"
328 global-utilities@e1000 { 328 global-utilities@e1000 {
329 compatible = "fsl,p2041-clockgen", "fsl,qoriq-clockgen-1.0"; 329 compatible = "fsl,p2041-clockgen", "fsl,qoriq-clockgen-1.0";
330
331 mux2: mux2@40 {
332 #clock-cells = <0>;
333 reg = <0x40 0x4>;
334 compatible = "fsl,qoriq-core-mux-1.0";
335 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
336 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
337 clock-output-names = "cmux2";
338 };
339
340 mux3: mux3@60 {
341 #clock-cells = <0>;
342 reg = <0x60 0x4>;
343 compatible = "fsl,qoriq-core-mux-1.0";
344 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
345 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
346 clock-output-names = "cmux3";
347 };
348 }; 330 };
349 331
350 rcpm: global-utilities@e2000 { 332 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
index 941274c41f21..6318962e8d14 100644
--- a/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
@@ -89,7 +89,7 @@
89 cpu0: PowerPC,e500mc@0 { 89 cpu0: PowerPC,e500mc@0 {
90 device_type = "cpu"; 90 device_type = "cpu";
91 reg = <0>; 91 reg = <0>;
92 clocks = <&mux0>; 92 clocks = <&clockgen 1 0>;
93 next-level-cache = <&L2_0>; 93 next-level-cache = <&L2_0>;
94 fsl,portid-mapping = <0x80000000>; 94 fsl,portid-mapping = <0x80000000>;
95 L2_0: l2-cache { 95 L2_0: l2-cache {
@@ -99,7 +99,7 @@
99 cpu1: PowerPC,e500mc@1 { 99 cpu1: PowerPC,e500mc@1 {
100 device_type = "cpu"; 100 device_type = "cpu";
101 reg = <1>; 101 reg = <1>;
102 clocks = <&mux1>; 102 clocks = <&clockgen 1 1>;
103 next-level-cache = <&L2_1>; 103 next-level-cache = <&L2_1>;
104 fsl,portid-mapping = <0x40000000>; 104 fsl,portid-mapping = <0x40000000>;
105 L2_1: l2-cache { 105 L2_1: l2-cache {
@@ -109,7 +109,7 @@
109 cpu2: PowerPC,e500mc@2 { 109 cpu2: PowerPC,e500mc@2 {
110 device_type = "cpu"; 110 device_type = "cpu";
111 reg = <2>; 111 reg = <2>;
112 clocks = <&mux2>; 112 clocks = <&clockgen 1 2>;
113 next-level-cache = <&L2_2>; 113 next-level-cache = <&L2_2>;
114 fsl,portid-mapping = <0x20000000>; 114 fsl,portid-mapping = <0x20000000>;
115 L2_2: l2-cache { 115 L2_2: l2-cache {
@@ -119,7 +119,7 @@
119 cpu3: PowerPC,e500mc@3 { 119 cpu3: PowerPC,e500mc@3 {
120 device_type = "cpu"; 120 device_type = "cpu";
121 reg = <3>; 121 reg = <3>;
122 clocks = <&mux3>; 122 clocks = <&clockgen 1 3>;
123 next-level-cache = <&L2_3>; 123 next-level-cache = <&L2_3>;
124 fsl,portid-mapping = <0x10000000>; 124 fsl,portid-mapping = <0x10000000>;
125 L2_3: l2-cache { 125 L2_3: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
index 187676fa8d83..81bc75aca2e0 100644
--- a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
@@ -354,24 +354,6 @@
354/include/ "qoriq-clockgen1.dtsi" 354/include/ "qoriq-clockgen1.dtsi"
355 global-utilities@e1000 { 355 global-utilities@e1000 {
356 compatible = "fsl,p3041-clockgen", "fsl,qoriq-clockgen-1.0"; 356 compatible = "fsl,p3041-clockgen", "fsl,qoriq-clockgen-1.0";
357
358 mux2: mux2@40 {
359 #clock-cells = <0>;
360 reg = <0x40 0x4>;
361 compatible = "fsl,qoriq-core-mux-1.0";
362 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
363 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
364 clock-output-names = "cmux2";
365 };
366
367 mux3: mux3@60 {
368 #clock-cells = <0>;
369 reg = <0x60 0x4>;
370 compatible = "fsl,qoriq-core-mux-1.0";
371 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
372 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
373 clock-output-names = "cmux3";
374 };
375 }; 357 };
376 358
377 rcpm: global-utilities@e2000 { 359 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
index 50b73e8e638f..db92f1151a48 100644
--- a/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
@@ -90,7 +90,7 @@
90 cpu0: PowerPC,e500mc@0 { 90 cpu0: PowerPC,e500mc@0 {
91 device_type = "cpu"; 91 device_type = "cpu";
92 reg = <0>; 92 reg = <0>;
93 clocks = <&mux0>; 93 clocks = <&clockgen 1 0>;
94 next-level-cache = <&L2_0>; 94 next-level-cache = <&L2_0>;
95 fsl,portid-mapping = <0x80000000>; 95 fsl,portid-mapping = <0x80000000>;
96 L2_0: l2-cache { 96 L2_0: l2-cache {
@@ -100,7 +100,7 @@
100 cpu1: PowerPC,e500mc@1 { 100 cpu1: PowerPC,e500mc@1 {
101 device_type = "cpu"; 101 device_type = "cpu";
102 reg = <1>; 102 reg = <1>;
103 clocks = <&mux1>; 103 clocks = <&clockgen 1 1>;
104 next-level-cache = <&L2_1>; 104 next-level-cache = <&L2_1>;
105 fsl,portid-mapping = <0x40000000>; 105 fsl,portid-mapping = <0x40000000>;
106 L2_1: l2-cache { 106 L2_1: l2-cache {
@@ -110,7 +110,7 @@
110 cpu2: PowerPC,e500mc@2 { 110 cpu2: PowerPC,e500mc@2 {
111 device_type = "cpu"; 111 device_type = "cpu";
112 reg = <2>; 112 reg = <2>;
113 clocks = <&mux2>; 113 clocks = <&clockgen 1 2>;
114 next-level-cache = <&L2_2>; 114 next-level-cache = <&L2_2>;
115 fsl,portid-mapping = <0x20000000>; 115 fsl,portid-mapping = <0x20000000>;
116 L2_2: l2-cache { 116 L2_2: l2-cache {
@@ -120,7 +120,7 @@
120 cpu3: PowerPC,e500mc@3 { 120 cpu3: PowerPC,e500mc@3 {
121 device_type = "cpu"; 121 device_type = "cpu";
122 reg = <3>; 122 reg = <3>;
123 clocks = <&mux3>; 123 clocks = <&clockgen 1 3>;
124 next-level-cache = <&L2_3>; 124 next-level-cache = <&L2_3>;
125 fsl,portid-mapping = <0x10000000>; 125 fsl,portid-mapping = <0x10000000>;
126 L2_3: l2-cache { 126 L2_3: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
index a0252085f858..4da49b6dd3f5 100644
--- a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
@@ -374,76 +374,6 @@
374/include/ "qoriq-clockgen1.dtsi" 374/include/ "qoriq-clockgen1.dtsi"
375 global-utilities@e1000 { 375 global-utilities@e1000 {
376 compatible = "fsl,p4080-clockgen", "fsl,qoriq-clockgen-1.0"; 376 compatible = "fsl,p4080-clockgen", "fsl,qoriq-clockgen-1.0";
377
378 pll2: pll2@840 {
379 #clock-cells = <1>;
380 reg = <0x840 0x4>;
381 compatible = "fsl,qoriq-core-pll-1.0";
382 clocks = <&sysclk>;
383 clock-output-names = "pll2", "pll2-div2";
384 };
385
386 pll3: pll3@860 {
387 #clock-cells = <1>;
388 reg = <0x860 0x4>;
389 compatible = "fsl,qoriq-core-pll-1.0";
390 clocks = <&sysclk>;
391 clock-output-names = "pll3", "pll3-div2";
392 };
393
394 mux2: mux2@40 {
395 #clock-cells = <0>;
396 reg = <0x40 0x4>;
397 compatible = "fsl,qoriq-core-mux-1.0";
398 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
399 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
400 clock-output-names = "cmux2";
401 };
402
403 mux3: mux3@60 {
404 #clock-cells = <0>;
405 reg = <0x60 0x4>;
406 compatible = "fsl,qoriq-core-mux-1.0";
407 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
408 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
409 clock-output-names = "cmux3";
410 };
411
412 mux4: mux4@80 {
413 #clock-cells = <0>;
414 reg = <0x80 0x4>;
415 compatible = "fsl,qoriq-core-mux-1.0";
416 clocks = <&pll2 0>, <&pll2 1>, <&pll3 0>, <&pll3 1>;
417 clock-names = "pll2", "pll2-div2", "pll3", "pll3-div2";
418 clock-output-names = "cmux4";
419 };
420
421 mux5: mux5@a0 {
422 #clock-cells = <0>;
423 reg = <0xa0 0x4>;
424 compatible = "fsl,qoriq-core-mux-1.0";
425 clocks = <&pll2 0>, <&pll2 1>, <&pll3 0>, <&pll3 1>;
426 clock-names = "pll2", "pll2-div2", "pll3", "pll3-div2";
427 clock-output-names = "cmux5";
428 };
429
430 mux6: mux6@c0 {
431 #clock-cells = <0>;
432 reg = <0xc0 0x4>;
433 compatible = "fsl,qoriq-core-mux-1.0";
434 clocks = <&pll2 0>, <&pll2 1>, <&pll3 0>, <&pll3 1>;
435 clock-names = "pll2", "pll2-div2", "pll3", "pll3-div2";
436 clock-output-names = "cmux6";
437 };
438
439 mux7: mux7@e0 {
440 #clock-cells = <0>;
441 reg = <0xe0 0x4>;
442 compatible = "fsl,qoriq-core-mux-1.0";
443 clocks = <&pll2 0>, <&pll2 1>, <&pll3 0>, <&pll3 1>;
444 clock-names = "pll2", "pll2-div2", "pll3", "pll3-div2";
445 clock-output-names = "cmux7";
446 };
447 }; 377 };
448 378
449 rcpm: global-utilities@e2000 { 379 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
index d56a546b73e6..0a7c65a00e5e 100644
--- a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
@@ -94,7 +94,7 @@
94 cpu0: PowerPC,e500mc@0 { 94 cpu0: PowerPC,e500mc@0 {
95 device_type = "cpu"; 95 device_type = "cpu";
96 reg = <0>; 96 reg = <0>;
97 clocks = <&mux0>; 97 clocks = <&clockgen 1 0>;
98 next-level-cache = <&L2_0>; 98 next-level-cache = <&L2_0>;
99 fsl,portid-mapping = <0x80000000>; 99 fsl,portid-mapping = <0x80000000>;
100 L2_0: l2-cache { 100 L2_0: l2-cache {
@@ -104,7 +104,7 @@
104 cpu1: PowerPC,e500mc@1 { 104 cpu1: PowerPC,e500mc@1 {
105 device_type = "cpu"; 105 device_type = "cpu";
106 reg = <1>; 106 reg = <1>;
107 clocks = <&mux1>; 107 clocks = <&clockgen 1 1>;
108 next-level-cache = <&L2_1>; 108 next-level-cache = <&L2_1>;
109 fsl,portid-mapping = <0x40000000>; 109 fsl,portid-mapping = <0x40000000>;
110 L2_1: l2-cache { 110 L2_1: l2-cache {
@@ -114,7 +114,7 @@
114 cpu2: PowerPC,e500mc@2 { 114 cpu2: PowerPC,e500mc@2 {
115 device_type = "cpu"; 115 device_type = "cpu";
116 reg = <2>; 116 reg = <2>;
117 clocks = <&mux2>; 117 clocks = <&clockgen 1 2>;
118 next-level-cache = <&L2_2>; 118 next-level-cache = <&L2_2>;
119 fsl,portid-mapping = <0x20000000>; 119 fsl,portid-mapping = <0x20000000>;
120 L2_2: l2-cache { 120 L2_2: l2-cache {
@@ -124,7 +124,7 @@
124 cpu3: PowerPC,e500mc@3 { 124 cpu3: PowerPC,e500mc@3 {
125 device_type = "cpu"; 125 device_type = "cpu";
126 reg = <3>; 126 reg = <3>;
127 clocks = <&mux3>; 127 clocks = <&clockgen 1 3>;
128 next-level-cache = <&L2_3>; 128 next-level-cache = <&L2_3>;
129 fsl,portid-mapping = <0x10000000>; 129 fsl,portid-mapping = <0x10000000>;
130 L2_3: l2-cache { 130 L2_3: l2-cache {
@@ -134,7 +134,7 @@
134 cpu4: PowerPC,e500mc@4 { 134 cpu4: PowerPC,e500mc@4 {
135 device_type = "cpu"; 135 device_type = "cpu";
136 reg = <4>; 136 reg = <4>;
137 clocks = <&mux4>; 137 clocks = <&clockgen 1 4>;
138 next-level-cache = <&L2_4>; 138 next-level-cache = <&L2_4>;
139 fsl,portid-mapping = <0x08000000>; 139 fsl,portid-mapping = <0x08000000>;
140 L2_4: l2-cache { 140 L2_4: l2-cache {
@@ -144,7 +144,7 @@
144 cpu5: PowerPC,e500mc@5 { 144 cpu5: PowerPC,e500mc@5 {
145 device_type = "cpu"; 145 device_type = "cpu";
146 reg = <5>; 146 reg = <5>;
147 clocks = <&mux5>; 147 clocks = <&clockgen 1 5>;
148 next-level-cache = <&L2_5>; 148 next-level-cache = <&L2_5>;
149 fsl,portid-mapping = <0x04000000>; 149 fsl,portid-mapping = <0x04000000>;
150 L2_5: l2-cache { 150 L2_5: l2-cache {
@@ -154,7 +154,7 @@
154 cpu6: PowerPC,e500mc@6 { 154 cpu6: PowerPC,e500mc@6 {
155 device_type = "cpu"; 155 device_type = "cpu";
156 reg = <6>; 156 reg = <6>;
157 clocks = <&mux6>; 157 clocks = <&clockgen 1 6>;
158 next-level-cache = <&L2_6>; 158 next-level-cache = <&L2_6>;
159 fsl,portid-mapping = <0x02000000>; 159 fsl,portid-mapping = <0x02000000>;
160 L2_6: l2-cache { 160 L2_6: l2-cache {
@@ -164,7 +164,7 @@
164 cpu7: PowerPC,e500mc@7 { 164 cpu7: PowerPC,e500mc@7 {
165 device_type = "cpu"; 165 device_type = "cpu";
166 reg = <7>; 166 reg = <7>;
167 clocks = <&mux7>; 167 clocks = <&clockgen 1 7>;
168 next-level-cache = <&L2_7>; 168 next-level-cache = <&L2_7>;
169 fsl,portid-mapping = <0x01000000>; 169 fsl,portid-mapping = <0x01000000>;
170 L2_7: l2-cache { 170 L2_7: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
index bfba0b4f1cbb..2d74ea85e5df 100644
--- a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
@@ -96,7 +96,7 @@
96 cpu0: PowerPC,e5500@0 { 96 cpu0: PowerPC,e5500@0 {
97 device_type = "cpu"; 97 device_type = "cpu";
98 reg = <0>; 98 reg = <0>;
99 clocks = <&mux0>; 99 clocks = <&clockgen 1 0>;
100 next-level-cache = <&L2_0>; 100 next-level-cache = <&L2_0>;
101 fsl,portid-mapping = <0x80000000>; 101 fsl,portid-mapping = <0x80000000>;
102 L2_0: l2-cache { 102 L2_0: l2-cache {
@@ -106,7 +106,7 @@
106 cpu1: PowerPC,e5500@1 { 106 cpu1: PowerPC,e5500@1 {
107 device_type = "cpu"; 107 device_type = "cpu";
108 reg = <1>; 108 reg = <1>;
109 clocks = <&mux1>; 109 clocks = <&clockgen 1 1>;
110 next-level-cache = <&L2_1>; 110 next-level-cache = <&L2_1>;
111 fsl,portid-mapping = <0x40000000>; 111 fsl,portid-mapping = <0x40000000>;
112 L2_1: l2-cache { 112 L2_1: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
index e2bd9313e632..16b454b504e2 100644
--- a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
@@ -319,24 +319,6 @@
319/include/ "qoriq-clockgen1.dtsi" 319/include/ "qoriq-clockgen1.dtsi"
320 global-utilities@e1000 { 320 global-utilities@e1000 {
321 compatible = "fsl,p5040-clockgen", "fsl,qoriq-clockgen-1.0"; 321 compatible = "fsl,p5040-clockgen", "fsl,qoriq-clockgen-1.0";
322
323 mux2: mux2@40 {
324 #clock-cells = <0>;
325 reg = <0x40 0x4>;
326 compatible = "fsl,qoriq-core-mux-1.0";
327 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
328 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
329 clock-output-names = "cmux2";
330 };
331
332 mux3: mux3@60 {
333 #clock-cells = <0>;
334 reg = <0x60 0x4>;
335 compatible = "fsl,qoriq-core-mux-1.0";
336 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
337 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
338 clock-output-names = "cmux3";
339 };
340 }; 322 };
341 323
342 rcpm: global-utilities@e2000 { 324 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
index dbd57750fc02..ed89dbbdacf0 100644
--- a/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
@@ -102,7 +102,7 @@
102 cpu0: PowerPC,e5500@0 { 102 cpu0: PowerPC,e5500@0 {
103 device_type = "cpu"; 103 device_type = "cpu";
104 reg = <0>; 104 reg = <0>;
105 clocks = <&mux0>; 105 clocks = <&clockgen 1 0>;
106 next-level-cache = <&L2_0>; 106 next-level-cache = <&L2_0>;
107 fsl,portid-mapping = <0x80000000>; 107 fsl,portid-mapping = <0x80000000>;
108 L2_0: l2-cache { 108 L2_0: l2-cache {
@@ -112,7 +112,7 @@
112 cpu1: PowerPC,e5500@1 { 112 cpu1: PowerPC,e5500@1 {
113 device_type = "cpu"; 113 device_type = "cpu";
114 reg = <1>; 114 reg = <1>;
115 clocks = <&mux1>; 115 clocks = <&clockgen 1 1>;
116 next-level-cache = <&L2_1>; 116 next-level-cache = <&L2_1>;
117 fsl,portid-mapping = <0x40000000>; 117 fsl,portid-mapping = <0x40000000>;
118 L2_1: l2-cache { 118 L2_1: l2-cache {
@@ -122,7 +122,7 @@
122 cpu2: PowerPC,e5500@2 { 122 cpu2: PowerPC,e5500@2 {
123 device_type = "cpu"; 123 device_type = "cpu";
124 reg = <2>; 124 reg = <2>;
125 clocks = <&mux2>; 125 clocks = <&clockgen 1 2>;
126 next-level-cache = <&L2_2>; 126 next-level-cache = <&L2_2>;
127 fsl,portid-mapping = <0x20000000>; 127 fsl,portid-mapping = <0x20000000>;
128 L2_2: l2-cache { 128 L2_2: l2-cache {
@@ -132,7 +132,7 @@
132 cpu3: PowerPC,e5500@3 { 132 cpu3: PowerPC,e5500@3 {
133 device_type = "cpu"; 133 device_type = "cpu";
134 reg = <3>; 134 reg = <3>;
135 clocks = <&mux3>; 135 clocks = <&clockgen 1 3>;
136 next-level-cache = <&L2_3>; 136 next-level-cache = <&L2_3>;
137 fsl,portid-mapping = <0x10000000>; 137 fsl,portid-mapping = <0x10000000>;
138 L2_3: l2-cache { 138 L2_3: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
index 88cd70de4f86..463c1ed9ffdd 100644
--- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
@@ -34,53 +34,6 @@
34 34
35clockgen: global-utilities@e1000 { 35clockgen: global-utilities@e1000 {
36 compatible = "fsl,qoriq-clockgen-1.0"; 36 compatible = "fsl,qoriq-clockgen-1.0";
37 ranges = <0x0 0xe1000 0x1000>;
38 reg = <0xe1000 0x1000>; 37 reg = <0xe1000 0x1000>;
39 clock-frequency = <0>;
40 #address-cells = <1>;
41 #size-cells = <1>;
42 #clock-cells = <2>; 38 #clock-cells = <2>;
43
44 sysclk: sysclk {
45 #clock-cells = <0>;
46 compatible = "fsl,qoriq-sysclk-1.0", "fixed-clock";
47 clock-output-names = "sysclk";
48 };
49 pll0: pll0@800 {
50 #clock-cells = <1>;
51 reg = <0x800 0x4>;
52 compatible = "fsl,qoriq-core-pll-1.0";
53 clocks = <&sysclk>;
54 clock-output-names = "pll0", "pll0-div2";
55 };
56 pll1: pll1@820 {
57 #clock-cells = <1>;
58 reg = <0x820 0x4>;
59 compatible = "fsl,qoriq-core-pll-1.0";
60 clocks = <&sysclk>;
61 clock-output-names = "pll1", "pll1-div2";
62 };
63 mux0: mux0@0 {
64 #clock-cells = <0>;
65 reg = <0x0 0x4>;
66 compatible = "fsl,qoriq-core-mux-1.0";
67 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
68 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
69 clock-output-names = "cmux0";
70 };
71 mux1: mux1@20 {
72 #clock-cells = <0>;
73 reg = <0x20 0x4>;
74 compatible = "fsl,qoriq-core-mux-1.0";
75 clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
76 clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
77 clock-output-names = "cmux1";
78 };
79 platform_pll: platform-pll@c00 {
80 #clock-cells = <1>;
81 reg = <0xc00 0x4>;
82 compatible = "fsl,qoriq-platform-pll-1.0";
83 clocks = <&sysclk>;
84 clock-output-names = "platform-pll", "platform-pll-div2";
85 };
86}; 39};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
index 6dfd7c5357ab..0361050bb56a 100644
--- a/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
@@ -34,36 +34,6 @@
34 34
35clockgen: global-utilities@e1000 { 35clockgen: global-utilities@e1000 {
36 compatible = "fsl,qoriq-clockgen-2.0"; 36 compatible = "fsl,qoriq-clockgen-2.0";
37 ranges = <0x0 0xe1000 0x1000>;
38 reg = <0xe1000 0x1000>; 37 reg = <0xe1000 0x1000>;
39 #address-cells = <1>;
40 #size-cells = <1>;
41 #clock-cells = <2>; 38 #clock-cells = <2>;
42
43 sysclk: sysclk {
44 #clock-cells = <0>;
45 compatible = "fsl,qoriq-sysclk-2.0", "fixed-clock";
46 clock-output-names = "sysclk";
47 };
48 pll0: pll0@800 {
49 #clock-cells = <1>;
50 reg = <0x800 0x4>;
51 compatible = "fsl,qoriq-core-pll-2.0";
52 clocks = <&sysclk>;
53 clock-output-names = "pll0", "pll0-div2", "pll0-div4";
54 };
55 pll1: pll1@820 {
56 #clock-cells = <1>;
57 reg = <0x820 0x4>;
58 compatible = "fsl,qoriq-core-pll-2.0";
59 clocks = <&sysclk>;
60 clock-output-names = "pll1", "pll1-div2", "pll1-div4";
61 };
62 platform_pll: platform-pll@c00 {
63 #clock-cells = <1>;
64 reg = <0xc00 0x4>;
65 compatible = "fsl,qoriq-platform-pll-2.0";
66 clocks = <&sysclk>;
67 clock-output-names = "platform-pll", "platform-pll-div2";
68 };
69}; 39};
diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
index 4908af501098..d552044c5afc 100644
--- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
@@ -345,22 +345,6 @@
345/include/ "qoriq-clockgen2.dtsi" 345/include/ "qoriq-clockgen2.dtsi"
346 global-utilities@e1000 { 346 global-utilities@e1000 {
347 compatible = "fsl,t1023-clockgen", "fsl,qoriq-clockgen-2.0"; 347 compatible = "fsl,t1023-clockgen", "fsl,qoriq-clockgen-2.0";
348 mux0: mux0@0 {
349 #clock-cells = <0>;
350 reg = <0x0 4>;
351 compatible = "fsl,core-mux-clock";
352 clocks = <&pll0 0>, <&pll0 1>;
353 clock-names = "pll0_0", "pll0_1";
354 clock-output-names = "cmux0";
355 };
356 mux1: mux1@20 {
357 #clock-cells = <0>;
358 reg = <0x20 4>;
359 compatible = "fsl,core-mux-clock";
360 clocks = <&pll0 0>, <&pll0 1>;
361 clock-names = "pll0_0", "pll0_1";
362 clock-output-names = "cmux1";
363 };
364 }; 348 };
365 349
366 rcpm: global-utilities@e2000 { 350 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
index 9d08a363bab3..d87ea13164f2 100644
--- a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
@@ -74,7 +74,7 @@
74 cpu0: PowerPC,e5500@0 { 74 cpu0: PowerPC,e5500@0 {
75 device_type = "cpu"; 75 device_type = "cpu";
76 reg = <0>; 76 reg = <0>;
77 clocks = <&mux0>; 77 clocks = <&clockgen 1 0>;
78 next-level-cache = <&L2_1>; 78 next-level-cache = <&L2_1>;
79 #cooling-cells = <2>; 79 #cooling-cells = <2>;
80 L2_1: l2-cache { 80 L2_1: l2-cache {
@@ -84,7 +84,7 @@
84 cpu1: PowerPC,e5500@1 { 84 cpu1: PowerPC,e5500@1 {
85 device_type = "cpu"; 85 device_type = "cpu";
86 reg = <1>; 86 reg = <1>;
87 clocks = <&mux1>; 87 clocks = <&clockgen 1 1>;
88 next-level-cache = <&L2_2>; 88 next-level-cache = <&L2_2>;
89 #cooling-cells = <2>; 89 #cooling-cells = <2>;
90 L2_2: l2-cache { 90 L2_2: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
index 145c7f43b5b6..315d0557eefc 100644
--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -425,50 +425,6 @@
425/include/ "qoriq-clockgen2.dtsi" 425/include/ "qoriq-clockgen2.dtsi"
426 global-utilities@e1000 { 426 global-utilities@e1000 {
427 compatible = "fsl,t1040-clockgen", "fsl,qoriq-clockgen-2.0"; 427 compatible = "fsl,t1040-clockgen", "fsl,qoriq-clockgen-2.0";
428
429 mux0: mux0@0 {
430 #clock-cells = <0>;
431 reg = <0x0 4>;
432 compatible = "fsl,qoriq-core-mux-2.0";
433 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
434 <&pll1 0>, <&pll1 1>, <&pll1 2>;
435 clock-names = "pll0", "pll0-div2", "pll1-div4",
436 "pll1", "pll1-div2", "pll1-div4";
437 clock-output-names = "cmux0";
438 };
439
440 mux1: mux1@20 {
441 #clock-cells = <0>;
442 reg = <0x20 4>;
443 compatible = "fsl,qoriq-core-mux-2.0";
444 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
445 <&pll1 0>, <&pll1 1>, <&pll1 2>;
446 clock-names = "pll0", "pll0-div2", "pll1-div4",
447 "pll1", "pll1-div2", "pll1-div4";
448 clock-output-names = "cmux1";
449 };
450
451 mux2: mux2@40 {
452 #clock-cells = <0>;
453 reg = <0x40 4>;
454 compatible = "fsl,qoriq-core-mux-2.0";
455 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
456 <&pll1 0>, <&pll1 1>, <&pll1 2>;
457 clock-names = "pll0", "pll0-div2", "pll1-div4",
458 "pll1", "pll1-div2", "pll1-div4";
459 clock-output-names = "cmux2";
460 };
461
462 mux3: mux3@60 {
463 #clock-cells = <0>;
464 reg = <0x60 4>;
465 compatible = "fsl,qoriq-core-mux-2.0";
466 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
467 <&pll1 0>, <&pll1 1>, <&pll1 2>;
468 clock-names = "pll0_0", "pll0_1", "pll0_2",
469 "pll1_0", "pll1_1", "pll1_2";
470 clock-output-names = "cmux3";
471 };
472 }; 428 };
473 429
474 rcpm: global-utilities@e2000 { 430 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
index 6db0ee8b1384..dd59e4b69480 100644
--- a/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
@@ -74,7 +74,7 @@
74 cpu0: PowerPC,e5500@0 { 74 cpu0: PowerPC,e5500@0 {
75 device_type = "cpu"; 75 device_type = "cpu";
76 reg = <0>; 76 reg = <0>;
77 clocks = <&mux0>; 77 clocks = <&clockgen 1 0>;
78 next-level-cache = <&L2_1>; 78 next-level-cache = <&L2_1>;
79 #cooling-cells = <2>; 79 #cooling-cells = <2>;
80 L2_1: l2-cache { 80 L2_1: l2-cache {
@@ -84,7 +84,7 @@
84 cpu1: PowerPC,e5500@1 { 84 cpu1: PowerPC,e5500@1 {
85 device_type = "cpu"; 85 device_type = "cpu";
86 reg = <1>; 86 reg = <1>;
87 clocks = <&mux1>; 87 clocks = <&clockgen 1 1>;
88 next-level-cache = <&L2_2>; 88 next-level-cache = <&L2_2>;
89 #cooling-cells = <2>; 89 #cooling-cells = <2>;
90 L2_2: l2-cache { 90 L2_2: l2-cache {
@@ -94,7 +94,7 @@
94 cpu2: PowerPC,e5500@2 { 94 cpu2: PowerPC,e5500@2 {
95 device_type = "cpu"; 95 device_type = "cpu";
96 reg = <2>; 96 reg = <2>;
97 clocks = <&mux2>; 97 clocks = <&clockgen 1 2>;
98 next-level-cache = <&L2_3>; 98 next-level-cache = <&L2_3>;
99 #cooling-cells = <2>; 99 #cooling-cells = <2>;
100 L2_3: l2-cache { 100 L2_3: l2-cache {
@@ -104,7 +104,7 @@
104 cpu3: PowerPC,e5500@3 { 104 cpu3: PowerPC,e5500@3 {
105 device_type = "cpu"; 105 device_type = "cpu";
106 reg = <3>; 106 reg = <3>;
107 clocks = <&mux3>; 107 clocks = <&clockgen 1 3>;
108 next-level-cache = <&L2_4>; 108 next-level-cache = <&L2_4>;
109 #cooling-cells = <2>; 109 #cooling-cells = <2>;
110 L2_4: l2-cache { 110 L2_4: l2-cache {
diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
index a97296c64eb2..ecbb447920bc 100644
--- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
@@ -535,28 +535,6 @@
535/include/ "qoriq-clockgen2.dtsi" 535/include/ "qoriq-clockgen2.dtsi"
536 global-utilities@e1000 { 536 global-utilities@e1000 {
537 compatible = "fsl,t2080-clockgen", "fsl,qoriq-clockgen-2.0"; 537 compatible = "fsl,t2080-clockgen", "fsl,qoriq-clockgen-2.0";
538
539 mux0: mux0@0 {
540 #clock-cells = <0>;
541 reg = <0x0 4>;
542 compatible = "fsl,qoriq-core-mux-2.0";
543 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
544 <&pll1 0>, <&pll1 1>, <&pll1 2>;
545 clock-names = "pll0", "pll0-div2", "pll0-div4",
546 "pll1", "pll1-div2", "pll1-div4";
547 clock-output-names = "cmux0";
548 };
549
550 mux1: mux1@20 {
551 #clock-cells = <0>;
552 reg = <0x20 4>;
553 compatible = "fsl,qoriq-core-mux-2.0";
554 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
555 <&pll1 0>, <&pll1 1>, <&pll1 2>;
556 clock-names = "pll0", "pll0-div2", "pll0-div4",
557 "pll1", "pll1-div2", "pll1-div4";
558 clock-output-names = "cmux1";
559 };
560 }; 538 };
561 539
562 rcpm: global-utilities@e2000 { 540 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
index c2e57203910d..3f745de44284 100644
--- a/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
@@ -81,28 +81,28 @@
81 cpu0: PowerPC,e6500@0 { 81 cpu0: PowerPC,e6500@0 {
82 device_type = "cpu"; 82 device_type = "cpu";
83 reg = <0 1>; 83 reg = <0 1>;
84 clocks = <&mux0>; 84 clocks = <&clockgen 1 0>;
85 next-level-cache = <&L2_1>; 85 next-level-cache = <&L2_1>;
86 fsl,portid-mapping = <0x80000000>; 86 fsl,portid-mapping = <0x80000000>;
87 }; 87 };
88 cpu1: PowerPC,e6500@2 { 88 cpu1: PowerPC,e6500@2 {
89 device_type = "cpu"; 89 device_type = "cpu";
90 reg = <2 3>; 90 reg = <2 3>;
91 clocks = <&mux0>; 91 clocks = <&clockgen 1 0>;
92 next-level-cache = <&L2_1>; 92 next-level-cache = <&L2_1>;
93 fsl,portid-mapping = <0x80000000>; 93 fsl,portid-mapping = <0x80000000>;
94 }; 94 };
95 cpu2: PowerPC,e6500@4 { 95 cpu2: PowerPC,e6500@4 {
96 device_type = "cpu"; 96 device_type = "cpu";
97 reg = <4 5>; 97 reg = <4 5>;
98 clocks = <&mux0>; 98 clocks = <&clockgen 1 0>;
99 next-level-cache = <&L2_1>; 99 next-level-cache = <&L2_1>;
100 fsl,portid-mapping = <0x80000000>; 100 fsl,portid-mapping = <0x80000000>;
101 }; 101 };
102 cpu3: PowerPC,e6500@6 { 102 cpu3: PowerPC,e6500@6 {
103 device_type = "cpu"; 103 device_type = "cpu";
104 reg = <6 7>; 104 reg = <6 7>;
105 clocks = <&mux0>; 105 clocks = <&clockgen 1 0>;
106 next-level-cache = <&L2_1>; 106 next-level-cache = <&L2_1>;
107 fsl,portid-mapping = <0x80000000>; 107 fsl,portid-mapping = <0x80000000>;
108 }; 108 };
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
index 68c4eadc19e3..fcac73486d48 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
@@ -950,67 +950,6 @@
950/include/ "qoriq-clockgen2.dtsi" 950/include/ "qoriq-clockgen2.dtsi"
951 global-utilities@e1000 { 951 global-utilities@e1000 {
952 compatible = "fsl,t4240-clockgen", "fsl,qoriq-clockgen-2.0"; 952 compatible = "fsl,t4240-clockgen", "fsl,qoriq-clockgen-2.0";
953
954 pll2: pll2@840 {
955 #clock-cells = <1>;
956 reg = <0x840 0x4>;
957 compatible = "fsl,qoriq-core-pll-2.0";
958 clocks = <&sysclk>;
959 clock-output-names = "pll2", "pll2-div2", "pll2-div4";
960 };
961
962 pll3: pll3@860 {
963 #clock-cells = <1>;
964 reg = <0x860 0x4>;
965 compatible = "fsl,qoriq-core-pll-2.0";
966 clocks = <&sysclk>;
967 clock-output-names = "pll3", "pll3-div2", "pll3-div4";
968 };
969
970 pll4: pll4@880 {
971 #clock-cells = <1>;
972 reg = <0x880 0x4>;
973 compatible = "fsl,qoriq-core-pll-2.0";
974 clocks = <&sysclk>;
975 clock-output-names = "pll4", "pll4-div2", "pll4-div4";
976 };
977
978 mux0: mux0@0 {
979 #clock-cells = <0>;
980 reg = <0x0 0x4>;
981 compatible = "fsl,qoriq-core-mux-2.0";
982 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
983 <&pll1 0>, <&pll1 1>, <&pll1 2>,
984 <&pll2 0>, <&pll2 1>, <&pll2 2>;
985 clock-names = "pll0", "pll0-div2", "pll0-div4",
986 "pll1", "pll1-div2", "pll1-div4",
987 "pll2", "pll2-div2", "pll2-div4";
988 clock-output-names = "cmux0";
989 };
990
991 mux1: mux1@20 {
992 #clock-cells = <0>;
993 reg = <0x20 0x4>;
994 compatible = "fsl,qoriq-core-mux-2.0";
995 clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
996 <&pll1 0>, <&pll1 1>, <&pll1 2>,
997 <&pll2 0>, <&pll2 1>, <&pll2 2>;
998 clock-names = "pll0", "pll0-div2", "pll0-div4",
999 "pll1", "pll1-div2", "pll1-div4",
1000 "pll2", "pll2-div2", "pll2-div4";
1001 clock-output-names = "cmux1";
1002 };
1003
1004 mux2: mux2@40 {
1005 #clock-cells = <0>;
1006 reg = <0x40 0x4>;
1007 compatible = "fsl,qoriq-core-mux-2.0";
1008 clocks = <&pll3 0>, <&pll3 1>, <&pll3 2>,
1009 <&pll4 0>, <&pll4 1>, <&pll4 2>;
1010 clock-names = "pll3", "pll3-div2", "pll3-div4",
1011 "pll4", "pll4-div2", "pll4-div4";
1012 clock-output-names = "cmux2";
1013 };
1014 }; 953 };
1015 954
1016 rcpm: global-utilities@e2000 { 955 rcpm: global-utilities@e2000 {
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
index 038cf8fadee4..632314c6faa9 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
@@ -90,84 +90,84 @@
90 cpu0: PowerPC,e6500@0 { 90 cpu0: PowerPC,e6500@0 {
91 device_type = "cpu"; 91 device_type = "cpu";
92 reg = <0 1>; 92 reg = <0 1>;
93 clocks = <&mux0>; 93 clocks = <&clockgen 1 0>;
94 next-level-cache = <&L2_1>; 94 next-level-cache = <&L2_1>;
95 fsl,portid-mapping = <0x80000000>; 95 fsl,portid-mapping = <0x80000000>;
96 }; 96 };
97 cpu1: PowerPC,e6500@2 { 97 cpu1: PowerPC,e6500@2 {
98 device_type = "cpu"; 98 device_type = "cpu";
99 reg = <2 3>; 99 reg = <2 3>;
100 clocks = <&mux0>; 100 clocks = <&clockgen 1 0>;
101 next-level-cache = <&L2_1>; 101 next-level-cache = <&L2_1>;
102 fsl,portid-mapping = <0x80000000>; 102 fsl,portid-mapping = <0x80000000>;
103 }; 103 };
104 cpu2: PowerPC,e6500@4 { 104 cpu2: PowerPC,e6500@4 {
105 device_type = "cpu"; 105 device_type = "cpu";
106 reg = <4 5>; 106 reg = <4 5>;
107 clocks = <&mux0>; 107 clocks = <&clockgen 1 0>;
108 next-level-cache = <&L2_1>; 108 next-level-cache = <&L2_1>;
109 fsl,portid-mapping = <0x80000000>; 109 fsl,portid-mapping = <0x80000000>;
110 }; 110 };
111 cpu3: PowerPC,e6500@6 { 111 cpu3: PowerPC,e6500@6 {
112 device_type = "cpu"; 112 device_type = "cpu";
113 reg = <6 7>; 113 reg = <6 7>;
114 clocks = <&mux0>; 114 clocks = <&clockgen 1 0>;
115 next-level-cache = <&L2_1>; 115 next-level-cache = <&L2_1>;
116 fsl,portid-mapping = <0x80000000>; 116 fsl,portid-mapping = <0x80000000>;
117 }; 117 };
118 cpu4: PowerPC,e6500@8 { 118 cpu4: PowerPC,e6500@8 {
119 device_type = "cpu"; 119 device_type = "cpu";
120 reg = <8 9>; 120 reg = <8 9>;
121 clocks = <&mux1>; 121 clocks = <&clockgen 1 1>;
122 next-level-cache = <&L2_2>; 122 next-level-cache = <&L2_2>;
123 fsl,portid-mapping = <0x40000000>; 123 fsl,portid-mapping = <0x40000000>;
124 }; 124 };
125 cpu5: PowerPC,e6500@10 { 125 cpu5: PowerPC,e6500@10 {
126 device_type = "cpu"; 126 device_type = "cpu";
127 reg = <10 11>; 127 reg = <10 11>;
128 clocks = <&mux1>; 128 clocks = <&clockgen 1 1>;
129 next-level-cache = <&L2_2>; 129 next-level-cache = <&L2_2>;
130 fsl,portid-mapping = <0x40000000>; 130 fsl,portid-mapping = <0x40000000>;
131 }; 131 };
132 cpu6: PowerPC,e6500@12 { 132 cpu6: PowerPC,e6500@12 {
133 device_type = "cpu"; 133 device_type = "cpu";
134 reg = <12 13>; 134 reg = <12 13>;
135 clocks = <&mux1>; 135 clocks = <&clockgen 1 1>;
136 next-level-cache = <&L2_2>; 136 next-level-cache = <&L2_2>;
137 fsl,portid-mapping = <0x40000000>; 137 fsl,portid-mapping = <0x40000000>;
138 }; 138 };
139 cpu7: PowerPC,e6500@14 { 139 cpu7: PowerPC,e6500@14 {
140 device_type = "cpu"; 140 device_type = "cpu";
141 reg = <14 15>; 141 reg = <14 15>;
142 clocks = <&mux1>; 142 clocks = <&clockgen 1 1>;
143 next-level-cache = <&L2_2>; 143 next-level-cache = <&L2_2>;
144 fsl,portid-mapping = <0x40000000>; 144 fsl,portid-mapping = <0x40000000>;
145 }; 145 };
146 cpu8: PowerPC,e6500@16 { 146 cpu8: PowerPC,e6500@16 {
147 device_type = "cpu"; 147 device_type = "cpu";
148 reg = <16 17>; 148 reg = <16 17>;
149 clocks = <&mux2>; 149 clocks = <&clockgen 1 2>;
150 next-level-cache = <&L2_3>; 150 next-level-cache = <&L2_3>;
151 fsl,portid-mapping = <0x20000000>; 151 fsl,portid-mapping = <0x20000000>;
152 }; 152 };
153 cpu9: PowerPC,e6500@18 { 153 cpu9: PowerPC,e6500@18 {
154 device_type = "cpu"; 154 device_type = "cpu";
155 reg = <18 19>; 155 reg = <18 19>;
156 clocks = <&mux2>; 156 clocks = <&clockgen 1 2>;
157 next-level-cache = <&L2_3>; 157 next-level-cache = <&L2_3>;
158 fsl,portid-mapping = <0x20000000>; 158 fsl,portid-mapping = <0x20000000>;
159 }; 159 };
160 cpu10: PowerPC,e6500@20 { 160 cpu10: PowerPC,e6500@20 {
161 device_type = "cpu"; 161 device_type = "cpu";
162 reg = <20 21>; 162 reg = <20 21>;
163 clocks = <&mux2>; 163 clocks = <&clockgen 1 2>;
164 next-level-cache = <&L2_3>; 164 next-level-cache = <&L2_3>;
165 fsl,portid-mapping = <0x20000000>; 165 fsl,portid-mapping = <0x20000000>;
166 }; 166 };
167 cpu11: PowerPC,e6500@22 { 167 cpu11: PowerPC,e6500@22 {
168 device_type = "cpu"; 168 device_type = "cpu";
169 reg = <22 23>; 169 reg = <22 23>;
170 clocks = <&mux2>; 170 clocks = <&clockgen 1 2>;
171 next-level-cache = <&L2_3>; 171 next-level-cache = <&L2_3>;
172 fsl,portid-mapping = <0x20000000>; 172 fsl,portid-mapping = <0x20000000>;
173 }; 173 };
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 647cae14c16d..be6ef3531b28 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -311,13 +311,9 @@
311 compatible = "fsl,ucc-mdio"; 311 compatible = "fsl,ucc-mdio";
312 312
313 phy00:ethernet-phy@0 { 313 phy00:ethernet-phy@0 {
314 interrupt-parent = <&ipic>;
315 interrupts = <0>;
316 reg = <0x0>; 314 reg = <0x0>;
317 }; 315 };
318 phy04:ethernet-phy@4 { 316 phy04:ethernet-phy@4 {
319 interrupt-parent = <&ipic>;
320 interrupts = <0>;
321 reg = <0x4>; 317 reg = <0x4>;
322 }; 318 };
323 }; 319 };
diff --git a/arch/powerpc/configs/fsl-emb-nonhw.config b/arch/powerpc/configs/fsl-emb-nonhw.config
index e0567dc41968..d592ba27b122 100644
--- a/arch/powerpc/configs/fsl-emb-nonhw.config
+++ b/arch/powerpc/configs/fsl-emb-nonhw.config
@@ -25,6 +25,7 @@ CONFIG_CRYPTO_SHA256=y
25CONFIG_CRYPTO_SHA512=y 25CONFIG_CRYPTO_SHA512=y
26CONFIG_DEBUG_FS=y 26CONFIG_DEBUG_FS=y
27CONFIG_DEBUG_INFO=y 27CONFIG_DEBUG_INFO=y
28CONFIG_DEBUG_KERNEL=y
28CONFIG_DEBUG_SHIRQ=y 29CONFIG_DEBUG_SHIRQ=y
29CONFIG_DETECT_HUNG_TASK=y 30CONFIG_DETECT_HUNG_TASK=y
30CONFIG_DEVTMPFS_MOUNT=y 31CONFIG_DEVTMPFS_MOUNT=y
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index a0395ccbbe9e..d05f0c28e515 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -44,6 +44,7 @@ extern int machine_check_e500(struct pt_regs *regs);
44extern int machine_check_e200(struct pt_regs *regs); 44extern int machine_check_e200(struct pt_regs *regs);
45extern int machine_check_47x(struct pt_regs *regs); 45extern int machine_check_47x(struct pt_regs *regs);
46int machine_check_8xx(struct pt_regs *regs); 46int machine_check_8xx(struct pt_regs *regs);
47int machine_check_83xx(struct pt_regs *regs);
47 48
48extern void cpu_down_flush_e500v2(void); 49extern void cpu_down_flush_e500v2(void);
49extern void cpu_down_flush_e500mc(void); 50extern void cpu_down_flush_e500mc(void);
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 0d2139a0d5b9..1c98ef1f2d5b 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -769,6 +769,8 @@
769#define SRR1_PROGTRAP 0x00020000 /* Trap */ 769#define SRR1_PROGTRAP 0x00020000 /* Trap */
770#define SRR1_PROGADDR 0x00010000 /* SRR0 contains subsequent addr */ 770#define SRR1_PROGADDR 0x00010000 /* SRR0 contains subsequent addr */
771 771
772#define SRR1_MCE_MCP 0x00080000 /* Machine check signal caused interrupt */
773
772#define SPRN_HSRR0 0x13A /* Save/Restore Register 0 */ 774#define SPRN_HSRR0 0x13A /* Save/Restore Register 0 */
773#define SPRN_HSRR1 0x13B /* Save/Restore Register 1 */ 775#define SPRN_HSRR1 0x13B /* Save/Restore Register 1 */
774#define HSRR1_DENORM 0x00100000 /* Denorm exception */ 776#define HSRR1_DENORM 0x00100000 /* Denorm exception */
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 2da01340c84c..1eab54bc6ee9 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1141,6 +1141,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1141 .machine_check = machine_check_generic, 1141 .machine_check = machine_check_generic,
1142 .platform = "ppc603", 1142 .platform = "ppc603",
1143 }, 1143 },
1144#ifdef CONFIG_PPC_83xx
1144 { /* e300c1 (a 603e core, plus some) on 83xx */ 1145 { /* e300c1 (a 603e core, plus some) on 83xx */
1145 .pvr_mask = 0x7fff0000, 1146 .pvr_mask = 0x7fff0000,
1146 .pvr_value = 0x00830000, 1147 .pvr_value = 0x00830000,
@@ -1151,7 +1152,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1151 .icache_bsize = 32, 1152 .icache_bsize = 32,
1152 .dcache_bsize = 32, 1153 .dcache_bsize = 32,
1153 .cpu_setup = __setup_cpu_603, 1154 .cpu_setup = __setup_cpu_603,
1154 .machine_check = machine_check_generic, 1155 .machine_check = machine_check_83xx,
1155 .platform = "ppc603", 1156 .platform = "ppc603",
1156 }, 1157 },
1157 { /* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */ 1158 { /* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */
@@ -1165,7 +1166,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1165 .icache_bsize = 32, 1166 .icache_bsize = 32,
1166 .dcache_bsize = 32, 1167 .dcache_bsize = 32,
1167 .cpu_setup = __setup_cpu_603, 1168 .cpu_setup = __setup_cpu_603,
1168 .machine_check = machine_check_generic, 1169 .machine_check = machine_check_83xx,
1169 .platform = "ppc603", 1170 .platform = "ppc603",
1170 }, 1171 },
1171 { /* e300c3 (e300c1, plus one IU, half cache size) on 83xx */ 1172 { /* e300c3 (e300c1, plus one IU, half cache size) on 83xx */
@@ -1179,7 +1180,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1179 .icache_bsize = 32, 1180 .icache_bsize = 32,
1180 .dcache_bsize = 32, 1181 .dcache_bsize = 32,
1181 .cpu_setup = __setup_cpu_603, 1182 .cpu_setup = __setup_cpu_603,
1182 .machine_check = machine_check_generic, 1183 .machine_check = machine_check_83xx,
1183 .num_pmcs = 4, 1184 .num_pmcs = 4,
1184 .oprofile_cpu_type = "ppc/e300", 1185 .oprofile_cpu_type = "ppc/e300",
1185 .oprofile_type = PPC_OPROFILE_FSL_EMB, 1186 .oprofile_type = PPC_OPROFILE_FSL_EMB,
@@ -1196,12 +1197,13 @@ static struct cpu_spec __initdata cpu_specs[] = {
1196 .icache_bsize = 32, 1197 .icache_bsize = 32,
1197 .dcache_bsize = 32, 1198 .dcache_bsize = 32,
1198 .cpu_setup = __setup_cpu_603, 1199 .cpu_setup = __setup_cpu_603,
1199 .machine_check = machine_check_generic, 1200 .machine_check = machine_check_83xx,
1200 .num_pmcs = 4, 1201 .num_pmcs = 4,
1201 .oprofile_cpu_type = "ppc/e300", 1202 .oprofile_cpu_type = "ppc/e300",
1202 .oprofile_type = PPC_OPROFILE_FSL_EMB, 1203 .oprofile_type = PPC_OPROFILE_FSL_EMB,
1203 .platform = "ppc603", 1204 .platform = "ppc603",
1204 }, 1205 },
1206#endif
1205 { /* default match, we assume split I/D cache & TB (non-601)... */ 1207 { /* default match, we assume split I/D cache & TB (non-601)... */
1206 .pvr_mask = 0x00000000, 1208 .pvr_mask = 0x00000000,
1207 .pvr_value = 0x00000000, 1209 .pvr_value = 0x00000000,
diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c
index d75c9816a5c9..2b6589fe812d 100644
--- a/arch/powerpc/platforms/83xx/misc.c
+++ b/arch/powerpc/platforms/83xx/misc.c
@@ -14,6 +14,7 @@
14#include <linux/of_platform.h> 14#include <linux/of_platform.h>
15#include <linux/pci.h> 15#include <linux/pci.h>
16 16
17#include <asm/debug.h>
17#include <asm/io.h> 18#include <asm/io.h>
18#include <asm/hw_irq.h> 19#include <asm/hw_irq.h>
19#include <asm/ipic.h> 20#include <asm/ipic.h>
@@ -150,3 +151,19 @@ void __init mpc83xx_setup_arch(void)
150 151
151 mpc83xx_setup_pci(); 152 mpc83xx_setup_pci();
152} 153}
154
155int machine_check_83xx(struct pt_regs *regs)
156{
157 u32 mask = 1 << (31 - IPIC_MCP_WDT);
158
159 if (!(regs->msr & SRR1_MCE_MCP) || !(ipic_get_mcp_status() & mask))
160 return machine_check_generic(regs);
161 ipic_clear_mcp_status(mask);
162
163 if (debugger_fault_handler(regs))
164 return 1;
165
166 die("Watchdog NMI Reset", regs, 0);
167
168 return 1;
169}
diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
index 88b35a3dcdc5..8b0ebf3940d2 100644
--- a/arch/powerpc/sysdev/fsl_rmu.c
+++ b/arch/powerpc/sysdev/fsl_rmu.c
@@ -756,15 +756,13 @@ fsl_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
756 } 756 }
757 757
758 /* Initialize outbound message descriptor ring */ 758 /* Initialize outbound message descriptor ring */
759 rmu->msg_tx_ring.virt = dma_alloc_coherent(priv->dev, 759 rmu->msg_tx_ring.virt = dma_zalloc_coherent(priv->dev,
760 rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE, 760 rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
761 &rmu->msg_tx_ring.phys, GFP_KERNEL); 761 &rmu->msg_tx_ring.phys, GFP_KERNEL);
762 if (!rmu->msg_tx_ring.virt) { 762 if (!rmu->msg_tx_ring.virt) {
763 rc = -ENOMEM; 763 rc = -ENOMEM;
764 goto out_dma; 764 goto out_dma;
765 } 765 }
766 memset(rmu->msg_tx_ring.virt, 0,
767 rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE);
768 rmu->msg_tx_ring.tx_slot = 0; 766 rmu->msg_tx_ring.tx_slot = 0;
769 767
770 /* Point dequeue/enqueue pointers at first entry in ring */ 768 /* Point dequeue/enqueue pointers at first entry in ring */
generated by cgit v1.2.2 (git 2.25.0) at 2025-10-01 11:06:19 -0400