修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/rv1106.dtsi
..
..
@@ -9,6 +9,7 @@
9
9
 #include <dt-bindings/pinctrl/rockchip.h>
10
10
 #include <dt-bindings/soc/rockchip,boot-mode.h>
11
11
 #include <dt-bindings/soc/rockchip-system-status.h>
12
+#include <dt-bindings/suspend/rockchip-rv1106.h>
12
13
 #include <dt-bindings/thermal/thermal.h>
13
14
 
14
15
 / {
..
..
@@ -239,6 +240,18 @@
239
240
 		};
240
241
 	};
241
242
 
243
+	mipi0_csi2: mipi0-csi2 {
244
+		compatible = "rockchip,rv1106-mipi-csi2";
245
+		rockchip,hw = <&mipi0_csi2_hw>, <&mipi1_csi2_hw>;
246
+		status = "disabled";
247
+	};
248
+
249
+	mipi1_csi2: mipi1-csi2 {
250
+		compatible = "rockchip,rv1106-mipi-csi2";
251
+		rockchip,hw = <&mipi0_csi2_hw>, <&mipi1_csi2_hw>;
252
+		status = "disabled";
253
+	};
254
+
242
255
 	mpp_srv: mpp-srv {
243
256
 		compatible = "rockchip,mpp-service";
244
257
 		rockchip,taskqueue-count = <2>;
..
..
@@ -314,6 +327,55 @@
314
327
 		compatible = "rockchip,rkisp-vir";
315
328
 		rockchip,hw = <&rkisp>;
316
329
 		status = "disabled";
330
+	};
331
+
332
+	rockchip_suspend: rockchip-suspend {
333
+		compatible = "rockchip,pm-config";
334
+		status = "okay";
335
+		rockchip,sleep-io-config = <
336
+			(0
337
+			| RKPM_IO_CFG_IOMUX_GPIO
338
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
339
+			| RKPM_IO_CFG_PULL_DOWN
340
+			| RKPM_IO_CFG_ID(0)
341
+			)
342
+			(0
343
+			| RKPM_IO_CFG_IOMUX_GPIO
344
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
345
+			| RKPM_IO_CFG_PULL_DOWN
346
+			| RKPM_IO_CFG_ID(1)
347
+			)
348
+			(0
349
+			| RKPM_IO_CFG_IOMUX_GPIO
350
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
351
+			| RKPM_IO_CFG_PULL_DOWN
352
+			| RKPM_IO_CFG_ID(2)
353
+			)
354
+			(0
355
+			| RKPM_IO_CFG_IOMUX_GPIO
356
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
357
+			| RKPM_IO_CFG_PULL_UP
358
+			| RKPM_IO_CFG_ID(3)
359
+			)
360
+			(0
361
+			| RKPM_IO_CFG_IOMUX_GPIO
362
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
363
+			| RKPM_IO_CFG_PULL_UP
364
+			| RKPM_IO_CFG_ID(4)
365
+			)
366
+			(0
367
+			| RKPM_IO_CFG_IOMUX_GPIO
368
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
369
+			| RKPM_IO_CFG_PULL_NONE
370
+			| RKPM_IO_CFG_ID(5)
371
+			)
372
+			(0
373
+			| RKPM_IO_CFG_IOMUX_GPIO
374
+			| RKPM_IO_CFG_GPIO_DIR_INPUT
375
+			| RKPM_IO_CFG_PULL_NONE
376
+			| RKPM_IO_CFG_ID(6)
377
+			)
378
+		>;
317
379
 	};
318
380
 
319
381
 	rockchip_system_monitor: rockchip-system-monitor {
..
..
@@ -1014,6 +1076,8 @@
1014
1076
 		#size-cells = <0>;
1015
1077
 		clocks = <&cru CLK_SPI1>, <&cru PCLK_SPI1>;
1016
1078
 		clock-names = "spiclk", "apb_pclk";
1079
+		assigned-clocks = <&cru CLK_SPI1>;
1080
+		assigned-clock-rates = <200000000>;
1017
1081
 		dmas = <&dmac 3>, <&dmac 2>;
1018
1082
 		dma-names = "tx", "rx";
1019
1083
 		pinctrl-names = "default";
..
..
@@ -1173,8 +1237,8 @@
1173
1237
 		status = "disabled";
1174
1238
 	};
1175
1239
 
1176
-	mipi0_csi2: mipi-csi2@ffa20000 {
1177
-		compatible = "rockchip,rk3588-mipi-csi2";
1240
+	mipi0_csi2_hw: mipi-csi2-hw@ffa20000 {
1241
+		compatible = "rockchip,rv1106-mipi-csi2-hw";
1178
1242
 		reg = <0xffa20000 0x10000>;
1179
1243
 		reg-names = "csihost_regs";
1180
1244
 		interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
..
..
@@ -1184,11 +1248,11 @@
1184
1248
 		clock-names = "pclk_csi2host", "clk_rxbyte_hs";
1185
1249
 		resets = <&cru SRST_P_CSIHOST0>;
1186
1250
 		reset-names = "srst_csihost_p";
1187
-		status = "disabled";
1251
+		status = "okay";
1188
1252
 	};
1189
1253
 
1190
-	mipi1_csi2: mipi-csi2@ffa30000 {
1191
-		compatible = "rockchip,rk3588-mipi-csi2";
1254
+	mipi1_csi2_hw: mipi-csi2-hw@ffa30000 {
1255
+		compatible = "rockchip,rv1106-mipi-csi2-hw";
1192
1256
 		reg = <0xffa30000 0x10000>;
1193
1257
 		reg-names = "csihost_regs";
1194
1258
 		interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
..
..
@@ -1198,7 +1262,7 @@
1198
1262
 		clock-names = "pclk_csi2host", "clk_rxbyte_hs";
1199
1263
 		resets = <&cru SRST_P_CSIHOST1>;
1200
1264
 		reset-names = "srst_csihost_p";
1201
-		status = "disabled";
1265
+		status = "okay";
1202
1266
 	};
1203
1267
 
1204
1268
 	rkvenc: rkvenc@ffa50000 {
..
..
@@ -1409,6 +1473,7 @@
1409
1473
 			snps,dis-tx-ipgap-linecheck-quirk;
1410
1474
 			snps,usb2-gadget-lpm-disable;
1411
1475
 			snps,usb2-lpm-disable;
1476
+			snps,parkmode-disable-hs-quirk;
1412
1477
 			status = "disabled";
1413
1478
 		};
1414
1479
 	};