Skip to content

Commit 12526b0

Browse files
mpempe
committed
Freescale updates from Scott: "Highlights include elimination of legacy clock bindings use from dts files, an 83xx watchdog handler, fixes to old dts interrupt errors, and some minor cleanup."
2 parents 9bbc7e4 + 63d8687 commit 12526b0

34 files changed

+216
-550
lines changed

‎Documentation/devicetree/bindings/clock/qoriq-clock.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ Required properties:
2828
* "fsl,p4080-clockgen"
2929
* "fsl,p5020-clockgen"
3030
* "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"
3137
* "fsl,t4240-clockgen"
3238
* "fsl,b4420-clockgen"
3339
* "fsl,b4860-clockgen"

‎arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@
7070
cpu0: PowerPC,e6500@0 {
7171
device_type = "cpu";
7272
reg = <0 1>;
73-
clocks = <&mux0>;
73+
clocks = <&clockgen 1 0>;
7474
next-level-cache = <&L2_1>;
7575
fsl,portid-mapping = <0x80000000>;
7676
};
7777
cpu1: PowerPC,e6500@2 {
7878
device_type = "cpu";
7979
reg = <2 3>;
80-
clocks = <&mux0>;
80+
clocks = <&clockgen 1 0>;
8181
next-level-cache = <&L2_1>;
8282
fsl,portid-mapping = <0x80000000>;
8383
};

‎arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,28 @@
7575
cpu0: PowerPC,e6500@0 {
7676
device_type = "cpu";
7777
reg = <0 1>;
78-
clocks = <&mux0>;
78+
clocks = <&clockgen 1 0>;
7979
next-level-cache = <&L2_1>;
8080
fsl,portid-mapping = <0x80000000>;
8181
};
8282
cpu1: PowerPC,e6500@2 {
8383
device_type = "cpu";
8484
reg = <2 3>;
85-
clocks = <&mux0>;
85+
clocks = <&clockgen 1 0>;
8686
next-level-cache = <&L2_1>;
8787
fsl,portid-mapping = <0x80000000>;
8888
};
8989
cpu2: PowerPC,e6500@4 {
9090
device_type = "cpu";
9191
reg = <4 5>;
92-
clocks = <&mux0>;
92+
clocks = <&clockgen 1 0>;
9393
next-level-cache = <&L2_1>;
9494
fsl,portid-mapping = <0x80000000>;
9595
};
9696
cpu3: PowerPC,e6500@6 {
9797
device_type = "cpu";
9898
reg = <6 7>;
99-
clocks = <&mux0>;
99+
clocks = <&clockgen 1 0>;
100100
next-level-cache = <&L2_1>;
101101
fsl,portid-mapping = <0x80000000>;
102102
};

‎arch/powerpc/boot/dts/fsl/b4si-post.dtsi

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -398,21 +398,6 @@
398398
};
399399

400400
/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-
};
416401

