From patchwork Mon Apr 21 12:16:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 4023981 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B4E6B9F391 for ; Mon, 21 Apr 2014 12:18:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF70F2015E for ; Mon, 21 Apr 2014 12:17:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDF57201E7 for ; Mon, 21 Apr 2014 12:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751323AbaDUMRD (ORCPT ); Mon, 21 Apr 2014 08:17:03 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:33184 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbaDUMRB (ORCPT ); Mon, 21 Apr 2014 08:17:01 -0400 Received: by mail-pb0-f49.google.com with SMTP id jt11so3642576pbb.8 for ; Mon, 21 Apr 2014 05:17:00 -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; bh=Mq85OZ9jj2WAp96Z+yALKoapisHUt2p3ZcitOkf8ymw=; b=eqWrBlacYJWKulAJ0e0uhEB+KxuvqzQq2NKfBURTKR7pzJ1ZYGP6VJ7XINC6z1PNXG ySMBIB2N23f2F5PQHkXAbYmvJ13squrS1AbhEtlJOW5S6mbm4KaWd434qcthWBvC9ciV z0//YI4SLJED2m+iSon/RvPn8eYI/0/Asjriztu2Os+pIMsKF7FlHPc3dz8KIP/z63Vs lM65XNT3NXeOSYf+hQpM79nAz2jHpXX+m3NyQUo7P7KgiBBSpWfKKBVAvmfdSUs4xk2a D0x88lanSjeMhGiB8By1WZqlzdsA8uyE1X3qqyLXyfdbotZrxg9x317pvotxEi7kCrGL ccZQ== X-Received: by 10.66.216.137 with SMTP id oq9mr37223052pac.97.1398082620440; Mon, 21 Apr 2014 05:17:00 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id pr4sm77759348pbb.53.2014.04.21.05.16.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 05:16:59 -0700 (PDT) From: Vivek Gautam To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, stern@rowland.harvard.edu, balbi@ti.com, kgene.kim@samsung.com, Vivek Gautam , Jingoo Han Subject: [PATCH 1/3] usb: ohci-exynos: Make provision for vdd regulators Date: Mon, 21 Apr 2014 17:46:42 +0530 Message-Id: <1398082604-3013-1-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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, certain perripherals will now need to ensure that, they request VDD regulators in their drivers, and enable them so as to make them working. Signed-off-by: Vivek Gautam Cc: Jingoo Han Acked-by: Jingoo Han --- Based on 'usb-next' branch of Greg's usb tree. drivers/usb/host/ohci-exynos.c | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index 68588d8..e2e72a8 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 @@ -37,6 +38,8 @@ struct exynos_ohci_hcd { struct clk *clk; struct usb_phy *phy; struct usb_otg *otg; + struct regulator *vdd33; + struct regulator *vdd10; }; static void exynos_ohci_phy_enable(struct platform_device *pdev) @@ -98,6 +101,28 @@ static int exynos_ohci_probe(struct platform_device *pdev) exynos_ohci->otg = phy->otg; } + exynos_ohci->vdd33 = devm_regulator_get(&pdev->dev, "vdd33"); + if (IS_ERR(exynos_ohci->vdd33)) { + err = PTR_ERR(exynos_ohci->vdd33); + goto fail_regulator1; + } + err = regulator_enable(exynos_ohci->vdd33); + if (err) { + dev_err(&pdev->dev, "Failed to enable VDD33 supply\n"); + goto fail_regulator1; + } + + exynos_ohci->vdd10 = devm_regulator_get(&pdev->dev, "vdd10"); + if (IS_ERR(exynos_ohci->vdd10)) { + err = PTR_ERR(exynos_ohci->vdd10); + goto fail_regulator2; + } + err = regulator_enable(exynos_ohci->vdd10); + if (err) { + dev_err(&pdev->dev, "Failed to enable VDD10 supply\n"); + goto fail_regulator2; + } + skip_phy: exynos_ohci->clk = devm_clk_get(&pdev->dev, "usbhost"); @@ -154,6 +179,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; } @@ -172,6 +201,9 @@ static int exynos_ohci_remove(struct platform_device *pdev) clk_disable_unprepare(exynos_ohci->clk); + regulator_disable(exynos_ohci->vdd10); + regulator_disable(exynos_ohci->vdd33); + usb_put_hcd(hcd); return 0; @@ -208,6 +240,9 @@ static int exynos_ohci_suspend(struct device *dev) clk_disable_unprepare(exynos_ohci->clk); + regulator_disable(exynos_ohci->vdd10); + regulator_disable(exynos_ohci->vdd33); + spin_unlock_irqrestore(&ohci->lock, flags); return 0; @@ -218,6 +253,18 @@ static int exynos_ohci_resume(struct device *dev) struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); struct platform_device *pdev = to_platform_device(dev); + int ret; + + ret = regulator_enable(exynos_ohci->vdd33); + if (ret) { + dev_err(dev, "Failed to enable VDD33 supply\n"); + return ret; + } + ret = regulator_enable(exynos_ohci->vdd10); + if (ret) { + dev_err(dev, "Failed to enable VDD10 supply\n"); + return ret; + } clk_prepare_enable(exynos_ohci->clk);