diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-11-17 15:26:17 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-11-17 15:29:42 +0530 |
| commit | 53cde0fe020fd9594820307661e9b9c42821722d (patch) | |
| tree | 13a936aa58f1ed226f94e8c60f6d2721b8e1eff5 /drivers/phy | |
| parent | 50c0133cd154090446bc19e466df57502f422644 (diff) | |
| download | linux-53cde0fe020fd9594820307661e9b9c42821722d.tar.bz2 | |
phy: amlogic: Revert "phy: amlogic: Replace devm_reset_control_array_get()"
This reverts commit 3cc8e86721ad ("phy: amlogic: Replace
devm_reset_control_array_get()") as it caused build failure
drivers/soc/amlogic/meson-ee-pwrc.c: In function 'meson_ee_pwrc_init_domain':
drivers/soc/amlogic/meson-ee-pwrc.c:416:65: error: expected ';' before 'if'
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/amlogic/phy-meson-axg-pcie.c | 2 | ||||
| -rw-r--r-- | drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c index 2299bab38e05..58a7507a8422 100644 --- a/drivers/phy/amlogic/phy-meson-axg-pcie.c +++ b/drivers/phy/amlogic/phy-meson-axg-pcie.c @@ -153,7 +153,7 @@ static int phy_axg_pcie_probe(struct platform_device *pdev) if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); - priv->reset = devm_reset_control_array_get_exclusive(dev); + priv->reset = devm_reset_control_array_get(dev, false, false); if (IS_ERR(priv->reset)) return PTR_ERR(priv->reset); diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c index 5b471ab80fe2..ebe3d0ddd304 100644 --- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c +++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c @@ -416,7 +416,7 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev) if (ret) goto err_disable_clk_ref; - priv->reset = devm_reset_control_array_get_exclusive(dev); + priv->reset = devm_reset_control_array_get(dev, false, false); if (IS_ERR(priv->reset)) return PTR_ERR(priv->reset); |