forked from ~ljy/RK3588_XEN

blame | history | patch | commit | commitdiff
hc
2024-08-09 29cd05754af6ef0435c257049290243810d81e26 
 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -134,8 +134,8 @@
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 = <&gpio1 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,9 +159,20 @@
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
+
165176 
166177 	vcc3v3_pcie30: vcc3v3-pcie30 {
167178 		compatible = "regulator-fixed";
....@@ -243,7 +254,7 @@
243254 		wifi_chip_type = "ap6398s";
244255 		pinctrl-names = "default";
245256 		pinctrl-0 = <&wifi_host_wake_irq>;
246
-		WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //WIFI_WAKE_HOST_H
257
+		WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
247258 	//	WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
248259 		status = "okay";
249260 	};
....@@ -253,57 +264,45 @@
253264 			pinctrl-names = "default";
254265           	pinctrl-0 = <&ndj_io_gpio>;
255266 						
256
-//			vcc_5v {
257
-//				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
258
-//				gpio_function = <0>;
259
-//			};
267
+			usb_power {
268
+				gpio_num = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
269
+				gpio_function = <0>;
270
+			};//USB_HOST_PWREN_H
260271 			
261272 			vcc_12v {
262
-				gpio_num = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
273
+				gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
263274 				gpio_function = <0>;
264
-			};
275
+			};//VCC12_IO_EN_GPIO0_D3_u_3V3
265276 			
266277 			vcc_3v {
267
-				gpio_num = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
278
+				gpio_num = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
268279 				gpio_function = <0>;
269
-			};
280
+			};//VCC3_IO_EN_GPIO4_A1_d_3V3
270281 			
271282            	hub_5V_reset {
272
-				gpio_num = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
283
+				gpio_num = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; 
273284 				gpio_function = <3>;
274
-			};
285
+			};//HUB_RESET_GPIO4_B6_d_3V3
275286 			
276287 			4g_power {
277
-				gpio_num = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
288
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
278289 				gpio_function = <0>;
279
-			};
290
+			};//4G_PWREN_GPIO3_C7_u_3V3
280291 			
281
-           	wake_4g {
282
-				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
283
-				gpio_function = <0>;
284
-			};
292
+//         	wake_4g {
293
+//				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
294
+//				gpio_function = <0>;
295
+//			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
285296 			
286297 			air_mode_4g {
287298 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
288299 				gpio_function = <0>;
289
-			};			
300
+			};	//GPIO2_B4_u_1V8_4G_AIR_MODE_IN		
290301 			
291302 			reset_4g {
292303 				gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
293304 				gpio_function = <3>;
294
-			};	
295
-/*
296
-			spk_ctl {
297
-				gpio_num = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
298
-				gpio_function = <0>;
299
-			};
300
-			
301
-			hp_det
302
-			 {
303
-				gpio_num = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
304
-				gpio_function = <1>;
305
-			};
306
-*/
305
+			};	//GPIO2_C3_d_1V8_4G_RESET_N_IN
307306 		};
308307 		
309308 		
....@@ -311,12 +310,11 @@
311310                compatible = "simple-panel";
312311                backlight = <&backlight>;
313312                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
313
+			   vcc-5v-gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;	//VCC5_IO_EN_GPIO4_B5_d_3V3		   
314
+               enable-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN_GPIO3_C6_u_3V3
315
+               reset-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
316
+               edp-bl-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>;  //LCD_BKL_PWM3_3V3
317
+               edp-bl-en = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_A6_d_3V3
320318                bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
321319                bpc = <8>;
322320                prepare-delay-ms = <200>;
....@@ -387,6 +385,11 @@
387385 	status = "okay";
388386 };
389387 
388
+&backlight1 {
389
+	pwms = <&pwm11 0 25000 0>;
390
+	status = "okay";
391
+};
392
+
390393 &combphy0_ps {
391394 	status = "okay";
392395 };
....@@ -432,8 +435,12 @@
432435  * mipi_dcphy0 needs to be enabled
433436  * when dsi0 is enabled
434437  */
438
+&mipi_dcphy0 {
439
+	status = "okay";
440
+}; 
441
+ 
435442 &dsi0 {
436
-	status = "disabled";
443
+	status = "okay";
437444 };
438445 
439446 &dsi0_in_vp2 {
....@@ -441,12 +448,14 @@
441448 };
442449 
443450 &dsi0_in_vp3 {
444
-	status = "disabled";
451
+	status = "okay";
445452 };
446453 
447454 &dsi0_panel {
448
-	power-supply = <&vcc3v3_lcd_n>;
449
-	reset-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>;
455
+	power-supply = <&vcc3v3_lcd1_n>;  //LCD_PWREN_H
456
+	vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
457
+	reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>;  //MIPIDIS_RST_GPIO1_A0_d_1V8
458
+	vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
450459 	pinctrl-names = "default";
451460 	pinctrl-0 = <&lcd_rst_gpio>;
452461 };
....@@ -502,7 +511,7 @@
502511 	/* rx_delay = <0x3f>; */
503512 
504513 	phy-handle = <&rgmii_phy>;
505
-	status = "disabled";
514
+	status = "okay";
506515 };
507516 
508517 &hdmi0 {
....@@ -839,9 +848,7 @@
839848 	};
840849 };
841850 
842
-&mipi_dcphy0 {
843
-	status = "okay";
844
-};
851
+
845852 
846853 &mipi_dcphy1 {
847854 	status = "disabled";
....@@ -849,21 +856,21 @@
849856 
850857 &pcie2x1l2 {
851858 	phys = <&combphy0_ps PHY_TYPE_PCIE>;
852
-	reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
859
+	reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
853860 	vpcie3v3-supply = <&vcc3v3_pcie30>;
854861 	status = "okay";
855862 };//MINIPCIE
856863 
857864 &pcie2x1l1 {
858865 	phys = <&combphy2_psu PHY_TYPE_PCIE>;
859
-	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
866
+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
860867 	vpcie3v3-supply = <&vcc3v3_pcie30>;
861868 	status = "okay";
862869 };//M.2 WIFI6
863870 
864871 &pcie2x1l0 {
865872 	phys = <&combphy1_ps PHY_TYPE_PCIE>;
866
-	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
873
+	reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;  //PCIEx1_0_PERSTn_M1_L
867874 	vpcie3v3-supply = <&vcc3v3_pcie30>;
868875 	status = "okay";
869876 };//RTL8111H
....@@ -918,7 +925,7 @@
918925 		};
919926 		
920927 		spk_con: spk-con {
921
-			rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
928
+			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
922929 		};
923930 	};
924931 
....@@ -930,7 +937,7 @@
930937 
931938 	lcd {
932939 		lcd_rst_gpio: lcd-rst-gpio {
933
-			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
940
+			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
934941 		};
935942 	};
936943 
....@@ -995,22 +1002,22 @@
9951002 	ndj_io_init{
9961003 		ndj_io_gpio: ndj_io_gpio_col{
9971004 				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>,
1005
+					<4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
1006
+					<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
1007
+					<4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
1008
+					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
1009
+					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
10031010 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
10041011 					<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
1012
+					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
1013
+					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
1014
+					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
1015
+					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8
1016
+					<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CS0_M2_1V8
1017
+					<0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MISO_M2_1V8
1018
+					<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MOSI_M2_1V8
1019
+					<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,  //GPIO3_A7_u_3V3
1020
+					<0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;  //GPIO3_A0_u_3V3
10141021 
10151022 		};
10161023 	};
....@@ -1033,6 +1040,11 @@
10331040 &pwm10 {
10341041 	status = "okay";
10351042 	pinctrl-0 = <&pwm10m2_pins>;
1043
+};
1044
+
1045
+&pwm11 {
1046
+	status = "okay";
1047
+	pinctrl-0 = <&pwm11m3_pins>;
10361048 };
10371049 
10381050 &route_hdmi0 {
....@@ -1128,7 +1140,7 @@
11281140 };
11291141 
11301142 &uart3 {
1131
-	status = "okay";
1143
+	status = "disabled";
11321144 	pinctrl-names = "default";
11331145 	pinctrl-0 = <&uart3m1_xfer>;
11341146 };
....@@ -1159,7 +1171,7 @@
11591171 };
11601172 
11611173 &uart8 {
1162
-	status = "okay";
1174
+	status = "disabled";
11631175 	pinctrl-names = "default";
11641176 	pinctrl-0 = <&uart8m1_xfer>;
11651177 };