From patchwork Sun Jun 26 07:28:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9199235 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 A5EFE60754 for ; Sun, 26 Jun 2016 07:34:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9977F2849E for ; Sun, 26 Jun 2016 07:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CDE828542; Sun, 26 Jun 2016 07:34:59 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 34C032849E for ; Sun, 26 Jun 2016 07:34:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH4Xx-0005Eo-P2; Sun, 26 Jun 2016 07:32:01 +0000 Received: from mail-pf0-x236.google.com ([2607:f8b0:400e:c00::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH4VO-00019w-2G for linux-arm-kernel@lists.infradead.org; Sun, 26 Jun 2016 07:29:23 +0000 Received: by mail-pf0-x236.google.com with SMTP id t190so51885479pfb.3 for ; Sun, 26 Jun 2016 00:29:01 -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=9VWtiXgtnUzorquMBXleONJCDu21WWsPBlOQZ74S8Qc=; b=URjbnNAJf2eITJsTCJ70QL2P40L4r14D592xGKyU5vjhiAnuRaaZY+DYnPbTzIQzkZ pYDTuNQB/d/ppp15g5bjIDWsT2JCgDGPVkL09hXfyh8qgxWigJMput7VznJsQ9dubNzp PuE78ogexjA9zPnpMvNNEqWaRP9XoInLFeanU= 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=9VWtiXgtnUzorquMBXleONJCDu21WWsPBlOQZ74S8Qc=; b=ZhQ+3WSu9zBZZPolkQb24zx1YrLp5AZ7RdWfyIrYwmfil5Z94uJQKyNq08rRK7ph16 9UREorkb+MbCvBUXrE4PKGn9sntgs3oKxEW4li7vcW4izV0sVdiGHi+NIWXI0anNRSYQ jx1eQW/75qPFQ1h55G2UiZ6Zh0OYgYECpMdhcMY3nhjee34osC+ShT1RD4UpZmk6R4a9 l2llW5wpnolj8oaejDjuGHXRfITVarOGOXe9TrWHcj0aHUM7Roef0a7+o8PhGl8UuxXi Q1Au/BCZ8EADLgui3PF8sDzvbERAxOOJTw5Nn8cicgRCm06O4KHovHq3oCBS2l6lU/EM 2HRg== X-Gm-Message-State: ALyK8tLw4hqq1vUVTf0F0U5+Ipwl083QpIHEpHAtwGVxWq23Vs/YiIU5K85Tf5E9rSmdQYWG X-Received: by 10.98.26.148 with SMTP id a142mr22100048pfa.46.1466926141236; Sun, 26 Jun 2016 00:29:01 -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.28.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jun 2016 00:29:00 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Subject: [PATCH 15/21] usb: chipidea: msm: Mux over secondary phy at the right time Date: Sun, 26 Jun 2016 00:28:32 -0700 Message-Id: <20160626072838.28082-16-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160626_002922_184679_1567C10C X-CRM114-Status: GOOD ( 17.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felipe Balbi , Arnd Bergmann , Neil Armstrong , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Peter Chen , Greg Kroah-Hartman , Andy Gross , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We need to pick the correct phy at runtime based on how the SoC has been wired onto the board. If the secondary phy is used, take it out of reset and mux over to it by writing into the TCSR register. Make sure to do this on reset too, because this register is reset to the default value (primary phy) after the RESET bit is set in USBCMD. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 78 +++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 40249b0e3e93..df0f8b31db4f 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -8,30 +8,40 @@ #include #include #include -#include #include #include #include +#include +#include +#include #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_SEC_CTRL 0x0278 +# define HS_PHY_DIG_CLAMP_N BIT(16) struct ci_hdrc_msm { struct platform_device *ci; struct clk *core_clk; struct clk *iface_clk; + bool secondary_phy; + void __iomem *base; }; static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { - struct device *dev = ci->gadget.dev.parent; + struct device *dev = ci->dev->parent; + struct ci_hdrc_msm *msm_ci = dev_get_drvdata(dev); switch (event) { case CI_HDRC_CONTROLLER_RESET_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); + if (msm_ci->secondary_phy) + hw_write_id_reg(ci, HS_PHY_SEC_CTRL, HS_PHY_DIG_CLAMP_N, + HS_PHY_DIG_CLAMP_N); break; default: dev_dbg(dev, "unknown ci_hdrc event\n"); @@ -49,12 +59,58 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { .notify_event = ci_hdrc_msm_notify_event, }; +static int ci_hdrc_msm_mux_phy(struct ci_hdrc_msm *ci, + struct platform_device *pdev) +{ + struct regmap *regmap; + struct device_node *syscon; + struct device *dev = &pdev->dev; + u32 off, val; + int ret; + + syscon = of_parse_phandle(dev->of_node, "phy-select", 0); + if (!syscon) + return 0; + + regmap = syscon_node_to_regmap(syscon); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 1, &off); + if (ret < 0) { + dev_err(dev, "no offset in syscon\n"); + return -EINVAL; + } + + ret = of_property_read_u32_index(dev->of_node, "phy-select", 2, &val); + if (ret < 0) { + dev_err(dev, "no value in syscon\n"); + return -EINVAL; + } + + ret = regmap_write(regmap, off, val); + if (ret) + return ret; + + ci->secondary_phy = !!val; + if (ci->secondary_phy) { + val = readl_relaxed(ci->base + HS_PHY_SEC_CTRL); + val |= HS_PHY_DIG_CLAMP_N; + writel_relaxed(val, ci->base + HS_PHY_SEC_CTRL); + } + + return 0; +} + static int ci_hdrc_msm_probe(struct platform_device *pdev) { struct ci_hdrc_msm *ci; struct platform_device *plat_ci; struct clk *clk; struct reset_control *reset; + struct resource *res; + void __iomem *base; + resource_size_t size; int ret; dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); @@ -76,6 +132,15 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + size = resource_size(res); + ci->base = base = devm_ioremap(&pdev->dev, res->start, size); + if (!base) + return -ENOMEM; + reset_control_assert(reset); usleep_range(10000, 12000); reset_control_deassert(reset); @@ -88,9 +153,12 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_iface; - plat_ci = ci_hdrc_add_device(&pdev->dev, - pdev->resource, pdev->num_resources, - &ci_hdrc_msm_platdata); + ret = ci_hdrc_msm_mux_phy(ci, pdev); + if (ret) + goto err_mux; + + plat_ci = ci_hdrc_add_device(&pdev->dev, pdev->resource, + pdev->num_resources, &ci_hdrc_msm_platdata); if (IS_ERR(plat_ci)) { dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); ret = PTR_ERR(plat_ci);