From: Martin Blumenstingl Date: Sat, 12 Nov 2016 13:13:04 +0000 (+0100) Subject: phy: meson8b-usb2: request a shared reset line X-Git-Tag: v4.10-rc1~150^2~36^2~15 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5acefd4aed454971eb6c55263a7def8392420e33;p=linux.git 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 Signed-off-by: Kishon Vijay Abraham I --- 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);