diff options
| author |   Stephen Boyd <stephen.boyd@linaro.org> | 2017-01-26 16:47:28 -0800 |
|---|---|---|
| committer |   Andy Gross <andy.gross@linaro.org> | 2017-05-26 00:53:24 -0500 |
| commit | ed75d6a969056cc8f5dd2df3af6c75b792b9116b (patch) | |
| tree | ca01533101a8a2bad7ab3c4adedd5f2aaf6e6906 /arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | |
| parent | Linux 4.12-rc1 (diff) | |
| download | linux-dev-ed75d6a969056cc8f5dd2df3af6c75b792b9116b.tar.xz linux-dev-ed75d6a969056cc8f5dd2df3af6c75b792b9116b.zip | |
arm64: dts: qcom: Collapse usb support into one node
We currently have three device nodes for the same USB hardware
block, as evident by the reuse of the same reg address multiple
times. Now that the chipidea driver fully supports OTG with the
MSM wrapper we can collapse all these nodes into one USB device
node, reflecting the true nature of the hardware.
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Diffstat (limited to 'arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index a17f5b9a5de6..f611647e9880 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -215,22 +215,16 @@ usb@78d9000 { extcon = <&usb_id>, <&usb_id>; status = "okay"; - }; - - ehci@78d9000 { - status = "okay"; - }; - - phy@78d9000 { - v1p8-supply = <&pm8916_l7>; - v3p3-supply = <&pm8916_l13>; - vddcx-supply = <&pm8916_s1>; - extcon = <&usb_id>, <&usb_id>; - dr_mode = "otg"; - status = "okay"; - switch-gpio = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_sw_sel_pm>; + adp-disable; + hnp-disable; + srp-disable; + ulpi { + phy { + v1p8-supply = <&pm8916_l7>; + v3p3-supply = <&pm8916_l13>; + extcon = <&usb_id>; + }; + }; }; lpass@07708000 { @@ -348,6 +342,14 @@ pinctrl-0 = <&usb_id_default>; }; + usb-switch { + compatible = "toshiba,tc7usb40mu"; + switch-gpios = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>; + extcon = <&usb_id>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_sw_sel_pm>; + }; + hdmi-out { compatible = "hdmi-connector"; type = "a"; |