aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/phy/phy-samsung-usb2.c
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2015-08-21 08:38:37 -0400
committerKishon Vijay Abraham I <kishon@ti.com>2015-10-06 10:51:47 -0400
commita007ddbaef5317f76bec541688e304f31ad9c4b0 (patch)
treea991e43fb013d8b4397beec3c363aac12a083b44 /drivers/phy/phy-samsung-usb2.c
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
phy: exynos-usb2: add vbus regulator support
Exynos USB2 PHY has separate power supply, which is usually provided by VBUS regulator. This patch adds support for it. VBUS regulator is optional, to keep compatibility with boards, which have VBUS provided from some always-on power source. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/phy-samsung-usb2.c')
-rw-r--r--drivers/phy/phy-samsung-usb2.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/drivers/phy/phy-samsung-usb2.c b/drivers/phy/phy-samsung-usb2.c
index f278a9c547e1..1d22d93b552d 100644
--- a/drivers/phy/phy-samsung-usb2.c
+++ b/drivers/phy/phy-samsung-usb2.c
@@ -27,6 +27,13 @@ static int samsung_usb2_phy_power_on(struct phy *phy)
27 27
28 dev_dbg(drv->dev, "Request to power_on \"%s\" usb phy\n", 28 dev_dbg(drv->dev, "Request to power_on \"%s\" usb phy\n",
29 inst->cfg->label); 29 inst->cfg->label);
30
31 if (drv->vbus) {
32 ret = regulator_enable(drv->vbus);
33 if (ret)
34 goto err_regulator;
35 }
36
30 ret = clk_prepare_enable(drv->clk); 37 ret = clk_prepare_enable(drv->clk);
31 if (ret) 38 if (ret)
32 goto err_main_clk; 39 goto err_main_clk;
@@ -48,6 +55,9 @@ err_power_on:
48err_instance_clk: 55err_instance_clk:
49 clk_disable_unprepare(drv->clk); 56 clk_disable_unprepare(drv->clk);
50err_main_clk: 57err_main_clk:
58 if (drv->vbus)
59 regulator_disable(drv->vbus);
60err_regulator:
51 return ret; 61 return ret;
52} 62}
53 63
@@ -55,7 +65,7 @@ static int samsung_usb2_phy_power_off(struct phy *phy)
55{ 65{
56 struct samsung_usb2_phy_instance *inst = phy_get_drvdata(phy); 66 struct samsung_usb2_phy_instance *inst = phy_get_drvdata(phy);
57 struct samsung_usb2_phy_driver *drv = inst->drv; 67 struct samsung_usb2_phy_driver *drv = inst->drv;
58 int ret; 68 int ret = 0;
59 69
60 dev_dbg(drv->dev, "Request to power_off \"%s\" usb phy\n", 70 dev_dbg(drv->dev, "Request to power_off \"%s\" usb phy\n",
61 inst->cfg->label); 71 inst->cfg->label);
@@ -68,7 +78,10 @@ static int samsung_usb2_phy_power_off(struct phy *phy)
68 } 78 }
69 clk_disable_unprepare(drv->ref_clk); 79 clk_disable_unprepare(drv->ref_clk);
70 clk_disable_unprepare(drv->clk); 80 clk_disable_unprepare(drv->clk);
71 return 0; 81 if (drv->vbus)
82 ret = regulator_disable(drv->vbus);
83
84 return ret;
72} 85}
73 86
74static const struct phy_ops samsung_usb2_phy_ops = { 87static const struct phy_ops samsung_usb2_phy_ops = {
@@ -203,6 +216,14 @@ static int samsung_usb2_phy_probe(struct platform_device *pdev)
203 return ret; 216 return ret;
204 } 217 }
205 218
219 drv->vbus = devm_regulator_get(dev, "vbus");
220 if (IS_ERR(drv->vbus)) {
221 ret = PTR_ERR(drv->vbus);
222 if (ret == -EPROBE_DEFER)
223 return ret;
224 drv->vbus = NULL;
225 }
226
206 for (i = 0; i < drv->cfg->num_phys; i++) { 227 for (i = 0; i < drv->cfg->num_phys; i++) {
207 char *label = drv->cfg->phys[i].label; 228 char *label = drv->cfg->phys[i].label;
208 struct samsung_usb2_phy_instance *p = &drv->instances[i]; 229 struct samsung_usb2_phy_instance *p = &drv->instances[i];