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,20 +159,9 @@
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 	};
165
-
166
-	 vcc3v3_lcd1_n: vcc3v3-lcd1-n {
167
-        compatible = "regulator-fixed";
168
-        regulator-name = "vcc3v3_lcd1_n";
169
-        regulator-boot-on;
170
-        regulator-min-microvolt = <3300000>;
171
-        regulator-max-microvolt = <3300000>;
172
-        enable-active-high;
173
-        gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
174
-    };
175
-
176165 
177166 	vcc3v3_pcie30: vcc3v3-pcie30 {
178167 		compatible = "regulator-fixed";
....@@ -228,9 +217,9 @@
228217 */
229218 	vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
230219 		compatible = "regulator-fixed";
231
-		gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
232
-		pinctrl-names = "default";
233
-		pinctrl-0 = <&sd_s0_pwr>;
220
+		//gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
221
+		//pinctrl-names = "default";
222
+		//pinctrl-0 = <&sd_s0_pwr>;
234223 		regulator-name = "vcc_3v3_sd_s0";
235224 		enable-active-high;
236225 	};
....@@ -241,20 +230,20 @@
241230 		clock-names = "ext_clock";
242231 		uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; //UART9_RTSn_M0_BT
243232 		pinctrl-names = "default", "rts_gpio";
244
-		pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>;
233
+		pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>;
245234 		pinctrl-1 = <&uart9_gpios>;
246
-		BT,reset_gpio    = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //BT_REG_ON_H
247
-		BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
248
-		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
249238 		status = "okay";
250239 	};
251240 
252241 	wireless_wlan: wireless-wlan {
253242 		compatible = "wlan-platdata";
254243 		wifi_chip_type = "ap6398s";
255
-		pinctrl-names = "default";
256
-		pinctrl-0 = <&wifi_host_wake_irq>;
257
-		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
258247 	//	WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
259248 		status = "okay";
260249 	};
....@@ -263,58 +252,48 @@
263252            	compatible = "nk_io_control";
264253 			pinctrl-names = "default";
265254           	pinctrl-0 = <&ndj_io_gpio>;
266
-						
267
-//			vcc_5v {
268
-//				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
269
-//				gpio_function = <0>;
270
-//			};
271
-			
255
+									
272256 			vcc_12v {
273
-				gpio_num = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
257
+				gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
274258 				gpio_function = <0>;
275
-			};
259
+			};//VCC12_IO_EN_GPIO0_D3_u_3V3
276260 			
277261 			vcc_3v {
278
-				gpio_num = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
262
+				gpio_num = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
279263 				gpio_function = <0>;
280
-			};
264
+			};//VCC3_IO_EN_GPIO4_A1_d_3V3
281265 			
282266            	hub_5V_reset {
283
-				gpio_num = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
267
+				gpio_num = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; 
284268 				gpio_function = <3>;
285
-			};
269
+			};//HUB_RESET_GPIO4_B6_d_3V3
286270 			
287271 			4g_power {
288
-				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>;
289278 				gpio_function = <0>;
290279 			};
291280 			
292
-           	wake_4g {
281
+         	wake_wifi_bt {
293282 				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
294283 				gpio_function = <0>;
295
-			};
284
+			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
296285 			
297286 			air_mode_4g {
298287 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
299288 				gpio_function = <0>;
300
-			};			
289
+			};	//GPIO2_B4_u_1V8_4G_AIR_MODE_IN		
301290 			
302291 			reset_4g {
303292 				gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
304293 				gpio_function = <3>;
305
-			};	
306
-/*
307
-			spk_ctl {
308
-				gpio_num = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
309
-				gpio_function = <0>;
310
-			};
294
+			};	//GPIO2_C3_d_1V8_4G_RESET_N_IN
311295 			
312
-			hp_det
313
-			 {
314
-				gpio_num = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
315
-				gpio_function = <1>;
316
-			};
317
-*/
296
+			
318297 		};
319298 		
320299 		
....@@ -322,11 +301,11 @@
322301                compatible = "simple-panel";
323302                backlight = <&backlight>;
324303                power-supply = <&vcc3v3_lcd_n>;
325
-			   vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;			   
326
-               enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN
327
-               reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
328
-               edp-bl-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;  //LCD_BLK-PWR_EN
329
-               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
330309                bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
331310                bpc = <8>;
332311                prepare-delay-ms = <200>;
....@@ -393,13 +372,13 @@
393372 };
394373 
395374 &backlight {
396
-	pwms = <&pwm10 0 25000 0>;
375
+	pwms = <&pwm3 0 25000 0>;
397376 	status = "okay";
398377 };
399378 
400379 &backlight1 {
401380 	pwms = <&pwm11 0 25000 0>;
402
-	status = "okay";
381
+	status = "disabled";
403382 };
404383 
405384 &combphy0_ps {
....@@ -448,11 +427,11 @@
448427  * when dsi0 is enabled
449428  */
450429 &mipi_dcphy0 {
451
-	status = "okay";
430
+	status = "disabled";
452431 }; 
453432  
454433 &dsi0 {
455
-	status = "okay";
434
+	status = "disabled";
456435 };
457436 
458437 &dsi0_in_vp2 {
....@@ -461,14 +440,6 @@
461440 
462441 &dsi0_in_vp3 {
463442 	status = "okay";
464
-};
465
-
466
-&dsi0_panel {
467
-	power-supply = <&vcc3v3_lcd1_n>;  //LCD_PWREN_H
468
-	reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>;  //MIPIDIS_RST_GPIO1_A0_d_1V8
469
-	vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
470
-	pinctrl-names = "default";
471
-	pinctrl-0 = <&lcd_rst_gpio>;
472443 };
473444 
474445 /*
....@@ -522,7 +493,7 @@
522493 	/* rx_delay = <0x3f>; */
523494 
524495 	phy-handle = <&rgmii_phy>;
525
-	status = "disabled";
496
+	status = "okay";
526497 };
527498 
528499 &hdmi0 {
....@@ -553,12 +524,12 @@
553524 
554525 /* Should work with at least 128MB cma reserved above. */
555526 &hdmirx_ctrler {
556
-	status = "disabled";
527
+	status = "okay";
557528 
558529 	#sound-dai-cells = <1>;
559530 	/* Effective level used to trigger HPD: 0-low, 1-high */
560531 	hpd-trigger-level = <1>;
561
-	hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
532
+	hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
562533 	pinctrl-names = "default";
563534 	pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
564535 };
....@@ -867,21 +838,21 @@
867838 
868839 &pcie2x1l2 {
869840 	phys = <&combphy0_ps PHY_TYPE_PCIE>;
870
-	reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
841
+	reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
871842 	vpcie3v3-supply = <&vcc3v3_pcie30>;
872843 	status = "okay";
873844 };//MINIPCIE
874845 
875846 &pcie2x1l1 {
876847 	phys = <&combphy2_psu PHY_TYPE_PCIE>;
877
-	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
848
+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
878849 	vpcie3v3-supply = <&vcc3v3_pcie30>;
879
-	status = "okay";
850
+	status = "disabled";
880851 };//M.2 WIFI6
881852 
882853 &pcie2x1l0 {
883854 	phys = <&combphy1_ps PHY_TYPE_PCIE>;
884
-	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
855
+	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;  //PCIEx1_0_PERSTn_M1_L
885856 	vpcie3v3-supply = <&vcc3v3_pcie30>;
886857 	status = "okay";
887858 };//RTL8111H
....@@ -926,17 +897,17 @@
926897 
927898 	hdmi {
928899 		hdmirx_det: hdmirx-det {
929
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
900
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
930901 		};
931902 	};
932903 
933904 	headphone {
934905 		hp_det: hp-det {
935
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
906
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
936907 		};
937908 		
938909 		spk_con: spk-con {
939
-			rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
910
+			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
940911 		};
941912 	};
942913 
....@@ -960,16 +931,16 @@
960931 
961932 	sdio-pwrseq {
962933 		wifi_enable_h: wifi-enable-h {
963
-			rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
934
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
964935 		};
965936 	};
966
-
937
+/*
967938 	sdmmc {
968939 		sd_s0_pwr: sd-s0-pwr {
969940 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
970941 		};
971942 	};
972
-
943
+*/
973944 	touch {
974945 		touch_gpio: touch-gpio {
975946 			rockchip,pins =
....@@ -991,55 +962,45 @@
991962 		};
992963 
993964 		bt_reset_gpio: bt-reset-gpio {
994
-			rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
995
-		};
996
-
997
-		bt_wake_gpio: bt-wake-gpio {
998
-			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
999
-		};
1000
-
1001
-		bt_irq_gpio: bt-irq-gpio {
1002
-			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
965
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
1003966 		};
1004967 	};
1005
-
968
+/*
1006969 	wireless-wlan {
1007970 		wifi_host_wake_irq: wifi-host-wake-irq {
1008
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
971
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
1009972 		};
1010973 	};
1011
-	
974
+*/	
1012975 	
1013976 	ndj_io_init{
1014977 		ndj_io_gpio: ndj_io_gpio_col{
1015978 				rockchip,pins =
1016
-					<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
1017
-					<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
1018
-					<4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
1019
-					<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
1020
-					<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>,
1021983 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
1022984 					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
1023
-					<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
1024
-					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO4_B5_d_3V3
1025
-					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO4_B6_d_3V3
1026
-					<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B0_u_3V3
1027
-					<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B2_d_3V3
1028
-					<3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B3_u_3V3
1029
-					<3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B4_u_3V3
1030
-					<3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_A7_u_3V3
1031
-					<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;  //GPIO3_A0_u_3V3
1032
-
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		 		
1033994 		};
1034995 	};
1035996 };
1036997 &pwm3 {
1037
-	pinctrl-0 = <&pwm3m1_pins>;
1038998 	status = "okay";
999
+	pinctrl-0 = <&pwm3m1_pins>;
10391000 };
10401001 
10411002 &route_dsi0 {
1042
-	status = "okay";
1003
+	status = "disabled";
10431004 	connect = <&vp3_out_dsi0>;
10441005 };
10451006 
....@@ -1049,12 +1010,12 @@
10491010 };
10501011 
10511012 &pwm10 {
1052
-	status = "okay";
1013
+	status = "disabled";
10531014 	pinctrl-0 = <&pwm10m2_pins>;
10541015 };
10551016 
10561017 &pwm11 {
1057
-	status = "okay";
1018
+	status = "disabled";
10581019 	pinctrl-0 = <&pwm11m3_pins>;
10591020 };
10601021 
....@@ -1068,6 +1029,10 @@
10681029 
10691030 &sata0 {
10701031 	status = "disabled";
1032
+};
1033
+
1034
+&sata2 {
1035
+	status = "okay";
10711036 };
10721037 
10731038 &sdio {
....@@ -1151,7 +1116,7 @@
11511116 };
11521117 
11531118 &uart3 {
1154
-	status = "okay";
1119
+	status = "disabled";
11551120 	pinctrl-names = "default";
11561121 	pinctrl-0 = <&uart3m1_xfer>;
11571122 };
....@@ -1182,7 +1147,7 @@
11821147 };
11831148 
11841149 &uart8 {
1185
-	status = "okay";
1150
+	status = "disabled";
11861151 	pinctrl-names = "default";
11871152 	pinctrl-0 = <&uart8m1_xfer>;
11881153 };
....@@ -1193,3 +1158,17 @@
11931158 	pinctrl-names = "default";
11941159 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11951160 };
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
+};