Commit a6498d51 authored by Amjad Ouled-Ameur's avatar Amjad Ouled-Ameur Committed by Greg Kroah-Hartman

Revert "usb: dwc3: meson-g12a: fix shared reset control use"

This reverts commit 7a410953.

This commit breaks USB on meson-gxl-s905x-libretech-cc. Reverting
the change solves the issue.

In fact, according to the reset framework code, consumers must not use
reset_control_(de)assert() on shared reset lines when reset_control_reset
has been used, and vice-versa.

Moreover, with this commit, usb is not guaranted to be reset since the
reset is likely to be initially deasserted.

Reverting the commit will bring back the suspend warning mentioned in the
commit description. Nevertheless, a warning is much less critical than
breaking dwc3-meson-g12a USB completely. We will address the warning
issue in another way as a 2nd step.

Fixes: 7a410953 ("usb: dwc3: meson-g12a: fix shared reset control use")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarAmjad Ouled-Ameur <aouledameur@baylibre.com>
Reported-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20200827144810.26657-1-aouledameur@baylibre.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f3546ff
...@@ -737,13 +737,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) ...@@ -737,13 +737,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
goto err_disable_clks; goto err_disable_clks;
} }
ret = reset_control_deassert(priv->reset); ret = reset_control_reset(priv->reset);
if (ret) if (ret)
goto err_assert_reset; goto err_disable_clks;
ret = dwc3_meson_g12a_get_phys(priv); ret = dwc3_meson_g12a_get_phys(priv);
if (ret) if (ret)
goto err_assert_reset; goto err_disable_clks;
ret = priv->drvdata->setup_regmaps(priv, base); ret = priv->drvdata->setup_regmaps(priv, base);
if (ret) if (ret)
...@@ -752,7 +752,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) ...@@ -752,7 +752,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
if (priv->vbus) { if (priv->vbus) {
ret = regulator_enable(priv->vbus); ret = regulator_enable(priv->vbus);
if (ret) if (ret)
goto err_assert_reset; goto err_disable_clks;
} }
/* Get dr_mode */ /* Get dr_mode */
...@@ -765,13 +765,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) ...@@ -765,13 +765,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
ret = priv->drvdata->usb_init(priv); ret = priv->drvdata->usb_init(priv);
if (ret) if (ret)
goto err_assert_reset; goto err_disable_clks;
/* Init PHYs */ /* Init PHYs */
for (i = 0 ; i < PHY_COUNT ; ++i) { for (i = 0 ; i < PHY_COUNT ; ++i) {
ret = phy_init(priv->phys[i]); ret = phy_init(priv->phys[i]);
if (ret) if (ret)
goto err_assert_reset; goto err_disable_clks;
} }
/* Set PHY Power */ /* Set PHY Power */
...@@ -809,9 +809,6 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) ...@@ -809,9 +809,6 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
for (i = 0 ; i < PHY_COUNT ; ++i) for (i = 0 ; i < PHY_COUNT ; ++i)
phy_exit(priv->phys[i]); phy_exit(priv->phys[i]);
err_assert_reset:
reset_control_assert(priv->reset);
err_disable_clks: err_disable_clks:
clk_bulk_disable_unprepare(priv->drvdata->num_clks, clk_bulk_disable_unprepare(priv->drvdata->num_clks,
priv->drvdata->clks); priv->drvdata->clks);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment