hc
2024-08-19 eb6b9ee90f50f13c5abb885ce483802d6262f2b5
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -273,6 +273,11 @@
273273 gpio_function = <0>;
274274 };//4G_PWREN_GPIO3_C7_u_3V3
275275
276
+ 5g_power {
277
+ gpio_num =<&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
278
+ gpio_function = <0>;
279
+ };
280
+
276281 wake_wifi_bt {
277282 gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
278283 gpio_function = <0>;
....@@ -287,6 +292,8 @@
287292 gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
288293 gpio_function = <3>;
289294 }; //GPIO2_C3_d_1V8_4G_RESET_N_IN
295
+
296
+
290297 };
291298
292299
....@@ -365,13 +372,13 @@
365372 };
366373
367374 &backlight {
368
- pwms = <&pwm10 0 25000 0>;
375
+ pwms = <&pwm3 0 25000 0>;
369376 status = "okay";
370377 };
371378
372379 &backlight1 {
373380 pwms = <&pwm11 0 25000 0>;
374
- status = "okay";
381
+ status = "disabled";
375382 };
376383
377384 &combphy0_ps {
....@@ -517,12 +524,12 @@
517524
518525 /* Should work with at least 128MB cma reserved above. */
519526 &hdmirx_ctrler {
520
- status = "disabled";
527
+ status = "okay";
521528
522529 #sound-dai-cells = <1>;
523530 /* Effective level used to trigger HPD: 0-low, 1-high */
524531 hpd-trigger-level = <1>;
525
- hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
532
+ hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
526533 pinctrl-names = "default";
527534 pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
528535 };
....@@ -840,7 +847,7 @@
840847 phys = <&combphy2_psu PHY_TYPE_PCIE>;
841848 reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
842849 vpcie3v3-supply = <&vcc3v3_pcie30>;
843
- status = "okay";
850
+ status = "disabled";
844851 };//M.2 WIFI6
845852
846853 &pcie2x1l0 {
....@@ -890,7 +897,7 @@
890897
891898 hdmi {
892899 hdmirx_det: hdmirx-det {
893
- rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
900
+ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
894901 };
895902 };
896903
....@@ -975,23 +982,21 @@
975982 <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
976983 <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977984 <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
985
+ <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
986
+ <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8 41
987
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8 32
988
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MOSI_M2_3V3 42
989
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MOSI_M2_1V8 33
990
+ <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8 43
991
+ <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_CLK_M2_1V8 34
992
+ <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8 44
993
+ <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_CS0_M2_1V8 35
989994 };
990995 };
991996 };
992997 &pwm3 {
993
- pinctrl-0 = <&pwm3m1_pins>;
994998 status = "okay";
999
+ pinctrl-0 = <&pwm3m1_pins>;
9951000 };
9961001
9971002 &route_dsi0 {
....@@ -1005,12 +1010,12 @@
10051010 };
10061011
10071012 &pwm10 {
1008
- status = "okay";
1013
+ status = "disabled";
10091014 pinctrl-0 = <&pwm10m2_pins>;
10101015 };
10111016
10121017 &pwm11 {
1013
- status = "okay";
1018
+ status = "disabled";
10141019 pinctrl-0 = <&pwm11m3_pins>;
10151020 };
10161021
....@@ -1024,6 +1029,10 @@
10241029
10251030 &sata0 {
10261031 status = "disabled";
1032
+};
1033
+
1034
+&sata2 {
1035
+ status = "okay";
10271036 };
10281037
10291038 &sdio {
....@@ -1153,6 +1162,8 @@
11531162
11541163 &can0 {
11551164 status = "okay";
1165
+ pinctrl-names = "default";
1166
+ pinctrl-0 = <&can0m0_pins>;
11561167 };
11571168
11581169