From patchwork Mon Apr 21 12:16:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 4024071 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 D66EC9F319 for ; Mon, 21 Apr 2014 12:19:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFBC32021B for ; Mon, 21 Apr 2014 12:19:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FB7C20219 for ; Mon, 21 Apr 2014 12:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbaDUMSB (ORCPT ); Mon, 21 Apr 2014 08:18:01 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:50976 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836AbaDUMRK (ORCPT ); Mon, 21 Apr 2014 08:17:10 -0400 Received: by mail-pa0-f44.google.com with SMTP id bj1so3702855pad.3 for ; Mon, 21 Apr 2014 05:17:09 -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=65P3BaTHQ5yazTIQNbP0RYQGTA9DlJPcoHNnK7pd3EA=; b=1Dz3dX0uyv6bBe1xHzkuVEZRJoNsGvo4kkHDV6QMnSSkwTr0x4YrsZeoeMp9TXqFu4 Bw8N+iKznd1C5Czoi1aU8K/Mz39wr6Egc/q5s3reGfTGvkrao/hge7VSwylJpLrJN61F 3oAxJm/pmYKEMe4HUzdLcdpz/GYe+RNLMAZxKYXvsIt0n3UKmOHAvCnDApfTjtgjEeLI Mc0zuJEwELWOJcpyziPuXl59h4T9FudbsPV9SSIPC40862ZkedPmUNMaVe/Q2xhTkeLQ CIbKhJP2RK+iT9oYK9BtClLfsbnrhFnRGVXRty+hkfaZ9BKw/IEPuepjWsSor/brynGh jLRw== X-Received: by 10.69.26.103 with SMTP id ix7mr37547019pbd.41.1398082628939; Mon, 21 Apr 2014 05:17:08 -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.17.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 05:17:08 -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 2/3] usb: ehci-exynos: Make provision for vdd regulators Date: Mon, 21 Apr 2014 17:46:43 +0530 Message-Id: <1398082604-3013-2-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398082604-3013-1-git-send-email-gautam.vivek@samsung.com> References: <1398082604-3013-1-git-send-email-gautam.vivek@samsung.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=-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 EHCI 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/ehci-exynos.c | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index d1d8c47..a3ca8cc 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,8 @@ struct exynos_ehci_hcd { struct clk *clk; struct usb_phy *phy; struct usb_otg *otg; + struct regulator *vdd33; + struct regulator *vdd10; }; #define to_exynos_ehci(hcd) (struct exynos_ehci_hcd *)(hcd_to_ehci(hcd)->priv) @@ -112,6 +115,28 @@ static int exynos_ehci_probe(struct platform_device *pdev) exynos_ehci->otg = phy->otg; } + exynos_ehci->vdd33 = devm_regulator_get(&pdev->dev, "vdd33"); + if (IS_ERR(exynos_ehci->vdd33)) { + err = PTR_ERR(exynos_ehci->vdd33); + goto fail_regulator1; + } + err = regulator_enable(exynos_ehci->vdd33); + if (err) { + dev_err(&pdev->dev, "Failed to enable VDD33 supply\n"); + goto fail_regulator1; + } + + exynos_ehci->vdd10 = devm_regulator_get(&pdev->dev, "vdd10"); + if (IS_ERR(exynos_ehci->vdd10)) { + err = PTR_ERR(exynos_ehci->vdd10); + goto fail_regulator2; + } + err = regulator_enable(exynos_ehci->vdd10); + if (err) { + dev_err(&pdev->dev, "Failed to enable VDD10 supply\n"); + goto fail_regulator2; + } + skip_phy: exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost"); @@ -178,6 +203,10 @@ fail_add_hcd: fail_io: clk_disable_unprepare(exynos_ehci->clk); fail_clk: + regulator_disable(exynos_ehci->vdd10); +fail_regulator2: + regulator_disable(exynos_ehci->vdd33); +fail_regulator1: usb_put_hcd(hcd); return err; } @@ -197,6 +226,9 @@ static int exynos_ehci_remove(struct platform_device *pdev) clk_disable_unprepare(exynos_ehci->clk); + regulator_disable(exynos_ehci->vdd10); + regulator_disable(exynos_ehci->vdd33); + usb_put_hcd(hcd); return 0; @@ -221,6 +253,9 @@ static int exynos_ehci_suspend(struct device *dev) clk_disable_unprepare(exynos_ehci->clk); + regulator_disable(exynos_ehci->vdd10); + regulator_disable(exynos_ehci->vdd33); + return rc; } @@ -228,6 +263,18 @@ static int exynos_ehci_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd); + int ret; + + ret = regulator_enable(exynos_ehci->vdd33); + if (ret) { + dev_err(dev, "Failed to enable VDD33 supply\n"); + return ret; + } + ret = regulator_enable(exynos_ehci->vdd10); + if (ret) { + dev_err(dev, "Failed to enable VDD10 supply\n"); + return ret; + } clk_prepare_enable(exynos_ehci->clk);