From patchwork Sun Jun 7 13:20:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 6561331 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 D3880C0433 for ; Sun, 7 Jun 2015 13:21:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D341D20562 for ; Sun, 7 Jun 2015 13:21:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B393C20595 for ; Sun, 7 Jun 2015 13:21:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213AbbFGNVN (ORCPT ); Sun, 7 Jun 2015 09:21:13 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:36673 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753175AbbFGNVF (ORCPT ); Sun, 7 Jun 2015 09:21:05 -0400 Received: by pdjm12 with SMTP id m12so83107869pdj.3; Sun, 07 Jun 2015 06:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lRf7fEzTtOGoXX68i4trsXGBEv7KKTosxuL/oWBx/hA=; b=WlbjnUrxl93QPZJpcvJ54GRiCJdkKbg+/KDQDb7hmavCVsWQkkmpMU6Jk1pqN04rMH +UNQ0/JKtpEnZhd0KS5nTOJAOdTSoCktthiOFuXhvl+Pp0aBq6ORB4JFayOl3u183Um5 mYs6yBBkw4hEaG5P7a2xiD9Yn2amhwrxbwJnXk4Sg2GS2CQfXHaBpaATzFolk56p9KBD rZr5L1yRcTv437moQEZGnKnBNyNqQ7WjUhZW28fobQNJS4rZGJjY0Pc+pY7lNqf8f/b+ m/hLFBjX2U9pnNzQgQtN3qtfFEBZr830JV71D9BokuzbWoQ13NvFLdXWM+/d5NUyo5H1 neFg== X-Received: by 10.70.22.131 with SMTP id d3mr21393004pdf.67.1433683264683; Sun, 07 Jun 2015 06:21:04 -0700 (PDT) Received: from odroidxu3.localdomain ([103.249.90.21]) by mx.google.com with ESMTPSA id da2sm11797102pbb.57.2015.06.07.06.20.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jun 2015 06:21:03 -0700 (PDT) From: Anand Moon To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Kukjin Kim , Krzysztof Kozlowski , Alan Stern , Greg Kroah-Hartman , Vivek Gautam , Anand Moon , Felipe Balbi Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Jingoo Han Subject: [RESEND 2/2] usb: ohci-exynos: Make provision for vdd regulators Date: Sun, 7 Jun 2015 22:50:42 +0930 Message-Id: <1433683242-3945-2-git-send-email-linux.amoon@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1433683242-3945-1-git-send-email-linux.amoon@gmail.com> References: <1433683242-3945-1-git-send-email-linux.amoon@gmail.com> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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. With patches for regulators' nodes merged in 3.15: c8c253f ARM: dts: Add regulator entries to smdk5420 275dcd2 ARM: dts: add max77686 pmic node for smdk5250, the exynos systems turn on only minimal number of regulators. Until now, the VDD regulator supplies were either turned on by the bootloader, or the regulators were enabled by default in the kernel, so that the controller drivers did not need to care about turning on these regulators on their own. This was rather bad about these controller drivers. 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. Signed-off-by: Vivek Gautam Signed-off-by: Anand Moon Cc: Jingoo Han Cc: Alan Stern --- Initial version of this patch was part of following series, though they are not dependent on each other, resubmitting after rebasing. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-June/266419.html --- .../devicetree/bindings/usb/exynos-usb.txt | 4 ++ drivers/usb/host/ohci-exynos.c | 55 +++++++++++++++++++++- 2 files changed, 58 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..ce757ea 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -18,6 +18,7 @@ #include #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,10 @@ fail_add_hcd: fail_io: clk_disable_unprepare(exynos_ohci->clk); fail_clk: + regulator_disable(exynos_ohci->vdd10); +fail_regulator2: + regulator_disable(exynos_ohci->vdd33); +fail_regulator1: usb_put_hcd(hcd); return err; } @@ -206,6 +233,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 +266,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 +280,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);