forked from ~ljy/RK3588_XEN

blame | history | patch | commit | commitdiff
hc
2024-08-19 eb6b9ee90f50f13c5abb885ce483802d6262f2b5 
 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -128,14 +128,14 @@
128128 		 * - PDN (power down when low)
129129 		 */
130130 		post-power-on-delay-ms = <200>;
131
-		reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>;  //WIFI_REG_ON_H
131
+		reset-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;  //BT_DISABLE_GPIO1_C6_d_1V8
132132 	};
133133 
134134 	rk_headset: rk-headset {
135135 		status = "okay";
136136 		compatible = "rockchip_headset";
137
-		headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
138
-		spk_ctl_gpio  = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
137
+		headset_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
138
+		spk_ctl_gpio  = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
139139 		pinctrl-names = "default";
140140 		pinctrl-0 = <&hp_det>;
141141 		io-channels = <&saradc 3>;
....@@ -159,7 +159,7 @@
159159 		regulator-boot-on;
160160 		enable-active-high;
161161 		//gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
162
-		gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
162
+		gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
163163 		vin-supply = <&vcc_1v8_s0>;
164164 	};
165165 
....@@ -217,9 +217,9 @@
217217 */
218218 	vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
219219 		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>;
223223 		regulator-name = "vcc_3v3_sd_s0";
224224 		enable-active-high;
225225 	};
....@@ -230,20 +230,20 @@
230230 		clock-names = "ext_clock";
231231 		uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; //UART9_RTSn_M0_BT
232232 		pinctrl-names = "default", "rts_gpio";
233
-		pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>;
233
+		pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>;
234234 		pinctrl-1 = <&uart9_gpios>;
235
-		BT,reset_gpio    = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //BT_REG_ON_H
236
-		BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
237
-		BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
235
+		BT,reset_gpio    = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //BT_DISABLE_GPIO0_B2_u_1V8
236
+		//BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
237
+		//BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
238238 		status = "okay";
239239 	};
240240 
241241 	wireless_wlan: wireless-wlan {
242242 		compatible = "wlan-platdata";
243243 		wifi_chip_type = "ap6398s";
244
-		pinctrl-names = "default";
245
-		pinctrl-0 = <&wifi_host_wake_irq>;
246
-		WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //WIFI_WAKE_HOST_H
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
247247 	//	WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
248248 		status = "okay";
249249 	};
....@@ -252,58 +252,48 @@
252252            	compatible = "nk_io_control";
253253 			pinctrl-names = "default";
254254           	pinctrl-0 = <&ndj_io_gpio>;
255
-						
256
-//			vcc_5v {
257
-//				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
258
-//				gpio_function = <0>;
259
-//			};
260
-			
255
+									
261256 			vcc_12v {
262
-				gpio_num = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
257
+				gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
263258 				gpio_function = <0>;
264
-			};
259
+			};//VCC12_IO_EN_GPIO0_D3_u_3V3
265260 			
266261 			vcc_3v {
267
-				gpio_num = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
262
+				gpio_num = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
268263 				gpio_function = <0>;
269
-			};
264
+			};//VCC3_IO_EN_GPIO4_A1_d_3V3
270265 			
271266            	hub_5V_reset {
272
-				gpio_num = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
267
+				gpio_num = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; 
273268 				gpio_function = <3>;
274
-			};
269
+			};//HUB_RESET_GPIO4_B6_d_3V3
275270 			
276271 			4g_power {
277
-				gpio_num = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
272
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
273
+				gpio_function = <0>;
274
+			};//4G_PWREN_GPIO3_C7_u_3V3
275
+			
276
+			5g_power {
277
+				gpio_num =<&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
278278 				gpio_function = <0>;
279279 			};
280280 			
281
-           	wake_4g {
281
+         	wake_wifi_bt {
282282 				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
283283 				gpio_function = <0>;
284
-			};
284
+			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
285285 			
286286 			air_mode_4g {
287287 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
288288 				gpio_function = <0>;
289
-			};			
289
+			};	//GPIO2_B4_u_1V8_4G_AIR_MODE_IN		
290290 			
291291 			reset_4g {
292292 				gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
293293 				gpio_function = <3>;
294
-			};	
295
-/*
296
-			spk_ctl {
297
-				gpio_num = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
298
-				gpio_function = <0>;
299
-			};
294
+			};	//GPIO2_C3_d_1V8_4G_RESET_N_IN
300295 			
301
-			hp_det
302
-			 {
303
-				gpio_num = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
304
-				gpio_function = <1>;
305
-			};
306
-*/
296
+			
307297 		};
308298 		
309299 		
....@@ -311,12 +301,11 @@
311301                compatible = "simple-panel";
312302                backlight = <&backlight>;
313303                power-supply = <&vcc3v3_lcd_n>;
314
-			   vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
315
-			   vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;  //MIPIDIS_PWR_EN_1V8
316
-               enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN
317
-               reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
318
-               edp-bl-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;  //LCD_BLK-PWR_EN
319
-               edp-bl-en = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_D4_d_3V3
304
+			   vcc-5v-gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;	//VCC5_IO_EN_GPIO4_B5_d_3V3		   
305
+               enable-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN_GPIO3_C6_u_3V3
306
+               reset-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
307
+               edp-bl-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>;  //LCD_BKL_PWM3_3V3
308
+               edp-bl-en = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_A6_d_3V3
320309                bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
321310                bpc = <8>;
322311                prepare-delay-ms = <200>;
....@@ -383,8 +372,13 @@
383372 };
384373 
385374 &backlight {
386
-	pwms = <&pwm10 0 25000 0>;
375
+	pwms = <&pwm3 0 25000 0>;
387376 	status = "okay";
377
+};
378
+
379
+&backlight1 {
380
+	pwms = <&pwm11 0 25000 0>;
381
+	status = "disabled";
388382 };
389383 
390384 &combphy0_ps {
....@@ -432,6 +426,10 @@
432426  * mipi_dcphy0 needs to be enabled
433427  * when dsi0 is enabled
434428  */
429
+&mipi_dcphy0 {
430
+	status = "disabled";
431
+}; 
432
+ 
435433 &dsi0 {
436434 	status = "disabled";
437435 };
....@@ -441,14 +439,7 @@
441439 };
442440 
443441 &dsi0_in_vp3 {
444
-	status = "disabled";
445
-};
446
-
447
-&dsi0_panel {
448
-	power-supply = <&vcc3v3_lcd_n>;
449
-	reset-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>;
450
-	pinctrl-names = "default";
451
-	pinctrl-0 = <&lcd_rst_gpio>;
442
+	status = "okay";
452443 };
453444 
454445 /*
....@@ -502,7 +493,7 @@
502493 	/* rx_delay = <0x3f>; */
503494 
504495 	phy-handle = <&rgmii_phy>;
505
-	status = "disabled";
496
+	status = "okay";
506497 };
507498 
508499 &hdmi0 {
....@@ -533,12 +524,12 @@
533524 
534525 /* Should work with at least 128MB cma reserved above. */
535526 &hdmirx_ctrler {
536
-	status = "disabled";
527
+	status = "okay";
537528 
538529 	#sound-dai-cells = <1>;
539530 	/* Effective level used to trigger HPD: 0-low, 1-high */
540531 	hpd-trigger-level = <1>;
541
-	hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
532
+	hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
542533 	pinctrl-names = "default";
543534 	pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
544535 };
....@@ -839,9 +830,7 @@
839830 	};
840831 };
841832 
842
-&mipi_dcphy0 {
843
-	status = "okay";
844
-};
833
+
845834 
846835 &mipi_dcphy1 {
847836 	status = "disabled";
....@@ -849,21 +838,21 @@
849838 
850839 &pcie2x1l2 {
851840 	phys = <&combphy0_ps PHY_TYPE_PCIE>;
852
-	reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
841
+	reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
853842 	vpcie3v3-supply = <&vcc3v3_pcie30>;
854843 	status = "okay";
855844 };//MINIPCIE
856845 
857846 &pcie2x1l1 {
858847 	phys = <&combphy2_psu PHY_TYPE_PCIE>;
859
-	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
848
+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
860849 	vpcie3v3-supply = <&vcc3v3_pcie30>;
861
-	status = "okay";
850
+	status = "disabled";
862851 };//M.2 WIFI6
863852 
864853 &pcie2x1l0 {
865854 	phys = <&combphy1_ps PHY_TYPE_PCIE>;
866
-	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
855
+	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;  //PCIEx1_0_PERSTn_M1_L
867856 	vpcie3v3-supply = <&vcc3v3_pcie30>;
868857 	status = "okay";
869858 };//RTL8111H
....@@ -908,17 +897,17 @@
908897 
909898 	hdmi {
910899 		hdmirx_det: hdmirx-det {
911
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
900
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
912901 		};
913902 	};
914903 
915904 	headphone {
916905 		hp_det: hp-det {
917
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
906
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
918907 		};
919908 		
920909 		spk_con: spk-con {
921
-			rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
910
+			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
922911 		};
923912 	};
924913 
....@@ -930,7 +919,7 @@
930919 
931920 	lcd {
932921 		lcd_rst_gpio: lcd-rst-gpio {
933
-			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
922
+			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
934923 		};
935924 	};
936925 
....@@ -942,16 +931,16 @@
942931 
943932 	sdio-pwrseq {
944933 		wifi_enable_h: wifi-enable-h {
945
-			rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
934
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
946935 		};
947936 	};
948
-
937
+/*
949938 	sdmmc {
950939 		sd_s0_pwr: sd-s0-pwr {
951940 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
952941 		};
953942 	};
954
-
943
+*/
955944 	touch {
956945 		touch_gpio: touch-gpio {
957946 			rockchip,pins =
....@@ -973,55 +962,45 @@
973962 		};
974963 
975964 		bt_reset_gpio: bt-reset-gpio {
976
-			rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
977
-		};
978
-
979
-		bt_wake_gpio: bt-wake-gpio {
980
-			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
981
-		};
982
-
983
-		bt_irq_gpio: bt-irq-gpio {
984
-			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
965
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
985966 		};
986967 	};
987
-
968
+/*
988969 	wireless-wlan {
989970 		wifi_host_wake_irq: wifi-host-wake-irq {
990
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
971
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
991972 		};
992973 	};
993
-	
974
+*/	
994975 	
995976 	ndj_io_init{
996977 		ndj_io_gpio: ndj_io_gpio_col{
997978 				rockchip,pins =
998
-					<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
999
-					<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
1000
-					<4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
1001
-					<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
1002
-					<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
979
+					<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
980
+					<4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
981
+					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
982
+					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
1003983 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
1004984 					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
1005
-					<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
1006
-					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO4_B5_d_3V3
1007
-					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO4_B6_d_3V3
1008
-					<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B0_u_3V3
1009
-					<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B2_d_3V3
1010
-					<3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B3_u_3V3
1011
-					<3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B4_u_3V3
1012
-					<3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_A7_u_3V3
1013
-					<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;  //GPIO3_A0_u_3V3
1014
-
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		 		
1015994 		};
1016995 	};
1017996 };
1018997 &pwm3 {
1019
-	pinctrl-0 = <&pwm3m1_pins>;
1020998 	status = "okay";
999
+	pinctrl-0 = <&pwm3m1_pins>;
10211000 };
10221001 
10231002 &route_dsi0 {
1024
-	status = "okay";
1003
+	status = "disabled";
10251004 	connect = <&vp3_out_dsi0>;
10261005 };
10271006 
....@@ -1031,8 +1010,13 @@
10311010 };
10321011 
10331012 &pwm10 {
1034
-	status = "okay";
1013
+	status = "disabled";
10351014 	pinctrl-0 = <&pwm10m2_pins>;
1015
+};
1016
+
1017
+&pwm11 {
1018
+	status = "disabled";
1019
+	pinctrl-0 = <&pwm11m3_pins>;
10361020 };
10371021 
10381022 &route_hdmi0 {
....@@ -1045,6 +1029,10 @@
10451029 
10461030 &sata0 {
10471031 	status = "disabled";
1032
+};
1033
+
1034
+&sata2 {
1035
+	status = "okay";
10481036 };
10491037 
10501038 &sdio {
....@@ -1128,7 +1116,7 @@
11281116 };
11291117 
11301118 &uart3 {
1131
-	status = "okay";
1119
+	status = "disabled";
11321120 	pinctrl-names = "default";
11331121 	pinctrl-0 = <&uart3m1_xfer>;
11341122 };
....@@ -1159,7 +1147,7 @@
11591147 };
11601148 
11611149 &uart8 {
1162
-	status = "okay";
1150
+	status = "disabled";
11631151 	pinctrl-names = "default";
11641152 	pinctrl-0 = <&uart8m1_xfer>;
11651153 };
....@@ -1170,3 +1158,17 @@
11701158 	pinctrl-names = "default";
11711159 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11721160 };
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
+};