forked from ~ljy/RK3588_XEN

blame | history | patch | commit | commitdiff
hc
2024-11-01 2f529f9b558ca1c1bd74be7437a84e4711743404 
 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";
....@@ -134,7 +134,7 @@
134134 	rk_headset: rk-headset {
135135 		status = "okay";
136136 		compatible = "rockchip_headset";
137
-		headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
137
+		headset_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
138138 		spk_ctl_gpio  = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
139139 		pinctrl-names = "default";
140140 		pinctrl-0 = <&hp_det>;
....@@ -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 	};
....@@ -235,17 +235,17 @@
235235 		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 {
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 = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
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>;
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_4g {
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 };
....@@ -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,13 +896,13 @@
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 	};
896902 
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 {
....@@ -927,13 +933,13 @@
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,36 +964,25 @@
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 {
964
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
970
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
965971 		};
966972 	};
967
-	
973
+*/	
968974 	
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
-					<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
980
-					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_MISO_M2_1V8
981
-					<1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CLK_M2_1V8
982
-					<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI0_CS0_M2_1V8
983
-					<0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,  //SPI4_MISO_M2_1V8
984
-					<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;  //SPI4_MOSI_M2_1V8
978
+				
979
+					<1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;  //SPI4_CS0_M2_1V8  35		 		
985980 		};
986981 	};
987982 };
988983 &pwm3 {
989
-	pinctrl-0 = <&pwm3m1_pins>;
990984 	status = "okay";
985
+	pinctrl-0 = <&pwm3m1_pins>;
991986 };
992987 
993988 &route_dsi0 {
....@@ -1001,12 +996,12 @@
1001996 };
1002997 
1003998 &pwm10 {
1004
-	status = "okay";
999
+	status = "disabled";
10051000 	pinctrl-0 = <&pwm10m2_pins>;
10061001 };
10071002 
10081003 &pwm11 {
1009
-	status = "okay";
1004
+	status = "disabled";
10101005 	pinctrl-0 = <&pwm11m3_pins>;
10111006 };
10121007 
....@@ -1020,6 +1015,10 @@
10201015 
10211016 &sata0 {
10221017 	status = "disabled";
1018
+};
1019
+
1020
+&sata2 {
1021
+	status = "okay";
10231022 };
10241023 
10251024 &sdio {
....@@ -1036,7 +1035,7 @@
10361035 	pinctrl-names = "default";
10371036 	pinctrl-0 = <&sdiom0_pins>;
10381037 	sd-uhs-sdr104;
1039
-	status = "okay";
1038
+	status = "disabled";
10401039 };
10411040 
10421041 &sdmmc {
....@@ -1096,7 +1095,7 @@
10961095 #endif
10971096 
10981097 &uart1 {
1099
-	status = "okay";
1098
+	status = "disabled";
11001099 //	dma-names = "tx", "rx"; //ʹÓÃdma´«Êäģʽ
11011100 	pinctrl-names = "default";
11021101 	pinctrl-0 = <&uart1m0_xfer>;
....@@ -1110,7 +1109,7 @@
11101109 
11111110 
11121111 &uart4 {
1113
-	status = "okay";
1112
+	status = "disabled";
11141113 	pinctrl-names = "default";
11151114 	pinctrl-0 = <&uart4m0_xfer>;
11161115 };
....@@ -1128,7 +1127,7 @@
11281127 };
11291128 
11301129 &uart7 {
1131
-	status = "okay";
1130
+	status = "disabled";
11321131 	pinctrl-names = "default";
11331132 	pinctrl-0 = <&uart7m1_xfer>;
11341133 };
....@@ -1141,7 +1140,21 @@
11411140 
11421141 
11431142 &uart9 {
1144
-	status = "okay";
1143
+	status = "disabled";
11451144 	pinctrl-names = "default";
11461145 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11471146 };
1147
+
1148
+
1149
+&can0 {
1150
+	status = "okay";
1151
+	pinctrl-names = "default";
1152
+	pinctrl-0 = <&can0m0_pins>;
1153
+};
1154
+
1155
+
1156
+&can1 {
1157
+	status = "okay";
1158
+	pinctrl-names = "default";
1159
+	pinctrl-0 = <&can1m1_pins>;
1160
+};