From patchwork Tue Apr 22 11:24:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 4031191 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4165DBFF02 for ; Tue, 22 Apr 2014 11:25:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65F0B201E4 for ; Tue, 22 Apr 2014 11:25:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 679852021F for ; Tue, 22 Apr 2014 11:25:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932180AbaDVLY5 (ORCPT ); Tue, 22 Apr 2014 07:24:57 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:43514 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932265AbaDVLYq (ORCPT ); Tue, 22 Apr 2014 07:24:46 -0400 Received: by mail-pa0-f50.google.com with SMTP id rd3so283492pab.9 for ; Tue, 22 Apr 2014 04:24:45 -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=tumnSGOWr4f3dC0RcGHb3Jaa2H3Cp5dTgH/9WVbx6TY=; b=HD7zMamtds8oQ9ngy/hOXI4zuFtLahfqcN4KvuSF5kVInmosSyz3sdpOUL02jycqCW PYLFiK/78ZnGGwKJY2nLnAZv8AQQpaaYqckLhmG6CtZSaAA0SfPFqIt1L8zIqJGhhJhg jfYTDZP0iTblHY8cTVW61rCxQoupS9zBnLDep+Tt9g816NVHjxgSiNBMOlJyv1FuwIl+ ZNBTt+G1vE1JWfOa/9GYQ1DojL54H8/pC1YOuA2QWvu678IFGi7cmsTGI0t0wFzH0G20 UgpSmx2O3H1N6bW2WpSwXSO8C9WmlfGDveJQPh/4A23zzmjSdIzaoTKDXA2rT4ygPPh3 GUww== X-Received: by 10.66.146.170 with SMTP id td10mr43906679pab.105.1398165885694; Tue, 22 Apr 2014 04:24:45 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id ss2sm200747890pab.8.2014.04.22.04.24.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 04:24:45 -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 Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, balbi@ti.com, kgene.kim@samsung.com, t.figa@samsung.com, k.debski@samsung.com, sylvester.nawrocki@gmail.com Subject: [PATCH v6 2/2] phy: exynos5-usbdrd: Add facility for VBUS supply Date: Tue, 22 Apr 2014 16:54:30 +0530 Message-Id: <1398165871-20326-2-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398165871-20326-1-git-send-email-gautam.vivek@samsung.com> References: <1398165871-20326-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 Adding support to enable/disable VBUS controlled by a regulator, to enable vbus supply on the port. Signed-off-by: Vivek Gautam --- Mistakenly sent a WIP patchset in v5 version of this patch, that gives build errors. So fixed those. Changes from v5: - Removed any mention about sclk_usbphy30* in the driver. drivers/phy/phy-exynos5-usbdrd.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/phy/phy-exynos5-usbdrd.c b/drivers/phy/phy-exynos5-usbdrd.c index ca1f6ab..ad94c98 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 @@ -171,6 +172,7 @@ struct exynos5_usbdrd_phy { unsigned int extrefclk; struct clk *ref_clk; unsigned long ref_rate; + struct regulator *vbus; }; #define to_usbdrd_phy(inst) \ @@ -441,6 +443,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); @@ -448,10 +451,24 @@ 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); + + return ret; } static int exynos5_usbdrd_phy_power_off(struct phy *phy) @@ -464,6 +481,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; @@ -534,7 +555,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) @@ -577,6 +598,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;