summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2016-11-12 16:13:04 +0300
committerKishon Vijay Abraham I <kishon@ti.com>2016-11-18 15:49:14 +0300
commit5acefd4aed454971eb6c55263a7def8392420e33 (patch)
tree7ce845d2332bf046d3d47febc2d3a4e7f0071747
parentf42bec197d7f6c8c079b62f22ac4857c1e43d28d (diff)
downloadlinux-5acefd4aed454971eb6c55263a7def8392420e33.tar.xz
phy: meson8b-usb2: request a shared reset line
Both PHYs are sharing one reset line. With recent improvements to the reset framework we can now also use reset_control_reset with shared resets. This allows us to drop some workarounds where the reset was only specified for one PHY but not the other, to make sure that the reset it only executed once (as the reset framework was not able to use reset_control_reset with shared reset lines). Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r--drivers/phy/phy-meson8b-usb2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/phy/phy-meson8b-usb2.c b/drivers/phy/phy-meson8b-usb2.c
index dca394732ae3..33c9f4ba157d 100644
--- a/drivers/phy/phy-meson8b-usb2.c
+++ b/drivers/phy/phy-meson8b-usb2.c
@@ -240,8 +240,7 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev)
if (IS_ERR(priv->clk_usb))
return PTR_ERR(priv->clk_usb);
- priv->reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
- NULL);
+ priv->reset = devm_reset_control_get_optional_shared(&pdev->dev, NULL);
if (PTR_ERR(priv->reset) == -EPROBE_DEFER)
return PTR_ERR(priv->reset);