Commit 53cde0fe authored by Vinod Koul's avatar Vinod Koul
Browse files

phy: amlogic: Revert "phy: amlogic: Replace devm_reset_control_array_get()" 



This reverts commit 3cc8e867 ("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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 50c0133c

drivers/phy/amlogic/phy-meson-axg-pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/soc/amlogic/meson-ee-pwrc.c

+2 −1
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev, 
			dev_warn(&pdev->dev, "Invalid resets count %d for domain %s\n",

				 count, dom->desc.name);



		dom->rstc = devm_reset_control_array_get_exclusive(&pdev->dev)

		dom->rstc = devm_reset_control_array_get(&pdev->dev, false,

							 false);

		if (IS_ERR(dom->rstc))

			return PTR_ERR(dom->rstc);

	}

drivers/soc/amlogic/meson-gx-pwrc-vpu.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) 
		return PTR_ERR(regmap_hhi);

	}



	rstc = devm_reset_control_array_get_exclusive(&pdev->dev);

	rstc = devm_reset_control_array_get(&pdev->dev, false, false);

	if (IS_ERR(rstc)) {

		if (PTR_ERR(rstc) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to get reset lines\n");