forked from ~ljy/RK3588_XEN

blame | history | patch | commit | commitdiff
hc
2024-08-15 77e89012189e2b1c68eace320794579f45b94136 
 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -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 	};
....@@ -241,9 +241,9 @@
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>;
248248 		status = "okay";
249249 	};
....@@ -273,10 +273,10 @@
273273 				gpio_function = <0>;
274274 			};//4G_PWREN_GPIO3_C7_u_3V3
275275 			
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
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
280280 			
281281 			air_mode_4g {
282282 				gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
....@@ -365,13 +365,13 @@
365365 };
366366 
367367 &backlight {
368
-	pwms = <&pwm10 0 25000 0>;
368
+	pwms = <&pwm3 0 25000 0>;
369369 	status = "okay";
370370 };
371371 
372372 &backlight1 {
373373 	pwms = <&pwm11 0 25000 0>;
374
-	status = "okay";
374
+	status = "disabled";
375375 };
376376 
377377 &combphy0_ps {
....@@ -517,12 +517,12 @@
517517 
518518 /* Should work with at least 128MB cma reserved above. */
519519 &hdmirx_ctrler {
520
-	status = "disabled";
520
+	status = "okay";
521521 
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 };
....@@ -890,13 +890,13 @@
890890 
891891 	hdmi {
892892 		hdmirx_det: hdmirx-det {
893
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
893
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
894894 		};
895895 	};
896896 
897897 	headphone {
898898 		hp_det: hp-det {
899
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
899
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
900900 		};
901901 		
902902 		spk_con: spk-con {
....@@ -927,13 +927,13 @@
927927 			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
928928 		};
929929 	};
930
-
930
+/*
931931 	sdmmc {
932932 		sd_s0_pwr: sd-s0-pwr {
933933 			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
934934 		};
935935 	};
936
-
936
+*/
937937 	touch {
938938 		touch_gpio: touch-gpio {
939939 			rockchip,pins =
....@@ -958,13 +958,13 @@
958958 			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
959959 		};
960960 	};
961
-
961
+/*
962962 	wireless-wlan {
963963 		wifi_host_wake_irq: wifi-host-wake-irq {
964
-			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
964
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
965965 		};
966966 	};
967
-	
967
+*/	
968968 	
969969 	ndj_io_init{
970970 		ndj_io_gpio: ndj_io_gpio_col{
....@@ -975,19 +975,21 @@
975975 					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
976976 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977977 					<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
+					<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		 		
985987 		};
986988 	};
987989 };
988990 &pwm3 {
989
-	pinctrl-0 = <&pwm3m1_pins>;
990991 	status = "okay";
992
+	pinctrl-0 = <&pwm3m1_pins>;
991993 };
992994 
993995 &route_dsi0 {
....@@ -1001,12 +1003,12 @@
10011003 };
10021004 
10031005 &pwm10 {
1004
-	status = "okay";
1006
+	status = "disabled";
10051007 	pinctrl-0 = <&pwm10m2_pins>;
10061008 };
10071009 
10081010 &pwm11 {
1009
-	status = "okay";
1011
+	status = "disabled";
10101012 	pinctrl-0 = <&pwm11m3_pins>;
10111013 };
10121014 
....@@ -1020,6 +1022,10 @@
10201022 
10211023 &sata0 {
10221024 	status = "disabled";
1025
+};
1026
+
1027
+&sata2 {
1028
+	status = "okay";
10231029 };
10241030 
10251031 &sdio {
....@@ -1145,3 +1151,17 @@
11451151 	pinctrl-names = "default";
11461152 	pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>;	
11471153 };
1154
+
1155
+
1156
+&can0 {
1157
+	status = "okay";
1158
+	pinctrl-names = "default";
1159
+	pinctrl-0 = <&can0m0_pins>;
1160
+};
1161
+
1162
+
1163
+&can1 {
1164
+	status = "okay";
1165
+	pinctrl-names = "default";
1166
+	pinctrl-0 = <&can1m1_pins>;
1167
+};