hc
2024-08-09 d3d58fa5ee2428cd2dde78fd8eeeeabe916b3835
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -128,7 +128,7 @@
128128 * - PDN (power down when low)
129129 */
130130 post-power-on-delay-ms = <200>;
131
- reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>; //WIFI_REG_ON_H
131
+ reset-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; //BT_DISABLE_GPIO1_C6_d_1V8
132132 };
133133
134134 rk_headset: rk-headset {
....@@ -162,17 +162,6 @@
162162 gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
163163 vin-supply = <&vcc_1v8_s0>;
164164 };
165
-
166
- vcc3v3_lcd1_n: vcc3v3-lcd1-n {
167
- compatible = "regulator-fixed";
168
- regulator-name = "vcc3v3_lcd1_n";
169
- regulator-boot-on;
170
- regulator-min-microvolt = <3300000>;
171
- regulator-max-microvolt = <3300000>;
172
- enable-active-high;
173
- gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
174
- };
175
-
176165
177166 vcc3v3_pcie30: vcc3v3-pcie30 {
178167 compatible = "regulator-fixed";
....@@ -241,11 +230,11 @@
241230 clock-names = "ext_clock";
242231 uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; //UART9_RTSn_M0_BT
243232 pinctrl-names = "default", "rts_gpio";
244
- pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>, <&bt_wake_gpio>, <&bt_irq_gpio>;
233
+ pinctrl-0 = <&uart9m0_rtsn>, <&bt_reset_gpio>;
245234 pinctrl-1 = <&uart9_gpios>;
246
- BT,reset_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; //BT_REG_ON_H
247
- BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
248
- BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
235
+ BT,reset_gpio = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; //BT_DISABLE_GPIO0_B2_u_1V8
236
+ //BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;//HOST_WAKE_BT_H
237
+ //BT,wake_host_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//BT_WAKE_HOST_H
249238 status = "okay";
250239 };
251240
....@@ -263,12 +252,7 @@
263252 compatible = "nk_io_control";
264253 pinctrl-names = "default";
265254 pinctrl-0 = <&ndj_io_gpio>;
266
-
267
- usb_power {
268
- gpio_num = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
269
- gpio_function = <0>;
270
- };//USB_HOST_PWREN_H
271
-
255
+
272256 vcc_12v {
273257 gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
274258 gpio_function = <0>;
....@@ -436,11 +420,11 @@
436420 * when dsi0 is enabled
437421 */
438422 &mipi_dcphy0 {
439
- status = "okay";
423
+ status = "disabled";
440424 };
441425
442426 &dsi0 {
443
- status = "okay";
427
+ status = "disabled";
444428 };
445429
446430 &dsi0_in_vp2 {
....@@ -449,15 +433,6 @@
449433
450434 &dsi0_in_vp3 {
451435 status = "okay";
452
-};
453
-
454
-&dsi0_panel {
455
- power-supply = <&vcc3v3_lcd1_n>; //LCD_PWREN_H
456
- vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
457
- reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>; //MIPIDIS_RST_GPIO1_A0_d_1V8
458
- vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
459
- pinctrl-names = "default";
460
- pinctrl-0 = <&lcd_rst_gpio>;
461436 };
462437
463438 /*
....@@ -949,7 +924,7 @@
949924
950925 sdio-pwrseq {
951926 wifi_enable_h: wifi-enable-h {
952
- rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
927
+ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
953928 };
954929 };
955930
....@@ -980,15 +955,7 @@
980955 };
981956
982957 bt_reset_gpio: bt-reset-gpio {
983
- rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
984
- };
985
-
986
- bt_wake_gpio: bt-wake-gpio {
987
- rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
988
- };
989
-
990
- bt_irq_gpio: bt-irq-gpio {
991
- rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
958
+ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
992959 };
993960 };
994961
....@@ -1002,7 +969,6 @@
1002969 ndj_io_init{
1003970 ndj_io_gpio: ndj_io_gpio_col{
1004971 rockchip,pins =
1005
- <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
1006972 <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
1007973 <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
1008974 <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
....@@ -1015,10 +981,7 @@
1015981 <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8
1016982 <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8
1017983 <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
1021
-
984
+ <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_MOSI_M2_1V8
1022985 };
1023986 };
1024987 };
....@@ -1028,7 +991,7 @@
1028991 };
1029992
1030993 &route_dsi0 {
1031
- status = "okay";
994
+ status = "disabled";
1032995 connect = <&vp3_out_dsi0>;
1033996 };
1034997