设置 recovery dtb

hc

2024-08-19 eb6b9ee90f50f13c5abb885ce483802d6262f2b5

 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
..
..
@@ -134,7 +134,7 @@
134
134
 	rk_headset: rk-headset {
135
135
 		status = "okay";
136
136
 		compatible = "rockchip_headset";
137
-		headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
137
+		headset_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
138
138
 		spk_ctl_gpio  = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
139
139
 		pinctrl-names = "default";
140
140
 		pinctrl-0 = <&hp_det>;
..
..
@@ -217,9 +217,9 @@
217
217
 */
218
218
 	vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
219
219
 		compatible = "regulator-fixed";
220
-		gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
221
-		pinctrl-names = "default";
222
-		pinctrl-0 = <&sd_s0_pwr>;
220
+		//gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
221
+		//pinctrl-names = "default";
222
+		//pinctrl-0 = <&sd_s0_pwr>;
223
223
 		regulator-name = "vcc_3v3_sd_s0";
224
224
 		enable-active-high;
225
225
 	};
..
..
@@ -241,9 +241,9 @@
241
241
 	wireless_wlan: wireless-wlan {
242
242
 		compatible = "wlan-platdata";
243
243
 		wifi_chip_type = "ap6398s";
244
-		pinctrl-names = "default";
245
-		pinctrl-0 = <&wifi_host_wake_irq>;
246
-		WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
244
+	//	pinctrl-names = "default";
245
+	//	pinctrl-0 = <&wifi_host_wake_irq>;
246
+	//	WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
247
247
 	//	WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
248
248
 		status = "okay";
249
249
 	};
..
..
@@ -273,10 +273,15 @@
273
273
 				gpio_function = <0>;
274
274
 			};//4G_PWREN_GPIO3_C7_u_3V3
275
275
 			
276
-//         	wake_4g {
277
-//				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
278
-//				gpio_function = <0>;
279
-//			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
276
+			5g_power {
277
+				gpio_num =<&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
278
+				gpio_function = <0>;
279
+			};
280
+			
281
+         	wake_wifi_bt {
282
+				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
283
+				gpio_function = <0>;
284
+			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
280
285
 			
281
286
 			air_mode_4g {
282
287
 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
..
..
@@ -287,6 +292,8 @@
287
292
 				gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
288
293
 				gpio_function = <3>;
289
294
 			};	//GPIO2_C3_d_1V8_4G_RESET_N_IN
295
+			
296
+			
290
297
 		};
291
298
 		
292
299
 		
..
..
@@ -365,13 +372,13 @@
365
372
 };
366
373
 
367
374
 &backlight {
368
-	pwms = <&pwm10 0 25000 0>;
375
+	pwms = <&pwm3 0 25000 0>;
369
376
 	status = "okay";
370
377
 };
371
378
 
372
379
 &backlight1 {
373
380
 	pwms = <&pwm11 0 25000 0>;
374
-	status = "okay";
381
+	status = "disabled";
375
382
 };
376
383
 
377
384
 &combphy0_ps {
..
..
@@ -517,12 +524,12 @@
517
524
 
518
525
 /* Should work with at least 128MB cma reserved above. */
519
526
 &hdmirx_ctrler {
520
-	status = "disabled";
527
+	status = "okay";
521
528
 
522
529
 	#sound-dai-cells = <1>;
523
530
 	/* Effective level used to trigger HPD: 0-low, 1-high */
524
531
 	hpd-trigger-level = <1>;
525
-	hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
532
+	hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
526
533
 	pinctrl-names = "default";
527
534
 	pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
528
535
 };
..
..
@@ -840,7 +847,7 @@
840
847
 	phys = <&combphy2_psu PHY_TYPE_PCIE>;
841
848
 	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
842
849
 	vpcie3v3-supply = <&vcc3v3_pcie30>;
843
-	status = "okay";
850
+	status = "disabled";
844
851
 };//M.2 WIFI6
