From patchwork Mon Jun 8 11:07:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 6564201 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ACA05C0020 for ; Mon, 8 Jun 2015 11:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B266E20531 for ; Mon, 8 Jun 2015 11:06:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F25220544 for ; Mon, 8 Jun 2015 11:06:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752670AbbFHLGn (ORCPT ); Mon, 8 Jun 2015 07:06:43 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:54289 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbbFHLGj (ORCPT ); Mon, 8 Jun 2015 07:06:39 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NPM00LCNHJ1U010@mailout3.samsung.com>; Mon, 08 Jun 2015 20:06:37 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id EE.94.17770.D3775755; Mon, 8 Jun 2015 20:06:37 +0900 (KST) X-AuditID: cbfee691-f79ca6d00000456a-f4-5575773d6e6e Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 6A.BC.05312.D3775755; Mon, 8 Jun 2015 20:06:37 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NPM000DFHGWYR80@mmp1.samsung.com>; Mon, 08 Jun 2015 20:06:37 +0900 (KST) From: Vivek Gautam To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org, gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Jingoo Han , Krzysztof Kozlowski , Alan Stern Subject: [PATCH v4 2/2] usb: ohci-exynos: Make provision for vdd regulators Date: Mon, 08 Jun 2015 16:37:13 +0530 Message-id: <1433761633-8542-2-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 2.2.0 In-reply-to: <1433761633-8542-1-git-send-email-gautam.vivek@samsung.com> References: <1433761633-8542-1-git-send-email-gautam.vivek@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsWyRsSkVte2vDTU4P5deYv5R86xWjQvXs9m cXnhJVaL1y8MLS7vmsNmMeP8PiaLRctamS0m/L7A5sDhsX/uGnaP2Xd/MHr0bVnF6PF5k1wA SxSXTUpqTmZZapG+XQJXxvYPK9kK5qpXbLnzn7GBcYtCFyMnh4SAicSuH9MZIWwxiQv31rN1 MXJxCAksZZS4tbiZEaaob+ETVojEIkaJlnWtTCAJIYFWJokri4tAbDYBXYmmt7vAGkQE4iSW vXkGNolZYDejxL47v8ESwgLeEjMXHGABsVkEVCUmNu0BG8Qr4C5xYFEP1DY5iS23HrF3MXJw cAp4SDy/EAWxy13i/LZPzCAzJQTmsUtcfdjKCjFHQOLb5EMsIPUSArISmw4wQ4yRlDi44gbL BEbhBYwMqxhFUwuSC4qT0otM9YoTc4tL89L1kvNzNzECg/z0v2cTdzDeP2B9iFGAg1GJh/fA opJQIdbEsuLK3EOMpkAbJjJLiSbnA2MpryTe0NjMyMLUxNTYyNzSTEmcV0f6Z7CQQHpiSWp2 ampBalF8UWlOavEhRiYOTqkGRmZZmU9mpyZflef7sSzp3a0FVp7858/fM/UyW6/r93x6c1nT 0ZWquSyr2M98/2z6TmHVGdOV3VeiLh+OlfjfdpehTIi5gbd7l26u/6pti5QCD/x+JWpe4JF1 3SLKWzbf3Sa03G/p2yvrs670vdZoCpPYkBM3IbjmsFP89f7N6QH/WLdVLtI0UWIpzkg01GIu Kk4EACyO+CZtAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsVy+t9jAV3b8tJQg5MrJS3mHznHatG8eD2b xeWFl1gtXr8wtLi8aw6bxYzz+5gsFi1rZbaY8PsCmwOHx/65a9g9Zt/9wejRt2UVo8fnTXIB LFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5QGco KZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLrMTJAAwlrGDO2f1jJVjBXvWLLnf+MDYxb FLoYOTkkBEwk+hY+YYWwxSQu3FvP1sXIxSEksIhRomVdKxNIQkiglUniyuIiEJtNQFei6e0u RhBbRCBOYtmbZ2ANzAK7GSX23fkNlhAW8JaYueAAC4jNIqAqMbFpD9ggXgF3iQOLehghtslJ bLn1iL2LkYODU8BD4vmFKIhd7hLnt31insDIu4CRYRWjaGpBckFxUnqukV5xYm5xaV66XnJ+ 7iZGcAw9k97BuKrB4hCjAAejEg/vgUUloUKsiWXFlbmHGCU4mJVEeJksSkOFeFMSK6tSi/Lj i0pzUosPMZoCHTWRWUo0OR8Y33kl8YbGJuamxqaWJhYmZpZK4rwn831ChQTSE0tSs1NTC1KL YPqYODilGhgVP/9/fC1vU1rC6kl3mhs+sJl+yBT9J/P8q+/i/KterCp1lZGv6n3ZakOyt3nO DymOvryFgfXxyguvS5JCrvkILH0QGl/w7nCMFbvsuklW13SCfm8uvPaoXmSesM7Z47Uvgt0m zjzgNHXXG81FDaucH8hu9D5ZNvnZKeZV0xZMnJurJWjelGusxFKckWioxVxUnAgAF5BCPLcC AAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Facilitate getting required 3.3V and 1.0V VDD supply for OHCI controller on Exynos. For example, patches for regulators' nodes: c8c253f ARM: dts: Add regulator entries to smdk5420 275dcd2 ARM: dts: add max77686 pmic node for smdk5250, enable only minimum number of regulators on smdk5250. So ensuring now that the controller driver requests the necessary VDD regulators (if available, unless there are direct VDD rails), and enable them so as to make them working on exynos systems. Signed-off-by: Vivek Gautam Cc: Jingoo Han Cc: Krzysztof Kozlowski Cc: Alan Stern --- Changes since v3: - added a if (!IS_ERR()) check for regulators before disabling them in error path. Changes since v2: - replaced devm_regulator_get() with devm_regulator_get_optional(). - Added Documentation for the vdd supplies for the controller. - Re-did the commit message. .../devicetree/bindings/usb/exynos-usb.txt | 2 + .../devicetree/bindings/usb/exynos-usb.txt | 4 ++ drivers/usb/host/ohci-exynos.c | 57 +++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt index 776fa03..3883baa 100644 --- a/Documentation/devicetree/bindings/usb/exynos-usb.txt +++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt @@ -63,6 +63,10 @@ Required properties: port 2 is HSIC phy1 - phys: from the *Generic PHY* bindings, specifying phy used by port. +Optional properties: + - vdd33-supply: handle to 3.3V Vdd supply regulator for the controller. + - vdd10-supply: handle to 1.0V Vdd supply regulator for the controller. + Example: usb@12120000 { compatible = "samsung,exynos4210-ohci"; diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index 2cd105b..4d6dea4 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,8 @@ static struct hc_driver __read_mostly exynos_ohci_hc_driver; struct exynos_ohci_hcd { struct clk *clk; struct phy *phy[PHY_NUMBER]; + struct regulator *vdd33; + struct regulator *vdd10; }; static int exynos_ohci_get_phy(struct device *dev, @@ -139,7 +142,27 @@ static int exynos_ohci_probe(struct platform_device *pdev) err = exynos_ohci_get_phy(&pdev->dev, exynos_ohci); if (err) - goto fail_clk; + goto fail_regulator1; + + exynos_ohci->vdd33 = devm_regulator_get_optional(&pdev->dev, "vdd33"); + if (!IS_ERR(exynos_ohci->vdd33)) { + err = regulator_enable(exynos_ohci->vdd33); + if (err) { + dev_err(&pdev->dev, + "Failed to enable 3.3V Vdd supply\n"); + goto fail_regulator1; + } + } + + exynos_ohci->vdd10 = devm_regulator_get_optional(&pdev->dev, "vdd10"); + if (!IS_ERR(exynos_ohci->vdd10)) { + err = regulator_enable(exynos_ohci->vdd10); + if (err) { + dev_err(&pdev->dev, + "Failed to enable 1.0V Vdd supply\n"); + goto fail_regulator2; + } + } skip_phy: exynos_ohci->clk = devm_clk_get(&pdev->dev, "usbhost"); @@ -191,6 +214,12 @@ fail_add_hcd: fail_io: clk_disable_unprepare(exynos_ohci->clk); fail_clk: + if (!IS_ERR(exynos_ohci->vdd10)) + regulator_disable(exynos_ohci->vdd10); +fail_regulator2: + if (!IS_ERR(exynos_ohci->vdd33)) + regulator_disable(exynos_ohci->vdd33); +fail_regulator1: usb_put_hcd(hcd); return err; } @@ -206,6 +235,11 @@ static int exynos_ohci_remove(struct platform_device *pdev) clk_disable_unprepare(exynos_ohci->clk); + if (!IS_ERR(exynos_ohci->vdd33)) + regulator_disable(exynos_ohci->vdd33); + if (!IS_ERR(exynos_ohci->vdd10)) + regulator_disable(exynos_ohci->vdd10); + usb_put_hcd(hcd); return 0; @@ -234,6 +268,11 @@ static int exynos_ohci_suspend(struct device *dev) clk_disable_unprepare(exynos_ohci->clk); + if (!IS_ERR(exynos_ohci->vdd33)) + regulator_disable(exynos_ohci->vdd33); + if (!IS_ERR(exynos_ohci->vdd10)) + regulator_disable(exynos_ohci->vdd10); + return 0; } @@ -243,6 +282,22 @@ static int exynos_ohci_resume(struct device *dev) struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); int ret; + if (!IS_ERR(exynos_ohci->vdd33)) { + ret = regulator_enable(exynos_ohci->vdd33); + if (ret) { + dev_err(dev, "Failed to enable 3.3V Vdd supply\n"); + return ret; + } + } + + if (!IS_ERR(exynos_ohci->vdd10)) { + ret = regulator_enable(exynos_ohci->vdd10); + if (ret) { + dev_err(dev, "Failed to enable 1.0V Vdd supply\n"); + return ret; + } + } + clk_prepare_enable(exynos_ohci->clk); ret = exynos_ohci_phy_enable(dev);