hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/r8a7745.dtsi
....@@ -230,7 +230,7 @@
230230 resets = <&cpg 905>;
231231 };
232232
233
- pfc: pin-controller@e6060000 {
233
+ pfc: pinctrl@e6060000 {
234234 compatible = "renesas,pfc-r8a7745";
235235 reg = <0 0xe6060000 0 0x11c>;
236236 };
....@@ -302,7 +302,7 @@
302302 resets = <&cpg 407>;
303303 };
304304
305
- ipmmu_sy0: mmu@e6280000 {
305
+ ipmmu_sy0: iommu@e6280000 {
306306 compatible = "renesas,ipmmu-r8a7745",
307307 "renesas,ipmmu-vmsa";
308308 reg = <0 0xe6280000 0 0x1000>;
....@@ -312,7 +312,7 @@
312312 status = "disabled";
313313 };
314314
315
- ipmmu_sy1: mmu@e6290000 {
315
+ ipmmu_sy1: iommu@e6290000 {
316316 compatible = "renesas,ipmmu-r8a7745",
317317 "renesas,ipmmu-vmsa";
318318 reg = <0 0xe6290000 0 0x1000>;
....@@ -321,7 +321,7 @@
321321 status = "disabled";
322322 };
323323
324
- ipmmu_ds: mmu@e6740000 {
324
+ ipmmu_ds: iommu@e6740000 {
325325 compatible = "renesas,ipmmu-r8a7745",
326326 "renesas,ipmmu-vmsa";
327327 reg = <0 0xe6740000 0 0x1000>;
....@@ -331,7 +331,7 @@
331331 status = "disabled";
332332 };
333333
334
- ipmmu_mp: mmu@ec680000 {
334
+ ipmmu_mp: iommu@ec680000 {
335335 compatible = "renesas,ipmmu-r8a7745",
336336 "renesas,ipmmu-vmsa";
337337 reg = <0 0xec680000 0 0x1000>;
....@@ -340,7 +340,7 @@
340340 status = "disabled";
341341 };
342342
343
- ipmmu_mx: mmu@fe951000 {
343
+ ipmmu_mx: iommu@fe951000 {
344344 compatible = "renesas,ipmmu-r8a7745",
345345 "renesas,ipmmu-vmsa";
346346 reg = <0 0xfe951000 0 0x1000>;
....@@ -350,7 +350,7 @@
350350 status = "disabled";
351351 };
352352
353
- ipmmu_gp: mmu@e62a0000 {
353
+ ipmmu_gp: iommu@e62a0000 {
354354 compatible = "renesas,ipmmu-r8a7745",
355355 "renesas,ipmmu-vmsa";
356356 reg = <0 0xe62a0000 0 0x1000>;
....@@ -363,6 +363,9 @@
363363 icram0: sram@e63a0000 {
364364 compatible = "mmio-sram";
365365 reg = <0 0xe63a0000 0 0x12000>;
366
+ #address-cells = <1>;
367
+ #size-cells = <1>;
368
+ ranges = <0 0 0xe63a0000 0x12000>;
366369 };
367370
368371 icram1: sram@e63c0000 {
....@@ -381,6 +384,9 @@
381384 icram2: sram@e6300000 {
382385 compatible = "mmio-sram";
383386 reg = <0 0xe6300000 0 0x40000>;
387
+ #address-cells = <1>;
388
+ #size-cells = <1>;
389
+ ranges = <0 0 0xe6300000 0x40000>;
384390 };
385391 i2c0: i2c@e6508000 {
386392 #address-cells = <1>;
....@@ -543,8 +549,8 @@
543549 compatible = "renesas,r8a7745-usb-dmac",
544550 "renesas,usb-dmac";
545551 reg = <0 0xe65a0000 0 0x100>;
546
- interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
547
- GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
552
+ interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
553
+ <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
548554 interrupt-names = "ch0", "ch1";
549555 clocks = <&cpg CPG_MOD 330>;
550556 power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
....@@ -557,8 +563,8 @@
557563 compatible = "renesas,r8a7745-usb-dmac",
558564 "renesas,usb-dmac";
559565 reg = <0 0xe65b0000 0 0x100>;
560
- interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
561
- GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
566
+ interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
567
+ <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
562568 interrupt-names = "ch0", "ch1";
563569 clocks = <&cpg CPG_MOD 331>;
564570 power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
....@@ -571,22 +577,22 @@
571577 compatible = "renesas,dmac-r8a7745",
572578 "renesas,rcar-dmac";
573579 reg = <0 0xe6700000 0 0x20000>;
574
- interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
575
- GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
576
- GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
577
- GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
578
- GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
579
- GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
580
- GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
581
- GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
582
- GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
583
- GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
584
- GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
585
- GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
586
- GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
587
- GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
588
- GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
589
- GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
580
+ interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,
581
+ <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
582
+ <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
583
+ <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
584
+ <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
585
+ <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
586
+ <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
587
+ <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
588
+ <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
589
+ <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
590
+ <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
591
+ <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
592
+ <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
593
+ <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
594
+ <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
595
+ <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
590596 interrupt-names = "error",
591597 "ch0", "ch1", "ch2", "ch3",
592598 "ch4", "ch5", "ch6", "ch7",
....@@ -604,22 +610,22 @@
604610 compatible = "renesas,dmac-r8a7745",
605611 "renesas,rcar-dmac";
606612 reg = <0 0xe6720000 0 0x20000>;
607
- interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
608
- GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
609
- GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
610
- GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
611
- GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
612
- GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
613
- GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
614
- GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
615
- GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
616
- GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
617
- GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
618
- GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
619
- GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
620
- GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
621
- GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
622
- GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
613
+ interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
614
+ <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
615
+ <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
616
+ <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
617
+ <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
618
+ <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
619
+ <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
620
+ <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
621
+ <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
622
+ <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
623
+ <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
624
+ <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
625
+ <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
626
+ <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
627
+ <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
628
+ <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
623629 interrupt-names = "error",
624630 "ch0", "ch1", "ch2", "ch3",
625631 "ch4", "ch5", "ch6", "ch7",
....@@ -1293,20 +1299,20 @@
12931299 compatible = "renesas,dmac-r8a7745",
12941300 "renesas,rcar-dmac";
12951301 reg = <0 0xec700000 0 0x10000>;
1296
- interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
1297
- GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
1298
- GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
1299
- GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
1300
- GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
1301
- GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
1302
- GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
1303
- GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
1304
- GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
1305
- GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
1306
- GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
1307
- GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
1308
- GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
1309
- GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1302
+ interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
1303
+ <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
1304
+ <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
1305
+ <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
1306
+ <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
1307
+ <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
1308
+ <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
1309
+ <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
1310
+ <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
1311
+ <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
1312
+ <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
1313
+ <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
1314
+ <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
1315
+ <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
13101316 interrupt-names = "error",
13111317 "ch0", "ch1", "ch2", "ch3",
13121318 "ch4", "ch5", "ch6", "ch7",
....@@ -1337,10 +1343,10 @@
13371343 #size-cells = <2>;
13381344 #interrupt-cells = <1>;
13391345 ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
1340
- interrupt-map-mask = <0xff00 0 0 0x7>;
1341
- interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1342
- 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1343
- 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
1346
+ interrupt-map-mask = <0xf800 0 0 0x7>;
1347
+ interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1348
+ <0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1349
+ <0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
13441350
13451351 usb@1,0 {
13461352 reg = <0x800 0 0 0 0>;
....@@ -1372,10 +1378,10 @@
13721378 #size-cells = <2>;
13731379 #interrupt-cells = <1>;
13741380 ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
1375
- interrupt-map-mask = <0xff00 0 0 0x7>;
1376
- interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1377
- 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1378
- 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
1381
+ interrupt-map-mask = <0xf800 0 0 0x7>;
1382
+ interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1383
+ <0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1384
+ <0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
13791385
13801386 usb@1,0 {
13811387 reg = <0x10800 0 0 0 0>;
....@@ -1390,7 +1396,7 @@
13901396 };
13911397 };
13921398
1393
- sdhi0: sd@ee100000 {
1399
+ sdhi0: mmc@ee100000 {
13941400 compatible = "renesas,sdhi-r8a7745",
13951401 "renesas,rcar-gen2-sdhi";
13961402 reg = <0 0xee100000 0 0x328>;
....@@ -1405,7 +1411,7 @@
14051411 status = "disabled";
14061412 };
14071413
1408
- sdhi1: sd@ee140000 {
1414
+ sdhi1: mmc@ee140000 {
14091415 compatible = "renesas,sdhi-r8a7745",
14101416 "renesas,rcar-gen2-sdhi";
14111417 reg = <0 0xee140000 0 0x100>;
....@@ -1420,7 +1426,7 @@
14201426 status = "disabled";
14211427 };
14221428
1423
- sdhi2: sd@ee160000 {
1429
+ sdhi2: mmc@ee160000 {
14241430 compatible = "renesas,sdhi-r8a7745",
14251431 "renesas,rcar-gen2-sdhi";
14261432 reg = <0 0xee160000 0 0x100>;
....@@ -1500,11 +1506,12 @@
15001506 du: display@feb00000 {
15011507 compatible = "renesas,du-r8a7745";
15021508 reg = <0 0xfeb00000 0 0x40000>;
1503
- reg-names = "du";
15041509 interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
15051510 <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
15061511 clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
15071512 clock-names = "du.0", "du.1";
1513
+ resets = <&cpg 724>;
1514
+ reset-names = "du.0";
15081515 status = "disabled";
15091516
15101517 ports {