add boot partition size

hc

2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d

 kernel/arch/arm/boot/dts/r8a7791.dtsi
..
..
@@ -1,6 +1,6 @@
1
1
 // SPDX-License-Identifier: GPL-2.0
2
2
 /*
3
- * Device Tree Source for the r8a7791 SoC
3
+ * Device Tree Source for the R-Car M2-W (R8A77910) SoC
4
4
  *
5
5
  * Copyright (C) 2013-2015 Renesas Electronics Corporation
6
6
  * Copyright (C) 2013-2014 Renesas Solutions Corp.
..
..
@@ -286,9 +286,20 @@
286
286
 			resets = <&cpg 904>;
287
287
 		};
288
288
 
289
-		pfc: pin-controller@e6060000 {
289
+		pfc: pinctrl@e6060000 {
290
290
 			compatible = "renesas,pfc-r8a7791";
291
291
 			reg = <0 0xe6060000 0 0x250>;
292
+		};
293
+
294
+		tpu: pwm@e60f0000 {
295
+			compatible = "renesas,tpu-r8a7791", "renesas,tpu";
296
+			reg = <0 0xe60f0000 0 0x148>;
297
+			interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>;
298
+			clocks = <&cpg CPG_MOD 304>;
299
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
300
+			resets = <&cpg 304>;
301
+			#pwm-cells = <3>;
302
+			status = "disabled";
292
303
 		};
293
304
 
294
305
 		cpg: clock-controller@e6150000 {
..
..
@@ -350,7 +361,7 @@
350
361
 			#thermal-sensor-cells = <0>;
351
362
 		};
352
363
 
353
-		ipmmu_sy0: mmu@e6280000 {
364
+		ipmmu_sy0: iommu@e6280000 {
354
365
 			compatible = "renesas,ipmmu-r8a7791",
355
366
 				     "renesas,ipmmu-vmsa";
356
367
 			reg = <0 0xe6280000 0 0x1000>;
..
..
@@ -360,7 +371,7 @@
360
371
 			status = "disabled";
361
372
 		};
362
373
 
363
-		ipmmu_sy1: mmu@e6290000 {
374
+		ipmmu_sy1: iommu@e6290000 {
364
375
 			compatible = "renesas,ipmmu-r8a7791",
365
376
 				     "renesas,ipmmu-vmsa";
366
377
 			reg = <0 0xe6290000 0 0x1000>;
..
..
@@ -369,7 +380,7 @@
369
380
 			status = "disabled";
370
381
 		};
371
382
 
372
-		ipmmu_ds: mmu@e6740000 {
383
+		ipmmu_ds: iommu@e6740000 {
373
384
 			compatible = "renesas,ipmmu-r8a7791",
374
385
 				     "renesas,ipmmu-vmsa";
375
386
 			reg = <0 0xe6740000 0 0x1000>;
..
..
@@ -379,7 +390,7 @@
379
390
 			status = "disabled";
380
391
 		};
381
392
 
382
-		ipmmu_mp: mmu@ec680000 {
393
+		ipmmu_mp: iommu@ec680000 {
383
394
 			compatible = "renesas,ipmmu-r8a7791",
384
395
 				     "renesas,ipmmu-vmsa";
385
396
 			reg = <0 0xec680000 0 0x1000>;
..
..
@@ -388,7 +399,7 @@
388
399
 			status = "disabled";
389
400
 		};
390
401
 
391
-		ipmmu_mx: mmu@fe951000 {
402
+		ipmmu_mx: iommu@fe951000 {
392
403
 			compatible = "renesas,ipmmu-r8a7791",
393
404
 				     "renesas,ipmmu-vmsa";
394
405
 			reg = <0 0xfe951000 0 0x1000>;
..
..
@@ -398,7 +409,7 @@
398
409
 			status = "disabled";
399
410
 		};
400
411
 
401
-		ipmmu_rt: mmu@ffc80000 {
412
+		ipmmu_rt: iommu@ffc80000 {
402
413
 			compatible = "renesas,ipmmu-r8a7791",
403
414
 				     "renesas,ipmmu-vmsa";
404
415
 			reg = <0 0xffc80000 0 0x1000>;
..
..
@@ -407,7 +418,7 @@
407
418
 			status = "disabled";
408
419
 		};
409
420
 
410
-		ipmmu_gp: mmu@e62a0000 {
421
+		ipmmu_gp: iommu@e62a0000 {
411
422
 			compatible = "renesas,ipmmu-r8a7791",
412
423
 				     "renesas,ipmmu-vmsa";
413
424
 			reg = <0 0xe62a0000 0 0x1000>;
..
..
@@ -420,6 +431,9 @@
420
431
 		icram0:	sram@e63a0000 {
421
432
 			compatible = "mmio-sram";
422
433
 			reg = <0 0xe63a0000 0 0x12000>;
434
+			#address-cells = <1>;
435
+			#size-cells = <1>;
436
+			ranges = <0 0 0xe63a0000 0x12000>;
423
437
 		};
424
438
 
425
439
 		icram1:	sram@e63c0000 {
..
..
@@ -618,8 +632,8 @@
618
632
 			compatible = "renesas,r8a7791-usb-dmac",
619
633
 				     "renesas,usb-dmac";
620
634
 			reg = <0 0xe65a0000 0 0x100>;
621
-			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
622
-				      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
635
+			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
636
+				     <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
623
637
 			interrupt-names = "ch0", "ch1";
624
638
 			clocks = <&cpg CPG_MOD 330>;
625
639
 			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
..
..
@@ -632,8 +646,8 @@
632
646
 			compatible = "renesas,r8a7791-usb-dmac",
633
647
 				     "renesas,usb-dmac";
634
648
 			reg = <0 0xe65b0000 0 0x100>;
635
-			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
636
-				      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
649
+			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
650
+				     <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
637
651
 			interrupt-names = "ch0", "ch1";
638
652
 			clocks = <&cpg CPG_MOD 331>;
639
653
 			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
..
..
@@ -646,22 +660,22 @@
646
660
 			compatible = "renesas,dmac-r8a7791",
647
661
 				     "renesas,rcar-dmac";
648
662
 			reg = <0 0xe6700000 0 0x20000>;
649
-			interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
650
-				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
651
-				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
652
-				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
653
-				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
654
-				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
655
-				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
656
-				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
657
-				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
658
-				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
659
-				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
660
-				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
661
-				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
662
-				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
663
-				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
664
-				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
663
+			interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,
664
+				     <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
665
+				     <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
666
+				     <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
667
+				     <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
668
+				     <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
669
+				     <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
670
+				     <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
671
+				     <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
672
+				     <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
673
+				     <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
674
+				     <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
675
+				     <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
676
+				     <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
677
+				     <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
678
+				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
665
679
 			interrupt-names = "error",
666
680
 					  "ch0", "ch1", "ch2", "ch3",
667
681
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -679,22 +693,22 @@
679
693
 			compatible = "renesas,dmac-r8a7791",
680
694
 				     "renesas,rcar-dmac";
681
695
 			reg = <0 0xe6720000 0 0x20000>;
682
-			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
683
-				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
684
-				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
685
-				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
686
-				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
687
-				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
688
-				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
689
-				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
690
-				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
691
-				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
692
-				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
693
-				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
694
-				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
695
-				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
696
-				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
697
-				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
696
+			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
697
+				     <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
698
+				     <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
699
+				     <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
700
+				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
701
+				     <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
702
+				     <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
703
+				     <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
704
+				     <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
705
+				     <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
706
+				     <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
707
+				     <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
708
+				     <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
709
+				     <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
710
+				     <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
711
+				     <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
698
712
 			interrupt-names = "error",
699
713
 					  "ch0", "ch1", "ch2", "ch3",
700
714
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -1064,6 +1078,76 @@
1064
1078
 			status = "disabled";
1065
1079
 		};
1066
1080
 
1081
+		pwm0: pwm@e6e30000 {
1082
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1083
+			reg = <0 0xe6e30000 0 0x8>;
1084
+			clocks = <&cpg CPG_MOD 523>;
1085
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1086
+			resets = <&cpg 523>;
1087
+			#pwm-cells = <2>;
1088
+			status = "disabled";
1089
+		};
1090
+
1091
+		pwm1: pwm@e6e31000 {
1092
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1093
+			reg = <0 0xe6e31000 0 0x8>;
1094
+			clocks = <&cpg CPG_MOD 523>;
1095
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1096
+			resets = <&cpg 523>;
1097
+			#pwm-cells = <2>;
1098
+			status = "disabled";
1099
+		};
1100
+
1101
+		pwm2: pwm@e6e32000 {
1102
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1103
+			reg = <0 0xe6e32000 0 0x8>;
1104
+			clocks = <&cpg CPG_MOD 523>;
1105
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1106
+			resets = <&cpg 523>;
1107
+			#pwm-cells = <2>;
1108
+			status = "disabled";
1109
+		};
1110
+
1111
+		pwm3: pwm@e6e33000 {
1112
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1113
+			reg = <0 0xe6e33000 0 0x8>;
1114
+			clocks = <&cpg CPG_MOD 523>;
1115
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1116
+			resets = <&cpg 523>;
1117
+			#pwm-cells = <2>;
1118
+			status = "disabled";
1119
+		};
1120
+
1121
+		pwm4: pwm@e6e34000 {
1122
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1123
+			reg = <0 0xe6e34000 0 0x8>;
1124
+			clocks = <&cpg CPG_MOD 523>;
1125
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1126
+			resets = <&cpg 523>;
1127
+			#pwm-cells = <2>;
1128
+			status = "disabled";
1129
+		};
1130
+
1131
+		pwm5: pwm@e6e35000 {
1132
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1133
+			reg = <0 0xe6e35000 0 0x8>;
1134
+			clocks = <&cpg CPG_MOD 523>;
1135
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1136
+			resets = <&cpg 523>;
1137
+			#pwm-cells = <2>;
1138
+			status = "disabled";
1139
+		};
1140
+
1141
+		pwm6: pwm@e6e36000 {
1142
+			compatible = "renesas,pwm-r8a7791", "renesas,pwm-rcar";
1143
+			reg = <0 0xe6e36000 0 0x8>;
1144
+			clocks = <&cpg CPG_MOD 523>;
1145
+			power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
1146
+			resets = <&cpg 523>;
1147
+			#pwm-cells = <2>;
1148
+			status = "disabled";
1149
+		};
1150
+
1067
1151
 		adc: adc@e6e54000 {
1068
1152
 			compatible = "renesas,r8a7791-gyroadc",
1069
1153
 				     "renesas,rcar-gyroadc";
..
..
@@ -1338,20 +1422,20 @@
1338
1422
 			compatible = "renesas,dmac-r8a7791",
1339
1423
 				     "renesas,rcar-dmac";
1340
1424
 			reg = <0 0xec700000 0 0x10000>;
1341
-			interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
1342
-				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
1343
-				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
1344
-				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
1345
-				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
1346
-				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
1347
-				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
1348
-				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
1349
-				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
1350
-				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
1351
-				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
1352
-				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
1353
-				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
1354
-				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1425
+			interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
1426
+				     <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
1427
+				     <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
1428
+				     <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
1429
+				     <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
1430
+				     <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
1431
+				     <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
1432
+				     <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
1433
+				     <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
1434
+				     <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
1435
+				     <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
1436
+				     <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
1437
+				     <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
1438
+				     <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1355
1439
 			interrupt-names = "error",
1356
1440
 					  "ch0", "ch1", "ch2", "ch3",
1357
1441
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -1369,20 +1453,20 @@
1369
1453
 			compatible = "renesas,dmac-r8a7791",
1370
1454
 				     "renesas,rcar-dmac";
1371
1455
 			reg = <0 0xec720000 0 0x10000>;
1372
-			interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
1373
-				      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
1374
-				      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
1375
-				      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
1376
-				      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
1377
-				      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
1378
-				      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
1379
-				      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
1380
-				      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
1381
-				      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
1382
-				      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
1383
-				      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
1384
-				      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
1385
-				      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
1456
+			interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
1457
+				     <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
1458
+				     <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
1459
+				     <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
1460
+				     <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
1461
+				     <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
1462
+				     <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
1463
+				     <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
1464
+				     <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
1465
+				     <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
1466
+				     <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
1467
+				     <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
1468
+				     <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
1469
+				     <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
1386
1470
 			interrupt-names = "error",
1387
1471
 					  "ch0", "ch1", "ch2", "ch3",
1388
1472
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -1426,10 +1510,10 @@
1426
1510
 			#size-cells = <2>;
1427
1511
 			#interrupt-cells = <1>;
1428
1512
 			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
1429
-			interrupt-map-mask = <0xff00 0 0 0x7>;
1430
-			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1431
-					 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1432
-					 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
1513
+			interrupt-map-mask = <0xf800 0 0 0x7>;
1514
+			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1515
+					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1516
+					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
1433
1517
 
1434
1518
 			usb@1,0 {
1435
1519
 				reg = <0x800 0 0 0 0>;
..
..
@@ -1461,10 +1545,10 @@
1461
1545
 			#size-cells = <2>;
1462
1546
 			#interrupt-cells = <1>;
1463
1547
 			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
1464
-			interrupt-map-mask = <0xff00 0 0 0x7>;
1465
-			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1466
-					 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1467
-					 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
1548
+			interrupt-map-mask = <0xf800 0 0 0x7>;
1549
+			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1550
+					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1551
+					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
1468
1552
 
1469
1553
 			usb@1,0 {
1470
1554
 				reg = <0x10800 0 0 0 0>;
..
..
@@ -1479,7 +1563,7 @@
1479
1563
 			};
1480
1564
 		};
1481
1565
 
1482
-		sdhi0: sd@ee100000 {
1566
+		sdhi0: mmc@ee100000 {
1483
1567
 			compatible = "renesas,sdhi-r8a7791",
1484
1568
 				     "renesas,rcar-gen2-sdhi";
1485
1569
 			reg = <0 0xee100000 0 0x328>;
..
..
@@ -1494,7 +1578,7 @@
1494
1578
 			status = "disabled";
1495
1579
 		};
1496
1580
 
1497
-		sdhi1: sd@ee140000 {
1581
+		sdhi1: mmc@ee140000 {
1498
1582
 			compatible = "renesas,sdhi-r8a7791",
1499
1583
 				     "renesas,rcar-gen2-sdhi";
1500
1584
 			reg = <0 0xee140000 0 0x100>;
..
..
@@ -1509,7 +1593,7 @@
1509
1593
 			status = "disabled";
1510
1594
 		};
1511
1595
 
1512
-		sdhi2: sd@ee160000 {
1596
+		sdhi2: mmc@ee160000 {
1513
1597
 			compatible = "renesas,sdhi-r8a7791",
1514
1598
 				     "renesas,rcar-gen2-sdhi";
1515
1599
 			reg = <0 0xee160000 0 0x100>;
..
..
@@ -1598,13 +1682,13 @@
1598
1682
 			#size-cells = <2>;
1599
1683
 			bus-range = <0x00 0xff>;
1600
1684
 			device_type = "pci";
1601
-			ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
1602
-				  0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
1603
-				  0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
1604
-				  0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
1685
+			ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
1686
+				 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
1687
+				 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
1688
+				 <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
1605
1689
 			/* Map all possible DDR as inbound ranges */
1606
-			dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
1607
-				      0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
1690
+			dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>,
1691
+				     <0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
1608
1692
 			interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
1609
1693
 				     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
1610
1694
 				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
..
..
@@ -1678,9 +1762,10 @@
1678
1762
 			reg = <0 0xfeb00000 0 0x40000>;
1679
1763
 			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
1680
1764
 				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
1681
-			clocks = <&cpg CPG_MOD 724>,
1682
-				 <&cpg CPG_MOD 723>;
1765
+			clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
1683
1766
 			clock-names = "du.0", "du.1";
1767
+			resets = <&cpg 724>;
1768
+			reset-names = "du.0";
1684
1769
 			status = "disabled";
1685
1770
 
1686
1771
 			ports {