forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/arch/arm/boot/dts/r8a7794.dtsi
....@@ -1,6 +1,6 @@
11 // SPDX-License-Identifier: GPL-2.0
22 /*
3
- * Device Tree Source for the r8a7794 SoC
3
+ * Device Tree Source for the R-Car E2 (R8A77940) SoC
44  *
55  * Copyright (C) 2014 Renesas Electronics Corporation
66  * Copyright (C) 2014 Ulrich Hecht
....@@ -238,7 +238,7 @@
238238 			resets = <&cpg 905>;
239239 		};
240240 
241
-		pfc: pin-controller@e6060000 {
241
+		pfc: pinctrl@e6060000 {
242242 			compatible = "renesas,pfc-r8a7794";
243243 			reg = <0 0xe6060000 0 0x11c>;
244244 		};
....@@ -290,7 +290,7 @@
290290 			resets = <&cpg 407>;
291291 		};
292292 
293
-		ipmmu_sy0: mmu@e6280000 {
293
+		ipmmu_sy0: iommu@e6280000 {
294294 			compatible = "renesas,ipmmu-r8a7794",
295295 				     "renesas,ipmmu-vmsa";
296296 			reg = <0 0xe6280000 0 0x1000>;
....@@ -300,7 +300,7 @@
300300 			status = "disabled";
301301 		};
302302 
303
-		ipmmu_sy1: mmu@e6290000 {
303
+		ipmmu_sy1: iommu@e6290000 {
304304 			compatible = "renesas,ipmmu-r8a7794",
305305 				     "renesas,ipmmu-vmsa";
306306 			reg = <0 0xe6290000 0 0x1000>;
....@@ -309,7 +309,7 @@
309309 			status = "disabled";
310310 		};
311311 
312
-		ipmmu_ds: mmu@e6740000 {
312
+		ipmmu_ds: iommu@e6740000 {
313313 			compatible = "renesas,ipmmu-r8a7794",
314314 				     "renesas,ipmmu-vmsa";
315315 			reg = <0 0xe6740000 0 0x1000>;
....@@ -319,7 +319,7 @@
319319 			status = "disabled";
320320 		};
321321 
322
-		ipmmu_mp: mmu@ec680000 {
322
+		ipmmu_mp: iommu@ec680000 {
323323 			compatible = "renesas,ipmmu-r8a7794",
324324 				     "renesas,ipmmu-vmsa";
325325 			reg = <0 0xec680000 0 0x1000>;
....@@ -328,7 +328,7 @@
328328 			status = "disabled";
329329 		};
330330 
331
-		ipmmu_mx: mmu@fe951000 {
331
+		ipmmu_mx: iommu@fe951000 {
332332 			compatible = "renesas,ipmmu-r8a7794",
333333 				     "renesas,ipmmu-vmsa";
334334 			reg = <0 0xfe951000 0 0x1000>;
....@@ -338,7 +338,7 @@
338338 			status = "disabled";
339339 		};
340340 
341
-		ipmmu_gp: mmu@e62a0000 {
341
+		ipmmu_gp: iommu@e62a0000 {
342342 			compatible = "renesas,ipmmu-r8a7794",
343343 				     "renesas,ipmmu-vmsa";
344344 			reg = <0 0xe62a0000 0 0x1000>;
....@@ -351,6 +351,9 @@
351351 		icram0:	sram@e63a0000 {
352352 			compatible = "mmio-sram";
353353 			reg = <0 0xe63a0000 0 0x12000>;
354
+			#address-cells = <1>;
355
+			#size-cells = <1>;
356
+			ranges = <0 0 0xe63a0000 0x12000>;
354357 		};
355358 
356359 		icram1:	sram@e63c0000 {
....@@ -527,22 +530,22 @@
527530 			compatible = "renesas,dmac-r8a7794",
528531 				     "renesas,rcar-dmac";
529532 			reg = <0 0xe6700000 0 0x20000>;
530
-			interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
531
-				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
532
-				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
533
-				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
534
-				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
535
-				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
536
-				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
537
-				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
538
-				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
539
-				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
540
-				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
541
-				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
542
-				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
543
-				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
544
-				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
545
-				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
533
+			interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,
534
+				     <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
535
+				     <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
536
+				     <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
537
+				     <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
538
+				     <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
539
+				     <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
540
+				     <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
541
+				     <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
542
+				     <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
543
+				     <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
544
+				     <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
545
+				     <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
546
+				     <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
547
+				     <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
548
+				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
546549 			interrupt-names = "error",
547550 					  "ch0", "ch1", "ch2", "ch3",
548551 					  "ch4", "ch5", "ch6", "ch7",
....@@ -560,22 +563,22 @@
560563 			compatible = "renesas,dmac-r8a7794",
561564 				     "renesas,rcar-dmac";
562565 			reg = <0 0xe6720000 0 0x20000>;
563
-			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
564
-				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
565
-				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
566
-				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
567
-				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
568
-				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
569
-				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
570
-				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
571
-				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
572
-				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
573
-				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
574
-				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
575
-				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
576
-				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
577
-				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
578
-				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
566
+			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
567
+				     <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
568
+				     <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
569
+				     <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
570
+				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
571
+				     <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
572
+				     <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
573
+				     <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
574
+				     <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
575
+				     <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
576
+				     <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
577
+				     <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
578
+				     <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
579
+				     <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
580
+				     <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
581
+				     <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
579582 			interrupt-names = "error",
580583 					  "ch0", "ch1", "ch2", "ch3",
581584 					  "ch4", "ch5", "ch6", "ch7",
....@@ -1132,20 +1135,20 @@
11321135 			compatible = "renesas,dmac-r8a7794",
11331136 				     "renesas,rcar-dmac";
11341137 			reg = <0 0xec700000 0 0x10000>;
1135
-			interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
1136
-				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
1137
-				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
1138
-				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
1139
-				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
1140
-				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
1141
-				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
1142
-				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
1143
-				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
1144
-				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
1145
-				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
1146
-				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
1147
-				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
1148
-				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1138
+			interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
1139
+				     <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
1140
+				     <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
1141
+				     <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
1142
+				     <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
1143
+				     <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
1144
+				     <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
1145
+				     <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
1146
+				     <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
1147
+				     <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
1148
+				     <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
1149
+				     <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
1150
+				     <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
1151
+				     <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
11491152 			interrupt-names = "error",
11501153 					  "ch0", "ch1", "ch2", "ch3", "ch4",
11511154 					  "ch5", "ch6", "ch7", "ch8", "ch9",
....@@ -1176,10 +1179,10 @@
11761179 			#size-cells = <2>;
11771180 			#interrupt-cells = <1>;
11781181 			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
1179
-			interrupt-map-mask = <0xff00 0 0 0x7>;
1180
-			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1181
-					 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
1182
-					 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
1182
+			interrupt-map-mask = <0xf800 0 0 0x7>;
1183
+			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1184
+					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
1185
+					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
11831186 
11841187 			usb@1,0 {
11851188 				reg = <0x800 0 0 0 0>;
....@@ -1211,10 +1214,10 @@
12111214 			#size-cells = <2>;
12121215 			#interrupt-cells = <1>;
12131216 			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
1214
-			interrupt-map-mask = <0xff00 0 0 0x7>;
1215
-			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1216
-					 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
1217
-					 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
1217
+			interrupt-map-mask = <0xf800 0 0 0x7>;
1218
+			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1219
+					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1220
+					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
12181221 
12191222 			usb@1,0 {
12201223 				reg = <0x10800 0 0 0 0>;
....@@ -1229,7 +1232,7 @@
12291232 			};
12301233 		};
12311234 
1232
-		sdhi0: sd@ee100000 {
1235
+		sdhi0: mmc@ee100000 {
12331236 			compatible = "renesas,sdhi-r8a7794",
12341237 				     "renesas,rcar-gen2-sdhi";
12351238 			reg = <0 0xee100000 0 0x328>;
....@@ -1244,7 +1247,7 @@
12441247 			status = "disabled";
12451248 		};
12461249 
1247
-		sdhi1: sd@ee140000 {
1250
+		sdhi1: mmc@ee140000 {
12481251 			compatible = "renesas,sdhi-r8a7794",
12491252 				     "renesas,rcar-gen2-sdhi";
12501253 			reg = <0 0xee140000 0 0x100>;
....@@ -1259,7 +1262,7 @@
12591262 			status = "disabled";
12601263 		};
12611264 
1262
-		sdhi2: sd@ee160000 {
1265
+		sdhi2: mmc@ee160000 {
12631266 			compatible = "renesas,sdhi-r8a7794",
12641267 				     "renesas,rcar-gen2-sdhi";
12651268 			reg = <0 0xee160000 0 0x100>;
....@@ -1349,11 +1352,12 @@
13491352 		du: display@feb00000 {
13501353 			compatible = "renesas,du-r8a7794";
13511354 			reg = <0 0xfeb00000 0 0x40000>;
1352
-			reg-names = "du";
13531355 			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
13541356 				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
13551357 			clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
13561358 			clock-names = "du.0", "du.1";
1359
+			resets = <&cpg 724>;
1360
+			reset-names = "du.0";
13571361 			status = "disabled";
13581362 
13591363 			ports {