| .. | .. |
|---|
| 38 | 38 | io-channels = <&saradc 3>; |
|---|
| 39 | 39 | io-channel-names = "adc-detect"; |
|---|
| 40 | 40 | keyup-threshold-microvolt = <1800000>; |
|---|
| 41 | | - pinctrl-0 = <&hp_det>; |
|---|
| 41 | + pinctrl-0 = <&spk_con>; |
|---|
| 42 | 42 | pinctrl-names = "default"; |
|---|
| 43 | | - hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; |
|---|
| 44 | | - spk-con-gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>; |
|---|
| 43 | + //hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; |
|---|
| 44 | + //spk-con-gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>; |
|---|
| 45 | 45 | play-pause-key { |
|---|
| 46 | 46 | label = "playpause"; |
|---|
| 47 | 47 | linux,code = <164>; |
|---|
| .. | .. |
|---|
| 132 | 132 | }; |
|---|
| 133 | 133 | |
|---|
| 134 | 134 | rk_headset: rk-headset { |
|---|
| 135 | | - status = "disabled"; |
|---|
| 135 | + status = "okay"; |
|---|
| 136 | 136 | compatible = "rockchip_headset"; |
|---|
| 137 | | - headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; |
|---|
| 137 | + headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; |
|---|
| 138 | + spk_ctl_gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_LOW>; |
|---|
| 138 | 139 | pinctrl-names = "default"; |
|---|
| 139 | 140 | pinctrl-0 = <&hp_det>; |
|---|
| 140 | 141 | io-channels = <&saradc 3>; |
|---|
| .. | .. |
|---|
| 389 | 390 | &combphy0_ps { |
|---|
| 390 | 391 | status = "okay"; |
|---|
| 391 | 392 | }; |
|---|
| 393 | + |
|---|
| 394 | +/* |
|---|
| 395 | +&usbdrd_dwc3_0 { |
|---|
| 396 | + dr_mode = "otg"; |
|---|
| 397 | + extcon = <&u2phy0>; |
|---|
| 398 | + status = "okay"; |
|---|
| 399 | +}; |
|---|
| 400 | +*/ |
|---|
| 392 | 401 | |
|---|
| 393 | 402 | &combphy1_ps { |
|---|
| 394 | 403 | status = "okay"; |
|---|
| .. | .. |
|---|
| 901 | 910 | hp_det: hp-det { |
|---|
| 902 | 911 | rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; |
|---|
| 903 | 912 | }; |
|---|
| 913 | + |
|---|
| 914 | + spk_con: spk-con { |
|---|
| 915 | + rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; |
|---|
| 916 | + }; |
|---|
| 904 | 917 | }; |
|---|
| 905 | 918 | |
|---|
| 906 | 919 | hym8563 { |
|---|
| .. | .. |
|---|
| 1050 | 1063 | vmmc-supply = <&vcc_3v3_sd_s0>; |
|---|
| 1051 | 1064 | }; |
|---|
| 1052 | 1065 | |
|---|
| 1053 | | -&uart9 { |
|---|
| 1054 | | - status = "okay"; |
|---|
| 1055 | | - pinctrl-names = "default"; |
|---|
| 1056 | | - pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>; |
|---|
| 1057 | | -}; |
|---|
| 1058 | | - |
|---|
| 1059 | 1066 | &u2phy0_otg { |
|---|
| 1060 | 1067 | status = "okay"; |
|---|
| 1068 | + phy-supply = <&vcc5v0_host>; |
|---|
| 1061 | 1069 | }; |
|---|
| 1062 | 1070 | |
|---|
| 1063 | 1071 | &u2phy1_otg { |
|---|
| .. | .. |
|---|
| 1071 | 1079 | &u2phy3_host { |
|---|
| 1072 | 1080 | phy-supply = <&vcc5v0_host>; |
|---|
| 1073 | 1081 | }; |
|---|
| 1074 | | - |
|---|
| 1082 | +#if 0 |
|---|
| 1075 | 1083 | &usbdp_phy0 { |
|---|
| 1076 | 1084 | rockchip,dp-lane-mux = <2 3>; |
|---|
| 1077 | 1085 | status = "okay"; |
|---|
| .. | .. |
|---|
| 1099 | 1107 | status = "okay"; |
|---|
| 1100 | 1108 | }; |
|---|
| 1101 | 1109 | |
|---|
| 1102 | | -&usbdrd_dwc3_0 { |
|---|
| 1103 | | - dr_mode = "otg"; |
|---|
| 1104 | | - extcon = <&u2phy0>; |
|---|
| 1105 | | - status = "okay"; |
|---|
| 1106 | | -}; |
|---|
| 1107 | | - |
|---|
| 1108 | 1110 | &usbdrd_dwc3_1 { |
|---|
| 1109 | 1111 | dr_mode = "host"; |
|---|
| 1110 | 1112 | maximum-speed = "high-speed"; |
|---|
| 1111 | 1113 | status = "okay"; |
|---|
| 1112 | 1114 | }; |
|---|
| 1115 | +#endif |
|---|
| 1113 | 1116 | |
|---|
| 1114 | 1117 | &uart1 { |
|---|
| 1115 | 1118 | status = "okay"; |
|---|