From patchwork Thu Jul 13 06:09:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9837743 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 157AB60393 for ; Thu, 13 Jul 2017 06:09:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05BAB28604 for ; Thu, 13 Jul 2017 06:09:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE874286D7; Thu, 13 Jul 2017 06:09:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 658A028604 for ; Thu, 13 Jul 2017 06:09:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750877AbdGMGJf (ORCPT ); Thu, 13 Jul 2017 02:09:35 -0400 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 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 727B561411; Thu, 13 Jul 2017 06:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499926174; bh=QhV+LCQY5PufuJzqPyKSOsPj+ZkaJm9/WfV+rec0WqU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YL9O4dJhCjhFa5QWrnX7GhYNr4hxNV/IYx2oTNgLD66SLLTVTRisKDC/nmQabJxHV pHwk5sB7+5OQ/f5p5Ydf4HOHvh4OPIT6b9g5uy7fApkhCEwyPEu15yogJGpTbvoBxE 3C6aLGkYlVI3W/WKcLBGQXPAoM9+Lz1LbtWh4YFA= Received: from localhost (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D9ED76041C; Thu, 13 Jul 2017 06:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499926174; bh=QhV+LCQY5PufuJzqPyKSOsPj+ZkaJm9/WfV+rec0WqU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YL9O4dJhCjhFa5QWrnX7GhYNr4hxNV/IYx2oTNgLD66SLLTVTRisKDC/nmQabJxHV pHwk5sB7+5OQ/f5p5Ydf4HOHvh4OPIT6b9g5uy7fApkhCEwyPEu15yogJGpTbvoBxE 3C6aLGkYlVI3W/WKcLBGQXPAoM9+Lz1LbtWh4YFA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D9ED76041C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sboyd@codeaurora.org Date: Wed, 12 Jul 2017 23:09:33 -0700 From: Stephen Boyd To: Rob Clark Cc: linux-arm-msm@vger.kernel.org, Andy Gross Subject: Re: [PATCH] Revert "arm64: dts: qcom: Collapse usb support into one node" Message-ID: <20170713060933.GT22780@codeaurora.org> References: <20170712125031.20245-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170712125031.20245-1-robdclark@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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";