Unverified Commit 32795631 authored by Mathias Kresin's avatar Mathias Kresin Committed by James Hogan
Browse files

MIPS: lantiq: gphy: Drop reboot/remove reset asserts 



While doing a global software reset, these bits are not cleared and let
some bootloader fail to initialise the GPHYs. The bootloader don't
expect the GPHYs in reset, as they aren't during power on.

The asserts were a workaround for a wrong syscon-reboot mask. With a
mask set which includes the GPHY resets, these resets aren't required
any more.

Fixes: 12653414 ("MIPS: lantiq: Add a GPHY driver which uses the RCU syscon-mfd")
Signed-off-by: default avatarMathias Kresin <dev@kresin.me>
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 4.14+
Patchwork: https://patchwork.linux-mips.org/patch/19003/


[jhogan@kernel.org: Fix build warnings]
Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent 9a3a92cc

drivers/soc/lantiq/gphy.c

+0 −36
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct xway_gphy_priv { 
	struct clk *gphy_clk_gate;

	struct reset_control *gphy_reset;

	struct reset_control *gphy_reset2;

	struct notifier_block gphy_reboot_nb;

	void __iomem *membase;

	char *fw_name;

};
@@ -64,24 +63,6 @@ static const struct of_device_id xway_gphy_match[] = { 
};

MODULE_DEVICE_TABLE(of, xway_gphy_match);



static struct xway_gphy_priv *to_xway_gphy_priv(struct notifier_block *nb)

{

	return container_of(nb, struct xway_gphy_priv, gphy_reboot_nb);

}



static int xway_gphy_reboot_notify(struct notifier_block *reboot_nb,

				   unsigned long code, void *unused)

{

	struct xway_gphy_priv *priv = to_xway_gphy_priv(reboot_nb);



	if (priv) {

		reset_control_assert(priv->gphy_reset);

		reset_control_assert(priv->gphy_reset2);

	}



	return NOTIFY_DONE;

}



static int xway_gphy_load(struct device *dev, struct xway_gphy_priv *priv,

			  dma_addr_t *dev_addr)

{
@@ -205,14 +186,6 @@ static int xway_gphy_probe(struct platform_device *pdev) 
	reset_control_deassert(priv->gphy_reset);

	reset_control_deassert(priv->gphy_reset2);



	/* assert the gphy reset because it can hang after a reboot: */

	priv->gphy_reboot_nb.notifier_call = xway_gphy_reboot_notify;

	priv->gphy_reboot_nb.priority = -1;



	ret = register_reboot_notifier(&priv->gphy_reboot_nb);

	if (ret)

		dev_warn(dev, "Failed to register reboot notifier\n");



	platform_set_drvdata(pdev, priv);



	return ret;
@@ -220,21 +193,12 @@ static int xway_gphy_probe(struct platform_device *pdev) 


static int xway_gphy_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct xway_gphy_priv *priv = platform_get_drvdata(pdev);

	int ret;



	reset_control_assert(priv->gphy_reset);

	reset_control_assert(priv->gphy_reset2);



	iowrite32be(0, priv->membase);



	clk_disable_unprepare(priv->gphy_clk_gate);



	ret = unregister_reboot_notifier(&priv->gphy_reboot_nb);

	if (ret)

		dev_warn(dev, "Failed to unregister reboot notifier\n");



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE