From patchwork Sun Jun 26 07:28:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9199247 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 AD8A560754 for ; Sun, 26 Jun 2016 07:35:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A053428530 for ; Sun, 26 Jun 2016 07:35:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9503B28542; Sun, 26 Jun 2016 07:35:41 +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 4DEDB28530 for ; Sun, 26 Jun 2016 07:35:41 +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 1bH4Yg-0006CY-D4; Sun, 26 Jun 2016 07:32:46 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH4VR-0001Fw-RX for linux-arm-kernel@lists.infradead.org; Sun, 26 Jun 2016 07:29:27 +0000 Received: by mail-pa0-x22f.google.com with SMTP id wo6so49510219pac.3 for ; Sun, 26 Jun 2016 00:29:05 -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=hVdFe9/csY39mVwFc+1RcTCpyVKSEHGmwSzv+pdc1N8=; b=eh0mzNqAAWhyf9e7U8Wk04LBGH4mXQoPUXA4QjEPvnyFxjDGy3Qulh+9GfIvSD9bVF UaOo/f7hnZ3smS4EbMEUho/aO5eFCcbvpm6rHbsntEKMzajOHWZRdWTTezkCCQx+K7vg fDt0shh/thci6jeGnJ8S3/MxBCew1RnQpjcdU= 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=hVdFe9/csY39mVwFc+1RcTCpyVKSEHGmwSzv+pdc1N8=; b=SKyYcWKyl53Ge14CLJJ8RiUhRCIVDMfqDzPHsi6dXGjhVwWnNxnDjjIqD8biFHn7IC UlFxNQi71c2F1gFEnClj7AqVUaDLTmIBu5i35dhnGVlOmCTyizTM08gJi2nN6TZ21leW P7aSYxyK6UUsORhO2OB+JH+l4XsH9Bs7ainfGCcY1XExfy/k3S0eOstkFtc6Cdu8D/hF hoQGcoueie3q92oW6847W/mVfn9zEnbdWsQb17BhfcMVyo/Vr719Zdg4/V88B/TPVXvT g9O5H7dUK+PKSpYaX1ZuRFw8JlvjQBF3iPJQlknuXGD14IIX+IQvbfGmyDbKv7Fwj62q 647w== X-Gm-Message-State: ALyK8tJW2mMY+48pAHOsxKAPsKKQCRomH/0IQb5bVQDSHXsQTwmIMXPkkOVMiumJrk8D3KZ2 X-Received: by 10.66.80.3 with SMTP id n3mr22850735pax.92.1466926145003; Sun, 26 Jun 2016 00:29:05 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jun 2016 00:29:04 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Subject: [PATCH 18/21] usb: chipidea: msm: Add reset controller for PHY POR bit Date: Sun, 26 Jun 2016 00:28:35 -0700 Message-Id: <20160626072838.28082-19-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_002926_067045_B3194580 X-CRM114-Status: GOOD ( 15.31 ) 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 The MSM chipidea wrapper has two bits that are used to reset the first or second phy. Add support for these bits via the reset controller framework, so that phy drivers can reset their hardware at the right time during initialization. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index fb4340f02c16..7d191928e55b 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -14,14 +14,17 @@ #include #include #include +#include #include #include #include "ci.h" #define HS_PHY_AHB_MODE 0x0098 +#define HS_PHY_CTRL 0x0240 #define HS_PHY_SEC_CTRL 0x0278 # define HS_PHY_DIG_CLAMP_N BIT(16) +# define HS_PHY_POR_ASSERT BIT(0) #define HS_PHY_GENCONFIG 0x009c # define HS_PHY_TXFIFO_IDLE_FORCE_DIS BIT(4) @@ -38,11 +41,38 @@ struct ci_hdrc_msm { struct clk *iface_clk; struct extcon_dev *vbus_edev; struct ci_hdrc_platform_data pdata; + struct reset_controller_dev rcdev; bool secondary_phy; bool hsic; void __iomem *base; }; +static int +ci_hdrc_msm_por_reset(struct reset_controller_dev *r, unsigned long id) +{ + struct ci_hdrc_msm *ci_msm = container_of(r, struct ci_hdrc_msm, rcdev); + void __iomem *addr = ci_msm->base; + u32 val; + + if (id) + addr += HS_PHY_SEC_CTRL; + else + addr += HS_PHY_CTRL; + + val = readl_relaxed(addr); + val |= HS_PHY_POR_ASSERT; + writel_relaxed(val, addr); + udelay(12); + val &= ~HS_PHY_POR_ASSERT; + writel(val, addr); + + return 0; +} + +static const struct reset_control_ops ci_hdrc_msm_reset_ops = { + .reset = ci_hdrc_msm_por_reset, +}; + static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { struct device *dev = ci->dev->parent; @@ -176,13 +206,21 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) ci->vbus_edev = NULL; } + ci->rcdev.owner = THIS_MODULE; + ci->rcdev.ops = &ci_hdrc_msm_reset_ops; + ci->rcdev.of_node = pdev->dev.of_node; + ci->rcdev.nr_resets = 2; + ret = reset_controller_register(&ci->rcdev); + if (ret) + return ret; + reset_control_assert(reset); usleep_range(10000, 12000); reset_control_deassert(reset); ret = clk_prepare_enable(ci->core_clk); if (ret) - return ret; + goto err_core; ret = clk_prepare_enable(ci->iface_clk); if (ret) @@ -220,6 +258,8 @@ err_mux: clk_disable_unprepare(ci->iface_clk); err_iface: clk_disable_unprepare(ci->core_clk); +err_core: + reset_controller_unregister(&ci->rcdev); return ret; } @@ -232,6 +272,7 @@ static int ci_hdrc_msm_remove(struct platform_device *pdev) ci_hdrc_remove_device(ci->ci); clk_disable_unprepare(ci->iface_clk); clk_disable_unprepare(ci->core_clk); + reset_controller_unregister(&ci->rcdev); return 0; }