From patchwork Tue Apr 22 08:03:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 4029661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E06FABFF02 for ; Tue, 22 Apr 2014 08:06:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C6C720204 for ; Tue, 22 Apr 2014 08:06:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 06919201F7 for ; Tue, 22 Apr 2014 08:06:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WcVgd-0001j0-5g; Tue, 22 Apr 2014 08:04:15 +0000 Received: from mail-pb0-f47.google.com ([209.85.160.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WcVga-0001gV-SP for linux-arm-kernel@lists.infradead.org; Tue, 22 Apr 2014 08:04:13 +0000 Received: by mail-pb0-f47.google.com with SMTP id up15so4670672pbc.20 for ; Tue, 22 Apr 2014 01:03:49 -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=GGkHpFDjNan5DZdOTKMGfzhzawF+AKo2Pyro0EPXEEk=; b=MPzN2D34nAWYMaz8HQQFs06pyYKT6M6M09naCcfzhcqlVg9SJHoJwxCqNeqOCnxLz7 MCLpACFVBXQi4LEzEGZ4hPw6SmdjERBaCBn/fcWLp+Fi7eA29BiK8BYL9I0QMKH/I7ur lq4WkvtLCHHpZO3C2+uDnuSk1woSwa7yjtBVEJBhoy4QFNNaOlkC/9uWYxL9PNhUe9/2 w324J7pERBK60QwSv71OdC0mKifxsLaE+eMcwbk6QybJxdg1cSqCilzGLPsQVPcWD2F7 r7JlY+9i9k8eoOXPjFZHiTQMnXqssY1Nje9AcUf3M4DPiJd1LGIJJvocE/h4MW9Y8CHo A+TQ== X-Received: by 10.66.124.163 with SMTP id mj3mr39459541pab.38.1398153829049; Tue, 22 Apr 2014 01:03:49 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id hw8sm82981312pbc.62.2014.04.22.01.03.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 01:03:48 -0700 (PDT) From: Vivek Gautam To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, kishon@ti.com Subject: [PATCH v5 2/2] phy: exynos5-usbdrd: Add facility for VBUS supply Date: Tue, 22 Apr 2014 13:33:15 +0530 Message-Id: <1398153795-28475-3-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398153795-28475-1-git-send-email-gautam.vivek@samsung.com> References: <1398153795-28475-1-git-send-email-gautam.vivek@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140422_010412_947900_04ADE534 X-CRM114-Status: GOOD ( 16.38 ) X-Spam-Score: -0.5 (/) Cc: k.debski@samsung.com, kgene.kim@samsung.com, gregkh@linuxfoundation.org, t.figa@samsung.com, linux-kernel@vger.kernel.org, balbi@ti.com, sylvester.nawrocki@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Adding support to enable/disable VBUS controlled by a regulator, to enable vbus supply on the port. Signed-off-by: Vivek Gautam --- This is v2 version of patch: [PATCH] phy: exynos5-usbdrd: Add facility to toggle vbus gpio on/off https://lkml.org/lkml/2014/4/9/186 Changes from v1: - Using regulator APIs instead of gpio to control VBUS. drivers/phy/phy-exynos5-usbdrd.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/phy/phy-exynos5-usbdrd.c b/drivers/phy/phy-exynos5-usbdrd.c index 89d7ae8..d7e3745 100644 --- a/drivers/phy/phy-exynos5-usbdrd.c +++ b/drivers/phy/phy-exynos5-usbdrd.c @@ -23,6 +23,7 @@ #include #include #include +#include /* Exynos USB PHY registers */ #define EXYNOS5_FSEL_9MHZ6 0x0 @@ -172,6 +173,7 @@ struct exynos5_usbdrd_phy { unsigned int extrefclk; struct clk *ref_clk; unsigned long ref_rate; + struct regulator *vbus; }; #define to_usbdrd_phy(inst) \ @@ -442,6 +444,7 @@ static int exynos5_usbdrd_phy_exit(struct phy *phy) static int exynos5_usbdrd_phy_power_on(struct phy *phy) { + int ret; struct phy_usb_instance *inst = phy_get_drvdata(phy); struct exynos5_usbdrd_phy *phy_drd = to_usbdrd_phy(inst); @@ -449,10 +452,26 @@ static int exynos5_usbdrd_phy_power_on(struct phy *phy) clk_prepare_enable(phy_drd->ref_clk); + /* Enable VBUS supply */ + if (phy_drd->vbus) { + ret = regulator_enable(phy_drd->vbus); + if (ret) { + dev_err(phy_drd->dev, "Failed to enable VBUS supply\n"); + goto fail_vbus; + } + } + /* Power-on PHY*/ inst->phy_cfg->phy_isol(inst, 0); return 0; + +fail_vbus: + clk_disable_unprepare(phy_drd->ref_clk); + if (!IS_ERR(phy_drd->usb30_sclk)) + clk_disable_unprepare(phy_drd->usb30_sclk); + + return ret; } static int exynos5_usbdrd_phy_power_off(struct phy *phy) @@ -465,6 +484,10 @@ static int exynos5_usbdrd_phy_power_off(struct phy *phy) /* Power-off the PHY */ inst->phy_cfg->phy_isol(inst, 1); + /* Disable VBUS supply */ + if (phy_drd->vbus) + regulator_disable(phy_drd->vbus); + clk_disable_unprepare(phy_drd->ref_clk); return 0; @@ -537,7 +560,7 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev) const struct exynos5_usbdrd_phy_drvdata *drv_data; struct regmap *reg_pmu; u32 pmu_offset; - int i; + int i, ret; phy_drd = devm_kzalloc(dev, sizeof(*phy_drd), GFP_KERNEL); if (!phy_drd) @@ -580,6 +603,17 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev) return PTR_ERR(reg_pmu); } + /* Get required GPIO for vbus */ + phy_drd->vbus = devm_regulator_get(dev, "vbus"); + if (IS_ERR(phy_drd->vbus)) { + ret = PTR_ERR(phy_drd->vbus); + if (ret == -EPROBE_DEFER) + return ret; + + dev_warn(dev, "Failed to get VBUS supply regulator\n"); + phy_drd->vbus = NULL; + } + if (of_property_read_u32(node, "samsung,pmu-offset", &pmu_offset)) { dev_err(dev, "Missing pmu-offset for phy isolation\n"); return -EINVAL;