71 lines
1.9 KiB
Diff
71 lines
1.9 KiB
Diff
From 8c7bb37959ab80afc7a646f539817f9a2adfb85a Mon Sep 17 00:00:00 2001
|
|
From: Nick Xie <nick@khadas.com>
|
|
Date: Tue, 25 Aug 2020 10:11:50 +0800
|
|
Subject: [PATCH 39/40] Revert "usb: dwc3: meson-g12a: fix shared reset control
|
|
use"
|
|
|
|
This reverts commit 7a410953d1fb4dbe91ffcfdee9cbbf889d19b0d7.
|
|
---
|
|
drivers/usb/dwc3/dwc3-meson-g12a.c | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
|
|
index 88b75b5a039c..1f7f4d88ed9d 100644
|
|
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
|
|
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
|
|
@@ -737,13 +737,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
|
|
goto err_disable_clks;
|
|
}
|
|
|
|
- ret = reset_control_deassert(priv->reset);
|
|
+ ret = reset_control_reset(priv->reset);
|
|
if (ret)
|
|
- goto err_assert_reset;
|
|
+ goto err_disable_clks;
|
|
|
|
ret = dwc3_meson_g12a_get_phys(priv);
|
|
if (ret)
|
|
- goto err_assert_reset;
|
|
+ goto err_disable_clks;
|
|
|
|
ret = priv->drvdata->setup_regmaps(priv, base);
|
|
if (ret)
|
|
@@ -752,7 +752,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
|
|
if (priv->vbus) {
|
|
ret = regulator_enable(priv->vbus);
|
|
if (ret)
|
|
- goto err_assert_reset;
|
|
+ goto err_disable_clks;
|
|
}
|
|
|
|
/* Get dr_mode */
|
|
@@ -765,13 +765,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
|
|
|
|
ret = priv->drvdata->usb_init(priv);
|
|
if (ret)
|
|
- goto err_assert_reset;
|
|
+ goto err_disable_clks;
|
|
|
|
/* Init PHYs */
|
|
for (i = 0 ; i < PHY_COUNT ; ++i) {
|
|
ret = phy_init(priv->phys[i]);
|
|
if (ret)
|
|
- goto err_assert_reset;
|
|
+ goto err_disable_clks;
|
|
}
|
|
|
|
/* Set PHY Power */
|
|
@@ -809,9 +809,6 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
|
|
for (i = 0 ; i < PHY_COUNT ; ++i)
|
|
phy_exit(priv->phys[i]);
|
|
|
|
-err_assert_reset:
|
|
- reset_control_assert(priv->reset);
|
|
-
|
|
err_disable_clks:
|
|
clk_bulk_disable_unprepare(priv->drvdata->num_clks,
|
|
priv->drvdata->clks);
|
|
--
|
|
2.25.1
|
|
|