.. | .. |
---|
128 | 128 | * - PDN (power down when low) |
---|
129 | 129 | */ |
---|
130 | 130 | 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 |
---|
132 | 132 | }; |
---|
133 | 133 | |
---|
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>; |
---|
.. | .. |
---|
162 | 162 | gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; |
---|
163 | 163 | vin-supply = <&vcc_1v8_s0>; |
---|
164 | 164 | }; |
---|
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 | | - |
---|
176 | 165 | |
---|
177 | 166 | vcc3v3_pcie30: vcc3v3-pcie30 { |
---|
178 | 167 | compatible = "regulator-fixed"; |
---|
.. | .. |
---|
228 | 217 | */ |
---|
229 | 218 | vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator { |
---|
230 | 219 | compatible = "regulator-fixed"; |
---|
231 | | - gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; |
---|
232 | | - pinctrl-names = "default"; |
---|
233 | | - pinctrl-0 = <&sd_s0_pwr>; |
---|
| 220 | + //gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; |
---|
| 221 | + //pinctrl-names = "default"; |
---|
| 222 | + //pinctrl-0 = <&sd_s0_pwr>; |
---|
234 | 223 | regulator-name = "vcc_3v3_sd_s0"; |
---|
235 | 224 | enable-active-high; |
---|
236 | 225 | }; |
---|
.. | .. |
---|
241 | 230 | clock-names = "ext_clock"; |
---|
242 | 231 | uart_rts_gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; //UART9_RTSn_M0_BT |
---|
243 | 232 | 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>; |
---|
245 | 234 | 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 |
---|
249 | 238 | status = "okay"; |
---|
250 | 239 | }; |
---|
251 | 240 | |
---|
252 | 241 | wireless_wlan: wireless-wlan { |
---|
253 | 242 | compatible = "wlan-platdata"; |
---|
254 | 243 | wifi_chip_type = "ap6398s"; |
---|
255 | | - pinctrl-names = "default"; |
---|
256 | | - pinctrl-0 = <&wifi_host_wake_irq>; |
---|
257 | | - 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 |
---|
258 | 247 | // WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; |
---|
259 | 248 | status = "okay"; |
---|
260 | 249 | }; |
---|
.. | .. |
---|
263 | 252 | compatible = "nk_io_control"; |
---|
264 | 253 | pinctrl-names = "default"; |
---|
265 | 254 | 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 | + |
---|
272 | 256 | vcc_12v { |
---|
273 | 257 | gpio_num = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; |
---|
274 | 258 | gpio_function = <0>; |
---|
.. | .. |
---|
289 | 273 | gpio_function = <0>; |
---|
290 | 274 | };//4G_PWREN_GPIO3_C7_u_3V3 |
---|
291 | 275 | |
---|
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 |
---|
| 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 |
---|
296 | 280 | |
---|
297 | 281 | air_mode_4g { |
---|
298 | 282 | gpio_num = <&gpio2 RK_PB4 GPIO_ACTIVE_LOW>; |
---|
.. | .. |
---|
436 | 420 | * when dsi0 is enabled |
---|
437 | 421 | */ |
---|
438 | 422 | &mipi_dcphy0 { |
---|
439 | | - status = "okay"; |
---|
| 423 | + status = "disabled"; |
---|
440 | 424 | }; |
---|
441 | 425 | |
---|
442 | 426 | &dsi0 { |
---|
443 | | - status = "okay"; |
---|
| 427 | + status = "disabled"; |
---|
444 | 428 | }; |
---|
445 | 429 | |
---|
446 | 430 | &dsi0_in_vp2 { |
---|
.. | .. |
---|
449 | 433 | |
---|
450 | 434 | &dsi0_in_vp3 { |
---|
451 | 435 | 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>; |
---|
461 | 436 | }; |
---|
462 | 437 | |
---|
463 | 438 | /* |
---|
.. | .. |
---|
921 | 896 | |
---|
922 | 897 | headphone { |
---|
923 | 898 | hp_det: hp-det { |
---|
924 | | - rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; |
---|
| 899 | + rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; |
---|
925 | 900 | }; |
---|
926 | 901 | |
---|
927 | 902 | spk_con: spk-con { |
---|
.. | .. |
---|
949 | 924 | |
---|
950 | 925 | sdio-pwrseq { |
---|
951 | 926 | 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>; |
---|
953 | 928 | }; |
---|
954 | 929 | }; |
---|
955 | | - |
---|
| 930 | +/* |
---|
956 | 931 | sdmmc { |
---|
957 | 932 | sd_s0_pwr: sd-s0-pwr { |
---|
958 | 933 | rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>; |
---|
959 | 934 | }; |
---|
960 | 935 | }; |
---|
961 | | - |
---|
| 936 | +*/ |
---|
962 | 937 | touch { |
---|
963 | 938 | touch_gpio: touch-gpio { |
---|
964 | 939 | rockchip,pins = |
---|
.. | .. |
---|
980 | 955 | }; |
---|
981 | 956 | |
---|
982 | 957 | 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>; |
---|
992 | 959 | }; |
---|
993 | 960 | }; |
---|
994 | | - |
---|
| 961 | +/* |
---|
995 | 962 | wireless-wlan { |
---|
996 | 963 | wifi_host_wake_irq: wifi-host-wake-irq { |
---|
997 | | - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>; |
---|
| 964 | + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; |
---|
998 | 965 | }; |
---|
999 | 966 | }; |
---|
1000 | | - |
---|
| 967 | +*/ |
---|
1001 | 968 | |
---|
1002 | 969 | ndj_io_init{ |
---|
1003 | 970 | ndj_io_gpio: ndj_io_gpio_col{ |
---|
1004 | 971 | rockchip,pins = |
---|
1005 | | - <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
1006 | 972 | <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
1007 | 973 | <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
1008 | 974 | <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
1009 | 975 | <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
1010 | 976 | <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
1011 | 977 | <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>, |
---|
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 |
---|
1021 | | - |
---|
| 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 |
---|
1022 | 987 | }; |
---|
1023 | 988 | }; |
---|
1024 | 989 | }; |
---|
.. | .. |
---|
1028 | 993 | }; |
---|
1029 | 994 | |
---|
1030 | 995 | &route_dsi0 { |
---|
1031 | | - status = "okay"; |
---|
| 996 | + status = "disabled"; |
---|
1032 | 997 | connect = <&vp3_out_dsi0>; |
---|
1033 | 998 | }; |
---|
1034 | 999 | |
---|
.. | .. |
---|
1182 | 1147 | pinctrl-names = "default"; |
---|
1183 | 1148 | pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>; |
---|
1184 | 1149 | }; |
---|
| 1150 | + |
---|
| 1151 | + |
---|
| 1152 | +&can0 { |
---|
| 1153 | + status = "okay"; |
---|
| 1154 | + pinctrl-names = "default"; |
---|
| 1155 | + pinctrl-0 = <&can0m0_pins>; |
---|
| 1156 | +}; |
---|
| 1157 | + |
---|
| 1158 | + |
---|
| 1159 | +&can1 { |
---|
| 1160 | + status = "okay"; |
---|
| 1161 | + pinctrl-names = "default"; |
---|
| 1162 | + pinctrl-0 = <&can1m1_pins>; |
---|
| 1163 | +}; |
---|