From 317c38224d60b44939fc8d5560dc741b5083f73e Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 26 Feb 2018 19:43:06 +0530 Subject: RFC: db410c: 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 Signed-off-by: Amit Pundir --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 8356f6dca731..e8eca1912916 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -18,6 +18,7 @@ #include #include #include +#include /* * GPIO name legend: proper name = the GPIO line is used as GPIO @@ -231,6 +232,7 @@ adv_bridge: bridge@39 { status = "okay"; + compatible = "adi,adv7533"; reg = <0x39>; @@ -371,14 +373,13 @@ adp-disable; hnp-disable; srp-disable; - dr_mode = "host"; - pinctrl-names = "default"; - pinctrl-0 = <&usb_sw_sel_pm>; + mux-controls = <&usb_switch>; + mux-control-names = "usb_switch"; + ulpi { phy { v1p8-supply = <&pm8916_l7>; v3p3-supply = <&pm8916_l13>; - extcon = <&usb_id>; }; }; }; @@ -512,11 +513,17 @@ usb_id: usb-id { compatible = "linux,extcon-usb-gpio"; - vbus-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>; + id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb_id_default>; }; + usb_switch: usb-switch { + compatible = "gpio-mux"; + mux-gpios = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>; + #mux-control-cells = <0>; + }; + hdmi-out { compatible = "hdmi-connector"; type = "a"; -- cgit v1.2.3