From patchwork Sun Jun 26 07:28:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 70876 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp556037qgy; Sun, 26 Jun 2016 00:34:02 -0700 (PDT) X-Received: by 10.98.75.146 with SMTP id d18mr22166695pfj.19.1466926442429; Sun, 26 Jun 2016 00:34:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l189si18108519pfl.125.2016.06.26.00.33.59; Sun, 26 Jun 2016 00:34:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752499AbcFZHd6 (ORCPT + 30 others); Sun, 26 Jun 2016 03:33:58 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:35842 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752138AbcFZH3D (ORCPT ); Sun, 26 Jun 2016 03:29:03 -0400 Received: by mail-pf0-f171.google.com with SMTP id t190so51885558pfb.3 for ; Sun, 26 Jun 2016 00:29:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TGqOiRd/uOdC5FZrHwX5ELr8t9DLnS+iQ4VZku05hbI=; b=KIaFPv/KtKuMvV/IzmQ0eeMq1gV6ZEFZ7s1u76t47tj9YfkSksf8a4vBTPuRXKKJHo js/egdvSLnM4i3Ki1DvXIGwdeUSCNZLy2MbN3YN5KjoQmOpuUvr/xTs4gSL0IBcxCW+A 3uD9xiLJeidSz3RZJ379RIMY9Oa15cEQR9snI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TGqOiRd/uOdC5FZrHwX5ELr8t9DLnS+iQ4VZku05hbI=; b=E+1zr+SfStzL59+nToOj7jbU/o3Fg/87EUoL2Q/bQ27DiHu7joUgN+tpVRMopdh1PG 1jccYcREkSo5RY1BfY4VdKQojut0qUv7Gxcm2oL8gcG3YLpv6+8e47acbCKjcL2XBFUs u7XpC53ubOOQPLHbTL/WuVZrrTQxMEhTf0f9f6pkPIWbvEwrw43LnCYIzu9fnENfVzOd XMEWczrD2N8P2y41ghqjl2mS37ejnYv1MoLp4UK4Vh8Q+oRq8hyTCwffAobiqnxCTc2w h+wFq3pAxrpS4g5eN27+KsKabw4iQw5EY/gHfCF2V/aOyjmPBMHuhN+yGCOYD4ivRGC6 O6jA== X-Gm-Message-State: ALyK8tKCSj+oveNFSWVP/H2YVUm9Zvif2bV5pGaxAeA3LowJDKCcf2J7TE5jR3svs1Bx3RhN X-Received: by 10.98.205.79 with SMTP id o76mr22027110pfg.37.1466926142417; Sun, 26 Jun 2016 00:29:02 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id f138sm3790495pfa.17.2016.06.26.00.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jun 2016 00:29:02 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman Subject: [PATCH 16/21] usb: chipidea: msm: Restore wrapper settings after reset Date: Sun, 26 Jun 2016 00:28:33 -0700 Message-Id: <20160626072838.28082-17-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the RESET bit is set in the USBCMD register it resets quite a few of the wrapper's registers to their reset state. This includes the GENCONFIG and GENCONFIG2 registers. Currently this is done by the usb phy and ehci-msm drivers writing into the controller wrapper's MMIO address space. Let's consolidate the register writes into the wrapper driver instead so that we clearly split the wrapper from the phys. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) -- 2.9.0.rc2.8.ga28705d diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index df0f8b31db4f..cc6f9b0df9d5 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include "ci.h" @@ -21,11 +23,22 @@ #define HS_PHY_SEC_CTRL 0x0278 # define HS_PHY_DIG_CLAMP_N BIT(16) +#define HS_PHY_GENCONFIG 0x009c +# define HS_PHY_TXFIFO_IDLE_FORCE_DIS BIT(4) + +#define HS_PHY_GENCONFIG_2 0x00a0 +# define HS_PHY_SESS_VLD_CTRL_EN BIT(7) +# define HS_PHY_ULPI_TX_PKT_EN_CLR_FIX BIT(19) + +#define HSPHY_SESS_VLD_CTRL BIT(25) + struct ci_hdrc_msm { struct platform_device *ci; struct clk *core_clk; struct clk *iface_clk; + struct extcon_dev *vbus_edev; bool secondary_phy; + bool hsic; void __iomem *base; }; @@ -39,9 +52,26 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); /* use AHB transactor, allow posted data writes */ hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); + /* workaround for rx buffer collision issue */ + hw_write_id_reg(ci, HS_PHY_GENCONFIG, + HS_PHY_TXFIFO_IDLE_FORCE_DIS, 0); + if (msm_ci->secondary_phy) hw_write_id_reg(ci, HS_PHY_SEC_CTRL, HS_PHY_DIG_CLAMP_N, HS_PHY_DIG_CLAMP_N); + + if (!msm_ci->hsic) + hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, + HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0); + + if (msm_ci->vbus_edev) { + hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, + HS_PHY_SESS_VLD_CTRL_EN, + HS_PHY_SESS_VLD_CTRL_EN); + hw_write(ci, OP_USBCMD, HSPHY_SESS_VLD_CTRL, + HSPHY_SESS_VLD_CTRL); + + } break; default: dev_dbg(dev, "unknown ci_hdrc event\n"); @@ -112,6 +142,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) void __iomem *base; resource_size_t size; int ret; + struct device_node *ulpi_node, *phy_node; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -141,6 +172,13 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (!base) return -ENOMEM; + ci->vbus_edev = extcon_get_edev_by_phandle(&pdev->dev, 0); + if (IS_ERR(ci->vbus_edev)) { + if (PTR_ERR(ci->vbus_edev) != -ENODEV) + return PTR_ERR(ci->vbus_edev); + ci->vbus_edev = NULL; + } + reset_control_assert(reset); usleep_range(10000, 12000); reset_control_deassert(reset); @@ -157,6 +195,14 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_mux; + ulpi_node = of_find_node_by_name(pdev->dev.of_node, "ulpi"); + if (ulpi_node) { + phy_node = of_get_next_available_child(ulpi_node, NULL); + ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy"); + of_node_put(phy_node); + } + of_node_put(ulpi_node); + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, pdev->num_resources, &ci_hdrc_msm_platdata); if (IS_ERR(plat_ci)) {