845
852
 
846
853
 &pcie2x1l0 {
..
..
@@ -890,13 +897,13 @@
890
897
 
891
898
 	hdmi {
892
899
 		hdmirx_det: hdmirx-det {
893
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
900
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
894
901
 		};
895
902
 	};
896
903
 
897
904
 	headphone {
898
905
 		hp_det: hp-det {
899
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
906
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
900
907
 		};
901
908
 		
902
909
 		spk_con: spk-con {
..
..
@@ -927,13 +934,13 @@
927
934
 			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
928
935
 		};
929
936
 	};
930
-
937
+/*
931
938
 	sdmmc {
932
939
 		sd_s0_pwr: sd-s0-pwr {
933
940
 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
934
941
 		};
935
942
 	};
936
-
943
+*/
937
944
 	touch {
938
945
 		touch_gpio: touch-gpio {
939
946
 			rockchip,pins =
..
..
@@ -958,13 +965,13 @@
958
965
 			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
959
966
 		};
960
967
 	};
961
-
968
+/*
962
969
 	wireless-wlan {
963
970
 		wifi_host_wake_irq: wifi-host-wake-irq {
964
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
971
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
965
972
 		};
966
973
 	};
967
-	
974
+*/	
968
975
 	
969
976
 	ndj_io_init{
970
977
 		ndj_io_gpio: ndj_io_gpio_col{
..
..
@@ -975,19 +982,21 @@
975
982
 					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
976
983
 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977
984
 					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
978
-					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
979
-					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
980
-					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
981
-					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8
982
-					<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CS0_M2_1V8
983
-					<0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MISO_M2_1V8
984
-					<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;  //SPI4_MOSI_M2_1V8
985
+					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v				
986
+					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8 41
987
+					<1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MISO_M2_1V8 32
988
+					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MOSI_M2_3V3 42
989
+					<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MOSI_M2_1V8 33
990
+					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8  43 
991
+					<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_CLK_M2_1V8  34
992
+					<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CS0_M2_1V8  44
993
+					<1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;  //SPI4_CS0_M2_1V8  35		 		
985
994
 		};
986
995
 	};
987
996
 };
988
997
 &pwm3 {
989
-	pinctrl-0 = <&pwm3m1_pins>;
990
998
 	status = "okay";
999
+	pinctrl-0 = <&pwm3m1_pins>;
991
1000
 };
992
1001
 
993
1002
 &route_dsi0 {
..
..
@@ -1001,12 +1010,12 @@
1001
1010
 };
1002
1011
 
1003
1012
 &pwm10 {
1004
-	status = "okay";
1013
+	status = "disabled";
1005
1014
 	pinctrl-0 = <&pwm10m2_pins>;
1006
1015
 };
1007
1016
 
1008
1017
 &pwm11 {
1009
-	status = "okay";
1018
+	status = "disabled";
1010
1019
 	pinctrl-0 = <&pwm11m3_pins>;
1011
1020
 };
1012
1021
 
..
..
@@ -1020,6 +1029,10 @@
1020
1029
 
1021
1030
 &sata0 {
1022
1031
 	status = "disabled";
1032
+};
1033
+
1034
+&sata2 {
1035
+	status = "okay";
1023
1036
 };
1024
1037
 
1025
1038
 &sdio {
..
..
@@ -1145,3 +1158,17 @@
1145
1158
 	pinctrl-names = "default";
1146
1159
 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
1147
1160
 };
1161
+
1162
+
1163
+&can0 {
1164
+	status = "okay";
1165
+	pinctrl-names = "default";
1166
+	pinctrl-0 = <&can0m0_pins>;
1167
+};
1168
+
1169
+
1170
+&can1 {
1171
+	status = "okay";
1172
+	pinctrl-names = "default";
1173
+	pinctrl-0 = <&can1m1_pins>;
1174
+};