From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: Re: [PATCH] Revert "arm64: dts: qcom: Collapse usb support into one node" Date: Wed, 12 Jul 2017 23:09:33 -0700 Message-ID: <20170713060933.GT22780@codeaurora.org> References: <20170712125031.20245-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]:57906 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750808AbdGMGJf (ORCPT ); Thu, 13 Jul 2017 02:09:35 -0400 Content-Disposition: inline In-Reply-To: <20170712125031.20245-1-robdclark@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Rob Clark Cc: linux-arm-msm@vger.kernel.org, Andy Gross On 07/12, Rob Clark wrote: > This gets host USB working again for me on db410c on master. > > This reverts commit ed75d6a969056cc8f5dd2df3af6c75b792b9116b. Signoff? Or was it left out on purpose? Was device mode working on v4.12? I wonder if we could change dr_mode to host and configure the pmic gpio to mux out the right lines to the hub. Then we could retain host mode on db410c (which is probably all that people care about). It would be a smaller fix for this release while we work out the role switch patches. Like this patch? I still need to test it tomorrow, but this may work and allow us to delete the ehci-msm driver sooner. ----8<---- diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi index d94640812194..790b7775b901 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi @@ -17,6 +17,7 @@ function = PMIC_GPIO_FUNC_NORMAL; power-source = ; input-disable; + output-high; }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index bd310ac1967a..8f2decf84bbf 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -213,16 +213,18 @@ }; usb@78d9000 { - extcon = <&usb_id>, <&usb_id>; + extcon = <&usb_id>; status = "okay"; adp-disable; hnp-disable; srp-disable; + dr_mode = "host"; + pinctrl-names = "default"; + pinctrl-0 = <&usb_sw_sel_pm>; ulpi { phy { v1p8-supply = <&pm8916_l7>; v3p3-supply = <&pm8916_l13>; - extcon = <&usb_id>; }; }; }; @@ -342,14 +344,6 @@ 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"; -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project