forked from ~ljy/RK3588_XEN

blame | history | patch | commit | commitdiff
hc
2024-11-15 a46a1ad097419aeea7350987dd95230f50d90392 
 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -27,7 +27,7 @@
2727 	};
2828 
2929 	es8316_sound: es8316-sound {
30
-		status = "okay";
30
+		status = "disabled";
3131 		compatible = "rockchip,multicodecs-card";
3232 		rockchip,card-name = "rockchip-es8316";
3333 		rockchip,format = "i2s";
....@@ -38,7 +38,7 @@
3838 		io-channels = <&saradc 3>;
3939 		io-channel-names = "adc-detect";
4040 		keyup-threshold-microvolt = <1800000>;
41
-		pinctrl-0 = <&spk_con>;
41
+		//pinctrl-0 = <&spk_con>;
4242 		pinctrl-names = "default";
4343 		//hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
4444 		//spk-con-gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
....@@ -114,7 +114,7 @@
114114 		regulator-max-microvolt = <1800000>;
115115 		vin-supply = <&avcc_1v8_s0>;
116116 	};
117
-
117
+#if 0
118118 	sdio_pwrseq: sdio-pwrseq {
119119 		compatible = "mmc-pwrseq-simple";
120120 		clocks = <&hym8563>;
....@@ -132,15 +132,15 @@
132132 	};
133133 
134134 	rk_headset: rk-headset {
135
-		status = "okay";
135
+		status = "disabled";
136136 		compatible = "rockchip_headset";
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
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>;
142142 	};
143
-
143
+#endif
144144 
145145 	vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 {
146146 		compatible = "regulator-fixed";
....@@ -182,10 +182,10 @@
182182 		regulator-min-microvolt = <5000000>;
183183 		regulator-max-microvolt = <5000000>;
184184 		enable-active-high;
185
-		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
185
+		//gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
186186 		vin-supply = <&vcc5v0_usb>;
187
-		pinctrl-names = "default";
188
-		pinctrl-0 = <&vcc5v0_host_en>;
187
+		//pinctrl-names = "default";
188
+		//pinctrl-0 = <&vcc5v0_host_en>;
189189 	};
190190 /*
191191 	vcc_mipicsi0: vcc-mipicsi0-regulator {
....@@ -229,13 +229,13 @@
229229 		clocks = <&hym8563>;
230230 		clock-names = "ext_clock";
231231 		uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; //UART9_RTSn_M0_BT
232
-		pinctrl-names = "default", "rts_gpio";
233
-		pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>;
234
-		pinctrl-1 = <&uart9_gpios>;
235
-		BT,reset_gpio    = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //BT_DISABLE_GPIO0_B2_u_1V8
232
+		//pinctrl-names = "default", "rts_gpio";
233
+		//pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>;
234
+		//pinctrl-1 = <&uart9_gpios>;
235
+		//BT,reset_gpio    = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //BT_DISABLE_GPIO0_B2_u_1V8
236236 		//BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
237237 		//BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
238
-		status = "okay";
238
+		status = "disabled";
239239 	};
240240 
241241 	wireless_wlan: wireless-wlan {
....@@ -245,7 +245,7 @@
245245 	//	pinctrl-0 = <&wifi_host_wake_irq>;
246246 	//	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>;
248
-		status = "okay";
248
+		status = "disabled";
249249 	};
250250 	
251251 	ndj_io_init {
....@@ -253,40 +253,15 @@
253253 			pinctrl-names = "default";
254254           	pinctrl-0 = <&ndj_io_gpio>;
255255 									
256
-			vcc_12v {
257
-				gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
258
-				gpio_function = <0>;
259
-			};//VCC12_IO_EN_GPIO0_D3_u_3V3
260
-			
261
-			vcc_3v {
262
-				gpio_num = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
263
-				gpio_function = <0>;
264
-			};//VCC3_IO_EN_GPIO4_A1_d_3V3
256
+
265257 			
266258            	hub_5V_reset {
267259 				gpio_num = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; 
268260 				gpio_function = <3>;
269261 			};//HUB_RESET_GPIO4_B6_d_3V3
270262 			
271
-			4g_power {
272
-				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
273
-				gpio_function = <0>;
274
-			};//4G_PWREN_GPIO3_C7_u_3V3
275263 			
276
-         	wake_wifi_bt {
277
-				gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
278
-				gpio_function = <0>;
279
-			};//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
280264 			
281
-			air_mode_4g {
282
-				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
283
-				gpio_function = <0>;
284
-			};	//GPIO2_B4_u_1V8_4G_AIR_MODE_IN		
285
-			
286
-			reset_4g {
287
-				gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
288
-				gpio_function = <3>;
289
-			};	//GPIO2_C3_d_1V8_4G_RESET_N_IN
290265 		};
291266 		
292267 		
....@@ -365,13 +340,13 @@
365340 };
366341 
367342 &backlight {
368
-	pwms = <&pwm10 0 25000 0>;
343
+	pwms = <&pwm3 0 25000 0>;
369344 	status = "okay";
370345 };
371346 
372347 &backlight1 {
373348 	pwms = <&pwm11 0 25000 0>;
374
-	status = "okay";
349
+	status = "disabled";
375350 };
376351 
377352 &combphy0_ps {
....@@ -432,7 +407,7 @@
432407 };
433408 
434409 &dsi0_in_vp3 {
435
-	status = "okay";
410
+	status = "disabled";
436411 };
437412 
438413 /*
....@@ -465,6 +440,31 @@
465440 	//pinctrl-0 = <&lcd_rst_gpio>;
466441 };
467442 
443
+&gmac0 {
444
+	/* Use rgmii-rxid mode to disable rx delay inside Soc */
445
+	phy-mode = "rgmii-rxid";
446
+	clock_in_out = "output";
447
+
448
+	snps,reset-gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
449
+	snps,reset-active-low;
450
+	/* Reset time is 20ms, 100ms for rtl8211f */
451
+	snps,reset-delays-us = <0 20000 100000>;
452
+
453
+	pinctrl-names = "default";
454
+	pinctrl-0 = <&gmac0_miim
455
+                     &gmac0_tx_bus2
456
+                     &gmac0_rx_bus2
457
+                     &gmac0_rgmii_clk
458
+                     &gmac0_rgmii_bus
459
+                     &eth0_pins
460
+		     &gmac0_clkinout>;
461
+	tx_delay = <0x44>;
462
+	/* rx_delay = <0x4f>; */
463
+
464
+	phy-handle = <&rgmii_phy0>;
465
+	status = "okay";
466
+};
467
+
468468 &gmac1 {
469469 	/* Use rgmii-rxid mode to disable rx delay inside Soc */
470470 	phy-mode = "rgmii-rxid";
....@@ -485,7 +485,7 @@
485485 	tx_delay = <0x43>;
486486 	/* rx_delay = <0x3f>; */
487487 
488
-	phy-handle = <&rgmii_phy>;
488
+	phy-handle = <&rgmii_phy1>;
489489 	status = "okay";
490490 };
491491 
....@@ -522,7 +522,7 @@
522522 	#sound-dai-cells = <1>;
523523 	/* Effective level used to trigger HPD: 0-low, 1-high */
524524 	hpd-trigger-level = <1>;
525
-	hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
525
+	hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
526526 	pinctrl-names = "default";
527527 	pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
528528 };
....@@ -656,8 +656,8 @@
656656 	gt1x: gt1x@14 {
657657 		compatible = "goodix,gt1x";
658658 		reg = <0x14>;
659
-		pinctrl-names = "default";
660
-		pinctrl-0 = <&touch_gpio>;
659
+		//pinctrl-names = "default";
660
+		//pinctrl-0 = <&touch_gpio>;
661661 		goodix,rst-gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
662662 		goodix,irq-gpio = <&gpio3 RK_PC0 IRQ_TYPE_LEVEL_LOW>;
663663 		power-supply = <&vcc3v3_lcd_n>;
....@@ -817,12 +817,18 @@
817817 };
818818 
819819 &mdio1 {
820
-	rgmii_phy: phy@1 {
820
+	rgmii_phy1: phy@1 {
821821 		compatible = "ethernet-phy-ieee802.3-c22";
822822 		reg = <0x1>;
823823 	};
824824 };
825825 
826
+&mdio0 {
827
+	rgmii_phy0: phy@1 {
828
+		compatible = "ethernet-phy-ieee802.3-c22";
829
+		reg = <0x1>;
830
+	};
831
+};
826832 
827833 
828834 &mipi_dcphy1 {
....@@ -831,7 +837,7 @@
831837 
832838 &pcie2x1l2 {
833839 	phys = <&combphy0_ps PHY_TYPE_PCIE>;
834
-	reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
840
+	reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
835841 	vpcie3v3-supply = <&vcc3v3_pcie30>;
836842 	status = "okay";
837843 };//MINIPCIE
....@@ -890,20 +896,20 @@
890896 
891897 	hdmi {
892898 		hdmirx_det: hdmirx-det {
893
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
899
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
894900 		};
895901 	};
896
-
902
+/*
897903 	headphone {
898904 		hp_det: hp-det {
899
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
905
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
900906 		};
901907 		
902908 		spk_con: spk-con {
903909 			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
904910 		};
905911 	};
906
-
912
+*/
907913 	hym8563 {
908914 		hym8563_int: hym8563-int {
909915 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
....@@ -921,19 +927,19 @@
921927 			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
922928 		};
923929 	};
924
-
930
+/*
925931 	sdio-pwrseq {
926932 		wifi_enable_h: wifi-enable-h {
927933 			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
928934 		};
929935 	};
930
-/*
936
+
931937 	sdmmc {
932938 		sd_s0_pwr: sd-s0-pwr {
933939 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
934940 		};
935941 	};
936
-*/
942
+
937943 	touch {
938944 		touch_gpio: touch-gpio {
939945 			rockchip,pins =
....@@ -958,7 +964,7 @@
958964 			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
959965 		};
960966 	};
961
-/*
967
+
962968 	wireless-wlan {
963969 		wifi_host_wake_irq: wifi-host-wake-irq {
964970 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
....@@ -969,29 +975,23 @@
969975 	ndj_io_init{
970976 		ndj_io_gpio: ndj_io_gpio_col{
971977 				rockchip,pins =
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>,
976
-					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977
-					<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
978
-					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,  //vcc_5v
979
-					<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C4_SDA_M2_3V3
980
-					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C4_SCL_M2_3V3
981
-					<4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C5_SDA_M2_3V3
982
-					<4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,  //I2C5_SCL_M2_3V3
983
-					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
984
-					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
985
-					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8
986
-					<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CS0_M2_1V8
987
-					<0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MISO_M2_1V8
988
-					<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;  //SPI4_MOSI_M2_1V8
978
+					<1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO1_C6_d_1V8
979
+					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO0_C6_u_3V3
980
+					<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO0_D3_u_3V3
981
+					<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_A6_d_3V3
982
+					<3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_C6_u_3V3
983
+					<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_D5_d_3V3
984
+					<4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B0_d_3V3
985
+					<4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B4_d_3V3
986
+					<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B5_d_3V3
987
+					<4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; //GPIO4_B6_d_3V3
988
+						 		
989989 		};
990990 	};
991991 };
992992 &pwm3 {
993
-	pinctrl-0 = <&pwm3m1_pins>;
994993 	status = "okay";
994
+	pinctrl-0 = <&pwm3m1_pins>;
995995 };
996996 
997997 &route_dsi0 {
....@@ -1005,12 +1005,12 @@
10051005 };
10061006 
10071007 &pwm10 {
1008
-	status = "okay";
1008
+	status = "disabled";
10091009 	pinctrl-0 = <&pwm10m2_pins>;
10101010 };
10111011 
10121012 &pwm11 {
1013
-	status = "okay";
1013
+	status = "disabled";
10141014 	pinctrl-0 = <&pwm11m3_pins>;
10151015 };
10161016 
....@@ -1026,6 +1026,10 @@
10261026 	status = "disabled";
10271027 };
10281028 
1029
+&sata2 {
1030
+	status = "okay";
1031
+};
1032
+
10291033 &sdio {
10301034 	max-frequency = <150000000>;
10311035 	no-sd;
....@@ -1035,12 +1039,12 @@
10351039 	cap-sd-highspeed;
10361040 	cap-sdio-irq;
10371041 	keep-power-in-suspend;
1038
-	mmc-pwrseq = <&sdio_pwrseq>;
1042
+	//mmc-pwrseq = <&sdio_pwrseq>;
10391043 	non-removable;
10401044 	pinctrl-names = "default";
10411045 	pinctrl-0 = <&sdiom0_pins>;
10421046 	sd-uhs-sdr104;
1043
-	status = "okay";
1047
+	status = "disabled";
10441048 };
10451049 
10461050 &sdmmc {
....@@ -1100,7 +1104,7 @@
11001104 #endif
11011105 
11021106 &uart1 {
1103
-	status = "okay";
1107
+	status = "disabled";
11041108 //	dma-names = "tx", "rx"; //ʹÓÃdma´«Êäģʽ
11051109 	pinctrl-names = "default";
11061110 	pinctrl-0 = <&uart1m0_xfer>;
....@@ -1114,7 +1118,7 @@
11141118 
11151119 
11161120 &uart4 {
1117
-	status = "okay";
1121
+	status = "disabled";
11181122 	pinctrl-names = "default";
11191123 	pinctrl-0 = <&uart4m0_xfer>;
11201124 };
....@@ -1132,7 +1136,7 @@
11321136 };
11331137 
11341138 &uart7 {
1135
-	status = "okay";
1139
+	status = "disabled";
11361140 	pinctrl-names = "default";
11371141 	pinctrl-0 = <&uart7m1_xfer>;
11381142 };
....@@ -1145,7 +1149,7 @@
11451149 
11461150 
11471151 &uart9 {
1148
-	status = "okay";
1152
+	status = "disabled";
11491153 	pinctrl-names = "default";
11501154 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11511155 };
....@@ -1153,6 +1157,8 @@
11531157 
11541158 &can0 {
11551159 	status = "okay";
1160
+	pinctrl-names = "default";
1161
+	pinctrl-0 = <&can0m0_pins>;
11561162 };
11571163 
11581164