del .mod

hc

2024-08-16 62c46c9150c4afde7e5b25436263fddf79d66f0b

 kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
..
..
@@ -134,7 +134,7 @@
134
134
 	rk_headset: rk-headset {
135
135
 		status = "okay";
136
136
 		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
138
138
 		spk_ctl_gpio  = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
139
139
 		pinctrl-names = "default";
140
140
 		pinctrl-0 = <&hp_det>;
..
..
@@ -365,13 +365,13 @@
365
365
 };
366
366
 
367
367
 &backlight {
368
-	pwms = <&pwm10 0 25000 0>;
368
+	pwms = <&pwm3 0 25000 0>;
369
369
 	status = "okay";
370
370
 };
371
371
 
372
372
 &backlight1 {
373
373
 	pwms = <&pwm11 0 25000 0>;
374
-	status = "okay";
374
+	status = "disabled";
375
375
 };
376
376
 
377
377
 &combphy0_ps {
..
..
@@ -517,12 +517,12 @@
517
517
 
518
518
 /* Should work with at least 128MB cma reserved above. */
519
519
 &hdmirx_ctrler {
520
-	status = "disabled";
520
+	status = "okay";
521
521
 
522
522
 	#sound-dai-cells = <1>;
523
523
 	/* Effective level used to trigger HPD: 0-low, 1-high */
524
524
 	hpd-trigger-level = <1>;
525
-	hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
525
+	hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
526
526
 	pinctrl-names = "default";
527
527
 	pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
528
528
 };
..
..
@@ -890,13 +890,13 @@
890
890
 
891
891
 	hdmi {
892
892
 		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>;
894
894
 		};
895
895
 	};
896
896
 
897
897
 	headphone {
898
898
 		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>;
900
900
 		};
901
901
 		
902
902
 		spk_con: spk-con {
..
..
@@ -975,23 +975,21 @@
975
975
 					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
976
976
 					<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977
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
+					<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		 		
989
987
 		};
990
988
 	};
991
989
 };
992
990
 &pwm3 {
993
-	pinctrl-0 = <&pwm3m1_pins>;
994
991
 	status = "okay";
992
+	pinctrl-0 = <&pwm3m1_pins>;
995
993
 };
996
994
 
997
995
 &route_dsi0 {
..
..
@@ -1005,12 +1003,12 @@
1005
1003
 };
1006
1004
 
1007
1005
 &pwm10 {
1008
-	status = "okay";
1006
+	status = "disabled";
1009
1007
 	pinctrl-0 = <&pwm10m2_pins>;
1010
1008
 };
1011
1009
 
1012
1010
 &pwm11 {
1013
-	status = "okay";
1011
+	status = "disabled";
1014
1012
 	pinctrl-0 = <&pwm11m3_pins>;
1015
1013
 };
1016
1014
 
..
..
@@ -1024,6 +1022,10 @@
1024
1022
 
1025
1023
 &sata0 {
1026
1024
 	status = "disabled";
1025
+};
1026
+
1027
+&sata2 {
1028
+	status = "okay";
1027
1029
 };
1028
1030
 
1029
1031
 &sdio {
..
..
@@ -1153,6 +1155,8 @@
1153
1155
 
1154
1156
 &can0 {
1155
1157
 	status = "okay";
1158
+	pinctrl-names = "default";
1159
+	pinctrl-0 = <&can0m0_pins>;
1156
1160
 };
1157
1161
 
1158
1162