From patchwork Wed Jun 25 12:43:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 363995 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9BD1414001A for ; Wed, 25 Jun 2014 22:44:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756237AbaFYMn7 (ORCPT ); Wed, 25 Jun 2014 08:43:59 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:44000 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752337AbaFYMn6 (ORCPT ); Wed, 25 Jun 2014 08:43:58 -0400 Received: by mail-pa0-f41.google.com with SMTP id fb1so1703892pad.0 for ; Wed, 25 Jun 2014 05:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jmqde0HJGoLEJO31FbDte1/Jmuf+cEdu+UzQyydJEJg=; b=0yO2UZ6TyRnZJ1i1eZKkLVkBRTkt/LBHWkK1CpL/rvpl6gbXQAkGKr/DdS5UO/3+c+ rI8ZwJvSGasOIsEnOg5RCT5/g0890DEED7Ewu1hZveDCt39SGxr9rOJMBfNjVx1BqFBN FHCBIWax6tFyd4vITGPu3nna7WhzxcONMPLm7BsGvsGpGG7EjqiyNPtcjjzUB0iAyOMz Xe3uZkDeTXsxuyySsL6zwzjBJUfVwy/4YLKLV0QFfj6c6Dlb086Ivghq1NzCwDE9iHvN Gm/uddhwFBwah78kyndiMCM3xao82vqZqJt7MVIzjPsKPhoVyGJmQJnKhmu9IhyqTa/t G8WA== X-Received: by 10.66.122.36 with SMTP id lp4mr11359956pab.82.1403700237627; Wed, 25 Jun 2014 05:43:57 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id ao4sm5164727pbc.51.2014.06.25.05.43.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Jun 2014 05:43:57 -0700 (PDT) From: Vivek Gautam To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Vivek Gautam , Jingoo Han , Alan Stern Subject: [PATCH v3 2/2] usb: ohci-exynos: Make provision for vdd regulators Date: Wed, 25 Jun 2014 18:13:55 +0530 Message-Id: <1403700235-30763-1-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402064411-18244-2-git-send-email-gautam.vivek@samsung.com> References: <1402064411-18244-2-git-send-email-gautam.vivek@samsung.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Cc: Jingoo Han Cc: Alan Stern --- Changes from 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 | 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 b04b015..3991c50 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 060a6a4..57c807c 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 #include @@ -41,6 +42,8 @@ struct exynos_ohci_hcd { struct usb_phy *phy; struct usb_otg *otg; struct phy *phy_g[PHY_NUMBER]; + struct regulator *vdd33; + struct regulator *vdd10; }; static int exynos_ohci_get_phy(struct device *dev, @@ -172,7 +175,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"); @@ -233,6 +256,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; } @@ -251,6 +278,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; @@ -282,6 +314,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; } @@ -291,6 +328,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); if (exynos_ohci->otg)