hc
2024-08-09 7e81648b513354a6e48db198b3772366e077ffa1
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -134,8 +134,8 @@
134134 rk_headset: rk-headset {
135135 status = "okay";
136136 compatible = "rockchip_headset";
137
- headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
138
- spk_ctl_gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
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
139139 pinctrl-names = "default";
140140 pinctrl-0 = <&hp_det>;
141141 io-channels = <&saradc 3>;
....@@ -159,7 +159,7 @@
159159 regulator-boot-on;
160160 enable-active-high;
161161 //gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
162
- gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
162
+ gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
163163 vin-supply = <&vcc_1v8_s0>;
164164 };
165165
....@@ -254,7 +254,7 @@
254254 wifi_chip_type = "ap6398s";
255255 pinctrl-names = "default";
256256 pinctrl-0 = <&wifi_host_wake_irq>;
257
- WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //WIFI_WAKE_HOST_H
257
+ WIFI,host_wake_irq = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; //GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
258258 // WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
259259 status = "okay";
260260 };
....@@ -264,57 +264,45 @@
264264 pinctrl-names = "default";
265265 pinctrl-0 = <&ndj_io_gpio>;
266266
267
-// vcc_5v {
268
-// gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
269
-// gpio_function = <0>;
270
-// };
267
+ usb_power {
268
+ gpio_num = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
269
+ gpio_function = <0>;
270
+ };//USB_HOST_PWREN_H
271271
272272 vcc_12v {
273
- gpio_num = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
273
+ gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
274274 gpio_function = <0>;
275
- };
275
+ };//VCC12_IO_EN_GPIO0_D3_u_3V3
276276
277277 vcc_3v {
278
- gpio_num = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
278
+ gpio_num = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
279279 gpio_function = <0>;
280
- };
280
+ };//VCC3_IO_EN_GPIO4_A1_d_3V3
281281
282282 hub_5V_reset {
283
- gpio_num = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
283
+ gpio_num = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
284284 gpio_function = <3>;
285
- };
285
+ };//HUB_RESET_GPIO4_B6_d_3V3
286286
287287 4g_power {
288
- gpio_num = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>;
288
+ gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
289289 gpio_function = <0>;
290
- };
290
+ };//4G_PWREN_GPIO3_C7_u_3V3
291291
292
- wake_4g {
293
- gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
294
- gpio_function = <0>;
295
- };
292
+// wake_4g {
293
+// gpio_num = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
294
+// gpio_function = <0>;
295
+// };//GPIO2_B5_u_1V8_WF-BT_WAKEUP_IN
296296
297297 air_mode_4g {
298298 gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
299299 gpio_function = <0>;
300
- };
300
+ }; //GPIO2_B4_u_1V8_4G_AIR_MODE_IN
301301
302302 reset_4g {
303303 gpio_num = <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
304304 gpio_function = <3>;
305
- };
306
-/*
307
- spk_ctl {
308
- gpio_num = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>;
309
- gpio_function = <0>;
310
- };
311
-
312
- hp_det
313
- {
314
- gpio_num = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
315
- gpio_function = <1>;
316
- };
317
-*/
305
+ }; //GPIO2_C3_d_1V8_4G_RESET_N_IN
318306 };
319307
320308
....@@ -322,11 +310,11 @@
322310 compatible = "simple-panel";
323311 backlight = <&backlight>;
324312 power-supply = <&vcc3v3_lcd_n>;
325
- vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
326
- enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN
327
- reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
328
- edp-bl-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_BLK-PWR_EN
329
- edp-bl-en = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_D4_d_3V3
313
+ vcc-5v-gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO4_B5_d_3V3
314
+ enable-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //LCD_VDD_EN_GPIO3_C6_u_3V3
315
+ reset-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; //CH7511_RESET_N_1V8
316
+ edp-bl-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>; //LCD_BKL_PWM3_3V3
317
+ edp-bl-en = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //LCD_BKL_EN_GPIO3_A6_d_3V3
330318 bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
331319 bpc = <8>;
332320 prepare-delay-ms = <200>;
....@@ -523,7 +511,7 @@
523511 /* rx_delay = <0x3f>; */
524512
525513 phy-handle = <&rgmii_phy>;
526
- status = "disabled";
514
+ status = "okay";
527515 };
528516
529517 &hdmi0 {
....@@ -868,21 +856,21 @@
868856
869857 &pcie2x1l2 {
870858 phys = <&combphy0_ps PHY_TYPE_PCIE>;
871
- reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
859
+ reset-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;//PCIE20x1_2_RSTn_GPIO3_D0_3V3
872860 vpcie3v3-supply = <&vcc3v3_pcie30>;
873861 status = "okay";
874862 };//MINIPCIE
875863
876864 &pcie2x1l1 {
877865 phys = <&combphy2_psu PHY_TYPE_PCIE>;
878
- reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
866
+ reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;//PCIEX1_1_PERSTn_M1_L
879867 vpcie3v3-supply = <&vcc3v3_pcie30>;
880868 status = "okay";
881869 };//M.2 WIFI6
882870
883871 &pcie2x1l0 {
884872 phys = <&combphy1_ps PHY_TYPE_PCIE>;
885
- reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
873
+ reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; //PCIEx1_0_PERSTn_M1_L
886874 vpcie3v3-supply = <&vcc3v3_pcie30>;
887875 status = "okay";
888876 };//RTL8111H
....@@ -937,7 +925,7 @@
937925 };
938926
939927 spk_con: spk-con {
940
- rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
928
+ rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
941929 };
942930 };
943931
....@@ -1014,22 +1002,22 @@
10141002 ndj_io_init{
10151003 ndj_io_gpio: ndj_io_gpio_col{
10161004 rockchip,pins =
1017
- <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
1018
- <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
1019
- <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
1020
- <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
1021
- <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
1005
+ <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
1006
+ <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
1007
+ <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
1008
+ <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
1009
+ <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
10221010 <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
10231011 <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
1024
- <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
1025
- <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B5_d_3V3
1026
- <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO4_B6_d_3V3
1027
- <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B0_u_3V3
1028
- <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B2_d_3V3
1029
- <3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B3_u_3V3
1030
- <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_B4_u_3V3
1031
- <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_A7_u_3V3
1032
- <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; //GPIO3_A0_u_3V3
1012
+ <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
1013
+ <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
1014
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
1015
+ <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8
1016
+ <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8
1017
+ <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8
1018
+ <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MOSI_M2_1V8
1019
+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, //GPIO3_A7_u_3V3
1020
+ <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; //GPIO3_A0_u_3V3
10331021
10341022 };
10351023 };
....@@ -1152,7 +1140,7 @@
11521140 };
11531141
11541142 &uart3 {
1155
- status = "okay";
1143
+ status = "disabled";
11561144 pinctrl-names = "default";
11571145 pinctrl-0 = <&uart3m1_xfer>;
11581146 };
....@@ -1183,7 +1171,7 @@
11831171 };
11841172
11851173 &uart8 {
1186
- status = "okay";
1174
+ status = "disabled";
11871175 pinctrl-names = "default";
11881176 pinctrl-0 = <&uart8m1_xfer>;
11891177 };