417402
rcpm: global-utilities@e2000 {
418403
compatible = "fsl,b4-rcpm", "fsl,qoriq-rcpm-2.0";

‎arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -169,100 +169,100 @@
169169
interrupt-map-mask = <0xff00 0 0 7>;
170170
interrupt-map = <
171171
/* IDSEL 0x11 func 0 - PCI slot 1 */
172-
0x8800 0 0 1 &mpic 2 1
173-
0x8800 0 0 2 &mpic 3 1
174-
0x8800 0 0 3 &mpic 4 1
175-
0x8800 0 0 4 &mpic 1 1
172+
0x8800 0 0 1 &mpic 2 1 0 0
173+
0x8800 0 0 2 &mpic 3 1 0 0
174+
0x8800 0 0 3 &mpic 4 1 0 0
175+
0x8800 0 0 4 &mpic 1 1 0 0
176176

177177
/* IDSEL 0x11 func 1 - PCI slot 1 */
178-
0x8900 0 0 1 &mpic 2 1
179-
0x8900 0 0 2 &mpic 3 1
180-
0x8900 0 0 3 &mpic 4 1
181-
0x8900 0 0 4 &mpic 1 1
178+
0x8900 0 0 1 &mpic 2 1 0 0
179+
0x8900 0 0 2 &mpic 3 1 0 0
180+
0x8900 0 0 3 &mpic 4 1 0 0
181+
0x8900 0 0 4 &mpic 1 1 0 0
182182

183183
/* IDSEL 0x11 func 2 - PCI slot 1 */
184-
0x8a00 0 0 1 &mpic 2 1
185-
0x8a00 0 0 2 &mpic 3 1
186-
0x8a00 0 0 3 &mpic 4 1
187-
0x8a00 0 0 4 &mpic 1 1
184+
0x8a00 0 0 1 &mpic 2 1 0 0
185+
0x8a00 0 0 2 &mpic 3 1 0 0
186+
0x8a00 0 0 3 &mpic 4 1 0 0
187+
0x8a00 0 0 4 &mpic 1 1 0 0
188188

189189
/* IDSEL 0x11 func 3 - PCI slot 1 */
190-
0x8b00 0 0 1 &mpic 2 1
191-
0x8b00 0 0 2 &mpic 3 1
192-
0x8b00 0 0 3 &mpic 4 1
193-
0x8b00 0 0 4 &mpic 1 1
190+
0x8b00 0 0 1 &mpic 2 1 0 0
191+
0x8b00 0 0 2 &mpic 3 1 0 0
192+
0x8b00 0 0 3 &mpic 4 1 0 0
193+
0x8b00 0 0 4 &mpic 1 1 0 0
194194

195195
/* IDSEL 0x11 func 4 - PCI slot 1 */
196-
0x8c00 0 0 1 &mpic 2 1
197-
0x8c00 0 0 2 &mpic 3 1
198-
0x8c00 0 0 3 &mpic 4 1
199-
0x8c00 0 0 4 &mpic 1 1
196+
0x8c00 0 0 1 &mpic 2 1 0 0
197+
0x8c00 0 0 2 &mpic 3 1 0 0
198+
0x8c00 0 0 3 &mpic 4 1 0 0
199+
0x8c00 0 0 4 &mpic 1 1 0 0
200200

201201
/* IDSEL 0x11 func 5 - PCI slot 1 */
202-
0x8d00 0 0 1 &mpic 2 1
203-
0x8d00 0 0 2 &mpic 3 1
204-
0x8d00 0 0 3 &mpic 4 1
205-
0x8d00 0 0 4 &mpic 1 1
202+
0x8d00 0 0 1 &mpic 2 1 0 0
203+
0x8d00 0 0 2 &mpic 3 1 0 0
204+
0x8d00 0 0 3 &mpic 4 1 0 0
205+
0x8d00 0 0 4 &mpic 1 1 0 0
206206

207207
/* IDSEL 0x11 func 6 - PCI slot 1 */
208-
0x8e00 0 0 1 &mpic 2 1
209-
0x8e00 0 0 2 &mpic 3 1
210-
0x8e00 0 0 3 &mpic 4 1
211-
0x8e00 0 0 4 &mpic 1 1
208+
0x8e00 0 0 1 &mpic 2 1 0 0
209+
0x8e00 0 0 2 &mpic 3 1 0 0
210+
0x8e00 0 0 3 &mpic 4 1 0 0
211+
0x8e00 0 0 4 &mpic 1 1 0 0
212212

213213
/* IDSEL 0x11 func 7 - PCI slot 1 */
214-
0x8f00 0 0 1 &mpic 2 1
215-
0x8f00 0 0 2 &mpic 3 1
216-
0x8f00 0 0 3 &mpic 4 1
217-
0x8f00 0 0 4 &mpic 1 1
214+
0x8f00 0 0 1 &mpic 2 1 0 0
215+
0x8f00 0 0 2 &mpic 3 1 0 0
216+
0x8f00 0 0 3 &mpic 4 1 0 0
217+
0x8f00 0 0 4 &mpic 1 1 0 0
218218

219219
/* IDSEL 0x12 func 0 - PCI slot 2 */
220-
0x9000 0 0 1 &mpic 3 1
221-
0x9000 0 0 2 &mpic 4 1
222-
0x9000 0 0 3 &mpic 1 1
223-
0x9000 0 0 4 &mpic 2 1
220+
0x9000 0 0 1 &mpic 3 1 0 0
221+
0x9000 0 0 2 &mpic 4 1 0 0
222+
0x9000 0 0 3 &mpic 1 1 0 0
223+
0x9000 0 0 4 &mpic 2 1 0 0
224224

225225
/* IDSEL 0x12 func 1 - PCI slot 2 */
226-
0x9100 0 0 1 &mpic 3 1
227-
0x9100 0 0 2 &mpic 4 1
228-
0x9100 0 0 3 &mpic 1 1
229-
0x9100 0 0 4 &mpic 2 1
226+
0x9100 0 0 1 &mpic 3 1 0 0
227+
0x9100 0 0 2 &mpic 4 1 0 0
228+
0x9100 0 0 3 &mpic 1 1 0 0
229+
0x9100 0 0 4 &mpic 2 1 0 0
230230

231231
/* IDSEL 0x12 func 2 - PCI slot 2 */
232-
0x9200 0 0 1 &mpic 3 1
233-
0x9200 0 0 2 &mpic 4 1
234-
0x9200 0 0 3 &mpic 1 1
235-
0x9200 0 0 4 &mpic 2 1
232+
0x9200 0 0 1 &mpic 3 1 0 0
233+
0x9200 0 0 2 &mpic 4 1 0 0
234+
0x9200 0 0 3 &mpic 1 1 0 0
235+
0x9200 0 0 4 &mpic 2 1 0 0
236236

237237
/* IDSEL 0x12 func 3 - PCI slot 2 */
238-
0x9300 0 0 1 &mpic 3 1
239-
0x9300 0 0 2 &mpic 4 1
240-
0x9300 0 0 3 &mpic 1 1
241-
0x9300 0 0 4 &mpic 2 1
238+
0x9300 0 0 1 &mpic 3 1 0 0
239+
0x9300 0 0 2 &mpic 4 1 0 0
240+
0x9300 0 0 3 &mpic 1 1 0 0
241+
0x9300 0 0 4 &mpic 2 1 0 0
242242

243243
/* IDSEL 0x12 func 4 - PCI slot 2 */
244-
0x9400 0 0 1 &mpic 3 1
245-
0x9400 0 0 2 &mpic 4 1
246-
0x9400 0 0 3 &mpic 1 1
247-
0x9400 0 0 4 &mpic 2 1
244+
0x9400 0 0 1 &mpic 3 1 0 0
245+
0x9400 0 0 2 &mpic 4 1 0 0
246+
0x9400 0 0 3 &mpic 1 1 0 0
247+
0x9400 0 0 4 &mpic 2 1 0 0
248248

249249
/* IDSEL 0x12 func 5 - PCI slot 2 */
250-
0x9500 0 0 1 &mpic 3 1
251-
0x9500 0 0 2 &mpic 4 1
252-
0x9500 0 0 3 &mpic 1 1
253-
0x9500 0 0 4 &mpic 2 1
250+
0x9500 0 0 1 &mpic 3 1 0 0
251+
0x9500 0 0 2 &mpic 4 1 0 0
252+
0x9500 0 0 3 &mpic 1 1 0 0
253+
0x9500 0 0 4 &mpic 2 1 0 0
254254

255255
/* IDSEL 0x12 func 6 - PCI slot 2 */
256-
0x9600 0 0 1 &mpic 3 1
257-
0x9600 0 0 2 &mpic 4 1
258-
0x9600 0 0 3 &mpic 1 1
259-
0x9600 0 0 4 &mpic 2 1
256+
0x9600 0 0 1 &mpic 3 1 0 0
257+
0x9600 0 0 2 &mpic 4 1 0 0
258+
0x9600 0 0 3 &mpic 1 1 0 0
259+
0x9600 0 0 4 &mpic 2 1 0 0
260260

261261
/* IDSEL 0x12 func 7 - PCI slot 2 */
262-
0x9700 0 0 1 &mpic 3 1
263-
0x9700 0 0 2 &mpic 4 1
264-
0x9700 0 0 3 &mpic 1 1
265-
0x9700 0 0 4 &mpic 2 1
262+
0x9700 0 0 1 &mpic 3 1 0 0
263+
0x9700 0 0 2 &mpic 4 1 0 0
264+
0x9700 0 0 3 &mpic 1 1 0 0
265+
0x9700 0 0 4 &mpic 2 1 0 0
266266

267267
// IDSEL 0x1c USB
268268
0xe000 0 0 1 &i8259 12 2

0 commit comments

Comments
 (0)