修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/r8a7793.dtsi
..
..
@@ -1,6 +1,6 @@
1
1
 // SPDX-License-Identifier: GPL-2.0
2
2
 /*
3
- * Device Tree Source for the r8a7793 SoC
3
+ * Device Tree Source for the R-Car M2-N (R8A77930) SoC
4
4
  *
5
5
  * Copyright (C) 2014-2015 Renesas Electronics Corporation
6
6
  */
..
..
@@ -271,7 +271,7 @@
271
271
 			resets = <&cpg 904>;
272
272
 		};
273
273
 
274
-		pfc: pin-controller@e6060000 {
274
+		pfc: pinctrl@e6060000 {
275
275
 			compatible = "renesas,pfc-r8a7793";
276
276
 			reg = <0 0xe6060000 0 0x250>;
277
277
 		};
..
..
@@ -336,7 +336,7 @@
336
336
 			#thermal-sensor-cells = <0>;
337
337
 		};
338
338
 
339
-		ipmmu_sy0: mmu@e6280000 {
339
+		ipmmu_sy0: iommu@e6280000 {
340
340
 			compatible = "renesas,ipmmu-r8a7793",
341
341
 				     "renesas,ipmmu-vmsa";
342
342
 			reg = <0 0xe6280000 0 0x1000>;
..
..
@@ -346,7 +346,7 @@
346
346
 			status = "disabled";
347
347
 		};
348
348
 
349
-		ipmmu_sy1: mmu@e6290000 {
349
+		ipmmu_sy1: iommu@e6290000 {
350
350
 			compatible = "renesas,ipmmu-r8a7793",
351
351
 				     "renesas,ipmmu-vmsa";
352
352
 			reg = <0 0xe6290000 0 0x1000>;
..
..
@@ -355,7 +355,7 @@
355
355
 			status = "disabled";
356
356
 		};
357
357
 
358
-		ipmmu_ds: mmu@e6740000 {
358
+		ipmmu_ds: iommu@e6740000 {
359
359
 			compatible = "renesas,ipmmu-r8a7793",
360
360
 				     "renesas,ipmmu-vmsa";
361
361
 			reg = <0 0xe6740000 0 0x1000>;
..
..
@@ -365,7 +365,7 @@
365
365
 			status = "disabled";
366
366
 		};
367
367
 
368
-		ipmmu_mp: mmu@ec680000 {
368
+		ipmmu_mp: iommu@ec680000 {
369
369
 			compatible = "renesas,ipmmu-r8a7793",
370
370
 				     "renesas,ipmmu-vmsa";
371
371
 			reg = <0 0xec680000 0 0x1000>;
..
..
@@ -374,7 +374,7 @@
374
374
 			status = "disabled";
375
375
 		};
376
376
 
377
-		ipmmu_mx: mmu@fe951000 {
377
+		ipmmu_mx: iommu@fe951000 {
378
378
 			compatible = "renesas,ipmmu-r8a7793",
379
379
 				     "renesas,ipmmu-vmsa";
380
380
 			reg = <0 0xfe951000 0 0x1000>;
..
..
@@ -384,7 +384,7 @@
384
384
 			status = "disabled";
385
385
 		};
386
386
 
387
-		ipmmu_rt: mmu@ffc80000 {
387
+		ipmmu_rt: iommu@ffc80000 {
388
388
 			compatible = "renesas,ipmmu-r8a7793",
389
389
 				     "renesas,ipmmu-vmsa";
390
390
 			reg = <0 0xffc80000 0 0x1000>;
..
..
@@ -393,7 +393,7 @@
393
393
 			status = "disabled";
394
394
 		};
395
395
 
396
-		ipmmu_gp: mmu@e62a0000 {
396
+		ipmmu_gp: iommu@e62a0000 {
397
397
 			compatible = "renesas,ipmmu-r8a7793",
398
398
 				     "renesas,ipmmu-vmsa";
399
399
 			reg = <0 0xe62a0000 0 0x1000>;
..
..
@@ -406,6 +406,9 @@
406
406
 		icram0:	sram@e63a0000 {
407
407
 			compatible = "mmio-sram";
408
408
 			reg = <0 0xe63a0000 0 0x12000>;
409
+			#address-cells = <1>;
410
+			#size-cells = <1>;
411
+			ranges = <0 0 0xe63a0000 0x12000>;
409
412
 		};
410
413
 
411
414
 		icram1:	sram@e63c0000 {
..
..
@@ -565,22 +568,22 @@
565
568
 			compatible = "renesas,dmac-r8a7793",
566
569
 				     "renesas,rcar-dmac";
567
570
 			reg = <0 0xe6700000 0 0x20000>;
568
-			interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
569
-				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
570
-				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
571
-				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
572
-				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
573
-				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
574
-				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
575
-				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
576
-				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
577
-				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
578
-				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
579
-				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
580
-				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
581
-				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
582
-				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
583
-				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
571
+			interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,
572
+				     <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
573
+				     <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
574
+				     <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
575
+				     <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
576
+				     <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
577
+				     <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
578
+				     <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
579
+				     <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
580
+				     <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
581
+				     <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
582
+				     <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
583
+				     <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
584
+				     <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
585
+				     <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
586
+				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
584
587
 			interrupt-names = "error",
585
588
 					  "ch0", "ch1", "ch2", "ch3",
586
589
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -598,22 +601,22 @@
598
601
 			compatible = "renesas,dmac-r8a7793",
599
602
 				     "renesas,rcar-dmac";
600
603
 			reg = <0 0xe6720000 0 0x20000>;
601
-			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
602
-				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
603
-				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
604
-				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
605
-				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
606
-				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
607
-				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
608
-				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
609
-				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
610
-				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
611
-				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
612
-				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
613
-				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
614
-				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
615
-				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
616
-				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
604
+			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
605
+				     <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
606
+				     <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
607
+				     <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
608
+				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
609
+				     <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
610
+				     <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
611
+				     <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
612
+				     <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
613
+				     <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
614
+				     <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
615
+				     <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
616
+				     <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
617
+				     <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
618
+				     <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
619
+				     <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
617
620
 			interrupt-names = "error",
618
621
 					  "ch0", "ch1", "ch2", "ch3",
619
622
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -1166,20 +1169,20 @@
1166
1169
 			compatible = "renesas,dmac-r8a7793",
1167
1170
 				     "renesas,rcar-dmac";
1168
1171
 			reg = <0 0xec700000 0 0x10000>;
1169
-			interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
1170
-				      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
1171
-				      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
1172
-				      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
1173
-				      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
1174
-				      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
1175
-				      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
1176
-				      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
1177
-				      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
1178
-				      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
1179
-				      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
1180
-				      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
1181
-				      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
1182
-				      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1172
+			interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
1173
+				     <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
1174
+				     <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
1175
+				     <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
1176
+				     <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
1177
+				     <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
1178
+				     <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
1179
+				     <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
1180
+				     <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
1181
+				     <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
1182
+				     <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
1183
+				     <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
1184
+				     <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
1185
+				     <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
1183
1186
 			interrupt-names = "error",
1184
1187
 					  "ch0", "ch1", "ch2", "ch3",
1185
1188
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -1197,20 +1200,20 @@
1197
1200
 			compatible = "renesas,dmac-r8a7793",
1198
1201
 				     "renesas,rcar-dmac";
1199
1202
 			reg = <0 0xec720000 0 0x10000>;
1200
-			interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
1201
-				      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
1202
-				      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
1203
-				      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
1204
-				      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
1205
-				      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
1206
-				      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
1207
-				      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
1208
-				      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
1209
-				      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
1210
-				      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
1211
-				      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
1212
-				      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
1213
-				      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
1203
+			interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
1204
+				     <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
1205
+				     <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
1206
+				     <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
1207
+				     <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
1208
+				     <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
1209
+				     <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
1210
+				     <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
1211
+				     <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
1212
+				     <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
1213
+				     <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
1214
+				     <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
1215
+				     <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
1216
+				     <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
1214
1217
 			interrupt-names = "error",
1215
1218
 					  "ch0", "ch1", "ch2", "ch3",
1216
1219
 					  "ch4", "ch5", "ch6", "ch7",
..
..
@@ -1224,7 +1227,7 @@
1224
1227
 			dma-channels = <13>;
1225
1228
 		};
1226
1229
 
1227
-		sdhi0: sd@ee100000 {
1230
+		sdhi0: mmc@ee100000 {
1228
1231
 			compatible = "renesas,sdhi-r8a7793",
1229
1232
 				     "renesas,rcar-gen2-sdhi";
1230
1233
 			reg = <0 0xee100000 0 0x328>;
..
..
@@ -1239,7 +1242,7 @@
1239
1242
 			status = "disabled";
1240
1243
 		};
1241
1244
 
1242
-		sdhi1: sd@ee140000 {
1245
+		sdhi1: mmc@ee140000 {
1243
1246
 			compatible = "renesas,sdhi-r8a7793",
1244
1247
 				     "renesas,rcar-gen2-sdhi";
1245
1248
 			reg = <0 0xee140000 0 0x100>;
..
..
@@ -1254,7 +1257,7 @@
1254
1257
 			status = "disabled";
1255
1258
 		};
1256
1259
 
1257
-		sdhi2: sd@ee160000 {
1260
+		sdhi2: mmc@ee160000 {
1258
1261
 			compatible = "renesas,sdhi-r8a7793",
1259
1262
 				     "renesas,rcar-gen2-sdhi";
1260
1263
 			reg = <0 0xee160000 0 0x100>;
..
..
@@ -1338,9 +1341,10 @@
1338
1341
 			reg = <0 0xfeb00000 0 0x40000>;
1339
1342
 			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
1340
1343
 				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
1341
-			clocks = <&cpg CPG_MOD 724>,
1342
-				 <&cpg CPG_MOD 723>;
1344
+			clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
1343
1345
 			clock-names = "du.0", "du.1";
1346
+			resets = <&cpg 724>;
1347
+			reset-names = "du.0";
1344
1348
 			status = "disabled";
1345
1349
 
1346
1350
 			ports {