hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/r8a7790.dtsi
....@@ -1,6 +1,6 @@
11 // SPDX-License-Identifier: GPL-2.0
22 /*
3
- * Device Tree Source for the r8a7790 SoC
3
+ * Device Tree Source for the R-Car H2 (R8A77900) SoC
44 *
55 * Copyright (C) 2015 Renesas Electronics Corporation
66 * Copyright (C) 2013-2014 Renesas Solutions Corp.
....@@ -363,7 +363,7 @@
363363 resets = <&cpg 907>;
364364 };
365365
366
- pfc: pin-controller@e6060000 {
366
+ pfc: pinctrl@e6060000 {
367367 compatible = "renesas,pfc-r8a7790";
368368 reg = <0 0xe6060000 0 0x250>;
369369 };
....@@ -427,7 +427,7 @@
427427 #thermal-sensor-cells = <0>;
428428 };
429429
430
- ipmmu_sy0: mmu@e6280000 {
430
+ ipmmu_sy0: iommu@e6280000 {
431431 compatible = "renesas,ipmmu-r8a7790",
432432 "renesas,ipmmu-vmsa";
433433 reg = <0 0xe6280000 0 0x1000>;
....@@ -437,7 +437,7 @@
437437 status = "disabled";
438438 };
439439
440
- ipmmu_sy1: mmu@e6290000 {
440
+ ipmmu_sy1: iommu@e6290000 {
441441 compatible = "renesas,ipmmu-r8a7790",
442442 "renesas,ipmmu-vmsa";
443443 reg = <0 0xe6290000 0 0x1000>;
....@@ -446,7 +446,7 @@
446446 status = "disabled";
447447 };
448448
449
- ipmmu_ds: mmu@e6740000 {
449
+ ipmmu_ds: iommu@e6740000 {
450450 compatible = "renesas,ipmmu-r8a7790",
451451 "renesas,ipmmu-vmsa";
452452 reg = <0 0xe6740000 0 0x1000>;
....@@ -456,7 +456,7 @@
456456 status = "disabled";
457457 };
458458
459
- ipmmu_mp: mmu@ec680000 {
459
+ ipmmu_mp: iommu@ec680000 {
460460 compatible = "renesas,ipmmu-r8a7790",
461461 "renesas,ipmmu-vmsa";
462462 reg = <0 0xec680000 0 0x1000>;
....@@ -465,7 +465,7 @@
465465 status = "disabled";
466466 };
467467
468
- ipmmu_mx: mmu@fe951000 {
468
+ ipmmu_mx: iommu@fe951000 {
469469 compatible = "renesas,ipmmu-r8a7790",
470470 "renesas,ipmmu-vmsa";
471471 reg = <0 0xfe951000 0 0x1000>;
....@@ -475,7 +475,7 @@
475475 status = "disabled";
476476 };
477477
478
- ipmmu_rt: mmu@ffc80000 {
478
+ ipmmu_rt: iommu@ffc80000 {
479479 compatible = "renesas,ipmmu-r8a7790",
480480 "renesas,ipmmu-vmsa";
481481 reg = <0 0xffc80000 0 0x1000>;
....@@ -487,6 +487,9 @@
487487 icram0: sram@e63a0000 {
488488 compatible = "mmio-sram";
489489 reg = <0 0xe63a0000 0 0x12000>;
490
+ #address-cells = <1>;
491
+ #size-cells = <1>;
492
+ ranges = <0 0 0xe63a0000 0x12000>;
490493 };
491494
492495 icram1: sram@e63c0000 {
....@@ -669,8 +672,8 @@
669672 compatible = "renesas,r8a7790-usb-dmac",
670673 "renesas,usb-dmac";
671674 reg = <0 0xe65a0000 0 0x100>;
672
- interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
673
- GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
675
+ interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
676
+ <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
674677 interrupt-names = "ch0", "ch1";
675678 clocks = <&cpg CPG_MOD 330>;
676679 power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
....@@ -683,8 +686,8 @@
683686 compatible = "renesas,r8a7790-usb-dmac",
684687 "renesas,usb-dmac";
685688 reg = <0 0xe65b0000 0 0x100>;
686
- interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
687
- GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
689
+ interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
690
+ <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
688691 interrupt-names = "ch0", "ch1";
689692 clocks = <&cpg CPG_MOD 331>;
690693 power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
....@@ -697,22 +700,22 @@
697700 compatible = "renesas,dmac-r8a7790",
698701 "renesas,rcar-dmac";
699702 reg = <0 0xe6700000 0 0x20000>;
700
- interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
701
- GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
702
- GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
703
- GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
704
- GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
705
- GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
706
- GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
707
- GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
708
- GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
709
- GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
710
- GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
711
- GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
712
- GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
713
- GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
714
- GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
715
- GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
703
+ interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,
704
+ <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
705
+ <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
706
+ <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
707
+ <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
708
+ <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
709
+ <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
710
+ <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
711
+ <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
712
+ <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
713
+ <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
714
+ <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
715
+ <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
716
+ <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
717
+ <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
718
+ <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
716719 interrupt-names = "error",
717720 "ch0", "ch1", "ch2", "ch3",
718721 "ch4", "ch5", "ch6", "ch7",
....@@ -730,22 +733,22 @@
730733 compatible = "renesas,dmac-r8a7790",
731734 "renesas,rcar-dmac";
732735 reg = <0 0xe6720000 0 0x20000>;
733
- interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
734
- GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
735
- GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
736
- GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
737
- GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
738
- GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
739
- GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
740
- GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
741
- GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
742
- GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
743
- GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
744
- GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
745
- GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
746
- GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
747
- GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
748
- GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
736
+ interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
737
+ <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
738
+ <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
739
+ <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
740
+ <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
741
+ <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
742
+ <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
743
+ <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
744
+ <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
745
+ <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
746
+ <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
747
+ <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
748
+ <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
749
+ <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
750
+ <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
751
+ <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
749752 interrupt-names = "error",
750753 "ch0", "ch1", "ch2", "ch3",
751754 "ch4", "ch5", "ch6", "ch7",
....@@ -1300,20 +1303,20 @@
13001303 compatible = "renesas,dmac-r8a7790",
13011304 "renesas,rcar-dmac";
13021305 reg = <0 0xec700000 0 0x10000>;
1303
- interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
1304
- GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
1305
- GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
1306
- GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
1307
- GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
1308
- GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
1309
- GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
1310
- GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
1311
- GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
1312
- GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
1313
- GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
1314
- GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
1315
- GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
1316
- GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1306
+ interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
1307
+ <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
1308
+ <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
1309
+ <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
1310
+ <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
1311
+ <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
1312
+ <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
1313
+ <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
1314
+ <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
1315
+ <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
1316
+ <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
1317
+ <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
1318
+ <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
1319
+ <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
13171320 interrupt-names = "error",
13181321 "ch0", "ch1", "ch2", "ch3",
13191322 "ch4", "ch5", "ch6", "ch7",
....@@ -1331,20 +1334,20 @@
13311334 compatible = "renesas,dmac-r8a7790",
13321335 "renesas,rcar-dmac";
13331336 reg = <0 0xec720000 0 0x10000>;
1334
- interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
1335
- GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
1336
- GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
1337
- GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
1338
- GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
1339
- GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
1340
- GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
1341
- GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
1342
- GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
1343
- GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
1344
- GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
1345
- GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
1346
- GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
1347
- GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
1337
+ interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
1338
+ <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
1339
+ <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
1340
+ <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
1341
+ <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
1342
+ <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
1343
+ <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
1344
+ <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
1345
+ <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
1346
+ <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
1347
+ <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
1348
+ <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
1349
+ <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
1350
+ <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
13481351 interrupt-names = "error",
13491352 "ch0", "ch1", "ch2", "ch3",
13501353 "ch4", "ch5", "ch6", "ch7",
....@@ -1388,10 +1391,10 @@
13881391 #size-cells = <2>;
13891392 #interrupt-cells = <1>;
13901393 ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
1391
- interrupt-map-mask = <0xff00 0 0 0x7>;
1392
- interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1393
- 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1394
- 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
1394
+ interrupt-map-mask = <0xf800 0 0 0x7>;
1395
+ interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1396
+ <0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1397
+ <0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
13951398
13961399 usb@1,0 {
13971400 reg = <0x800 0 0 0 0>;
....@@ -1423,10 +1426,10 @@
14231426 #size-cells = <2>;
14241427 #interrupt-cells = <1>;
14251428 ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
1426
- interrupt-map-mask = <0xff00 0 0 0x7>;
1427
- interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
1428
- 0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
1429
- 0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
1429
+ interrupt-map-mask = <0xf800 0 0 0x7>;
1430
+ interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
1431
+ <0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
1432
+ <0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
14301433 };
14311434
14321435 pci2: pci@ee0d0000 {
....@@ -1446,10 +1449,10 @@
14461449 #size-cells = <2>;
14471450 #interrupt-cells = <1>;
14481451 ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
1449
- interrupt-map-mask = <0xff00 0 0 0x7>;
1450
- interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1451
- 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1452
- 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
1452
+ interrupt-map-mask = <0xf800 0 0 0x7>;
1453
+ interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1454
+ <0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1455
+ <0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
14531456
14541457 usb@1,0 {
14551458 reg = <0x20800 0 0 0 0>;
....@@ -1464,7 +1467,7 @@
14641467 };
14651468 };
14661469
1467
- sdhi0: sd@ee100000 {
1470
+ sdhi0: mmc@ee100000 {
14681471 compatible = "renesas,sdhi-r8a7790",
14691472 "renesas,rcar-gen2-sdhi";
14701473 reg = <0 0xee100000 0 0x328>;
....@@ -1479,7 +1482,7 @@
14791482 status = "disabled";
14801483 };
14811484
1482
- sdhi1: sd@ee120000 {
1485
+ sdhi1: mmc@ee120000 {
14831486 compatible = "renesas,sdhi-r8a7790",
14841487 "renesas,rcar-gen2-sdhi";
14851488 reg = <0 0xee120000 0 0x328>;
....@@ -1494,7 +1497,7 @@
14941497 status = "disabled";
14951498 };
14961499
1497
- sdhi2: sd@ee140000 {
1500
+ sdhi2: mmc@ee140000 {
14981501 compatible = "renesas,sdhi-r8a7790",
14991502 "renesas,rcar-gen2-sdhi";
15001503 reg = <0 0xee140000 0 0x100>;
....@@ -1509,7 +1512,7 @@
15091512 status = "disabled";
15101513 };
15111514
1512
- sdhi3: sd@ee160000 {
1515
+ sdhi3: mmc@ee160000 {
15131516 compatible = "renesas,sdhi-r8a7790",
15141517 "renesas,rcar-gen2-sdhi";
15151518 reg = <0 0xee160000 0 0x100>;
....@@ -1614,13 +1617,13 @@
16141617 #size-cells = <2>;
16151618 bus-range = <0x00 0xff>;
16161619 device_type = "pci";
1617
- ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
1618
- 0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
1619
- 0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
1620
- 0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
1620
+ ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
1621
+ <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
1622
+ <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
1623
+ <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
16211624 /* Map all possible DDR as inbound ranges */
1622
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
1623
- 0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
1625
+ dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>,
1626
+ <0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
16241627 interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
16251628 <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
16261629 <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
....@@ -1716,6 +1719,8 @@
17161719 clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
17171720 <&cpg CPG_MOD 722>;
17181721 clock-names = "du.0", "du.1", "du.2";
1722
+ resets = <&cpg 724>;
1723
+ reset-names = "du.0";
17191724 status = "disabled";
17201725
17211726 ports {