forked from ~ljy/RK3588_XEN

blame | history | patch | commit | commitdiff
hc
2024-08-13 72be3801e63d82671c9d90577a9efb3126a6aa37 
 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,41 @@
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>;
289273 				gpio_function = <0>;
290
-			};
274
+			};//4G_PWREN_GPIO3_C7_u_3V3
291275 			
292
-           	wake_4g {
276
+         	wake_wifi_bt {
293277 				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
294278 				gpio_function = <0>;
295
-			};
279
+			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
296280 			
297281 			air_mode_4g {
298282 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
299283 				gpio_function = <0>;
300
-			};			
284
+			};	//GPIO2_B4_u_1V8_4G_AIR_MODE_IN		
301285 			
302286 			reset_4g {
303287 				gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
304288 				gpio_function = <3>;
305
-			};	
306
-/*
307
-			spk_ctl {
308
-				gpio_num = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
309
-				gpio_function = <0>;
310
-			};
311
-			
312
-			hp_det
313
-			 {
314
-				gpio_num = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
315
-				gpio_function = <1>;
316
-			};
317
-*/
289
+			};	//GPIO2_C3_d_1V8_4G_RESET_N_IN
318290 		};
319291 		
320292 		
....@@ -322,11 +294,11 @@
322294                compatible = "simple-panel";
323295                backlight = <&backlight>;
324296                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
297
+			   vcc-5v-gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;	//VCC5_IO_EN_GPIO4_B5_d_3V3		   
298
+               enable-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN_GPIO3_C6_u_3V3
299
+               reset-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
300
+               edp-bl-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>;  //LCD_BKL_PWM3_3V3
301
+               edp-bl-en = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_A6_d_3V3
330302                bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
331303                bpc = <8>;
332304                prepare-delay-ms = <200>;
....@@ -448,11 +420,11 @@
448420  * when dsi0 is enabled
449421  */
450422 &mipi_dcphy0 {
451
-	status = "okay";
423
+	status = "disabled";
452424 }; 
453425  
454426 &dsi0 {
455
-	status = "okay";
427
+	status = "disabled";
456428 };
457429 
458430 &dsi0_in_vp2 {
....@@ -461,15 +433,6 @@
461433 
462434 &dsi0_in_vp3 {
463435 	status = "okay";
464
-};
465
-
466
-&dsi0_panel {
467
-	power-supply = <&vcc3v3_lcd1_n>;  //LCD_PWREN_H
468
-	vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
469
-	reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>;  //MIPIDIS_RST_GPIO1_A0_d_1V8
470
-	vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
471
-	pinctrl-names = "default";
472
-	pinctrl-0 = <&lcd_rst_gpio>;
473436 };
474437 
475438 /*
....@@ -523,7 +486,7 @@
523486 	/* rx_delay = <0x3f>; */
524487 
525488 	phy-handle = <&rgmii_phy>;
526
-	status = "disabled";
489
+	status = "okay";
527490 };
528491 
529492 &hdmi0 {
....@@ -868,21 +831,21 @@
868831 
869832 &pcie2x1l2 {
870833 	phys = <&combphy0_ps PHY_TYPE_PCIE>;
871
-	reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
834
+	reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
872835 	vpcie3v3-supply = <&vcc3v3_pcie30>;
873836 	status = "okay";
874837 };//MINIPCIE
875838 
876839 &pcie2x1l1 {
877840 	phys = <&combphy2_psu PHY_TYPE_PCIE>;
878
-	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
841
+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
879842 	vpcie3v3-supply = <&vcc3v3_pcie30>;
880843 	status = "okay";
881844 };//M.2 WIFI6
882845 
883846 &pcie2x1l0 {
884847 	phys = <&combphy1_ps PHY_TYPE_PCIE>;
885
-	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
848
+	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;  //PCIEx1_0_PERSTn_M1_L
886849 	vpcie3v3-supply = <&vcc3v3_pcie30>;
887850 	status = "okay";
888851 };//RTL8111H
....@@ -933,11 +896,11 @@
933896 
934897 	headphone {
935898 		hp_det: hp-det {
936
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
899
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
937900 		};
938901 		
939902 		spk_con: spk-con {
940
-			rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
903
+			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
941904 		};
942905 	};
943906 
....@@ -961,16 +924,16 @@
961924 
962925 	sdio-pwrseq {
963926 		wifi_enable_h: wifi-enable-h {
964
-			rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
927
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
965928 		};
966929 	};
967
-
930
+/*
968931 	sdmmc {
969932 		sd_s0_pwr: sd-s0-pwr {
970933 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
971934 		};
972935 	};
973
-
936
+*/
974937 	touch {
975938 		touch_gpio: touch-gpio {
976939 			rockchip,pins =
....@@ -992,45 +955,35 @@
992955 		};
993956 
994957 		bt_reset_gpio: bt-reset-gpio {
995
-			rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
996
-		};
997
-
998
-		bt_wake_gpio: bt-wake-gpio {
999
-			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
1000
-		};
1001
-
1002
-		bt_irq_gpio: bt-irq-gpio {
1003
-			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
958
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
1004959 		};
1005960 	};
1006
-
961
+/*
1007962 	wireless-wlan {
1008963 		wifi_host_wake_irq: wifi-host-wake-irq {
1009
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
964
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
1010965 		};
1011966 	};
1012
-	
967
+*/	
1013968 	
1014969 	ndj_io_init{
1015970 		ndj_io_gpio: ndj_io_gpio_col{
1016971 				rockchip,pins =
1017
-					<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
1018
-					<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
1019
-					<4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
1020
-					<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
1021
-					<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
972
+					<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
973
+					<4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
974
+					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
975
+					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
1022976 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
1023977 					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
1024
-					<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
1025
-					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO4_B5_d_3V3
1026
-					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO4_B6_d_3V3
1027
-					<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B0_u_3V3
1028
-					<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B2_d_3V3
1029
-					<3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B3_u_3V3
1030
-					<3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_B4_u_3V3
1031
-					<3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_A7_u_3V3
1032
-					<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;  //GPIO3_A0_u_3V3
1033
-
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 41
980
+					<1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MISO_M2_1V8 32
981
+					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MOSI_M2_3V3 42
982
+					<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MOSI_M2_1V8 33
983
+					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8  43 
984
+					<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_CLK_M2_1V8  34
985
+					<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CS0_M2_1V8  44
986
+					<1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;  //SPI4_CS0_M2_1V8  35		 		
1034987 		};
1035988 	};
1036989 };
....@@ -1040,7 +993,7 @@
1040993 };
1041994 
1042995 &route_dsi0 {
1043
-	status = "okay";
996
+	status = "disabled";
1044997 	connect = <&vp3_out_dsi0>;
1045998 };
1046999 
....@@ -1152,7 +1105,7 @@
11521105 };
11531106 
11541107 &uart3 {
1155
-	status = "okay";
1108
+	status = "disabled";
11561109 	pinctrl-names = "default";
11571110 	pinctrl-0 = <&uart3m1_xfer>;
11581111 };
....@@ -1183,7 +1136,7 @@
11831136 };
11841137 
11851138 &uart8 {
1186
-	status = "okay";
1139
+	status = "disabled";
11871140 	pinctrl-names = "default";
11881141 	pinctrl-0 = <&uart8m1_xfer>;
11891142 };
....@@ -1194,3 +1147,17 @@
11941147 	pinctrl-names = "default";
11951148 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11961149 };
1150
+
1151
+
1152
+&can0 {
1153
+	status = "okay";
1154
+	pinctrl-names = "default";
1155
+	pinctrl-0 = <&can0m0_pins>;
1156
+};
1157
+
1158
+
1159
+&can1 {
1160
+	status = "okay";
1161
+	pinctrl-names = "default";
1162
+	pinctrl-0 = <&can1m1_pins>;
1163
+};