net: ftgmac100: Add reset control
PATCH 1/1 net: ftgmac100: Add reset control
Add optional reset control, especially for the Aspeed SOC. For the hardware without a reset line, the reset assertion/deassertion will be skipped.
--- drivers/net/ftgmac100.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ftgmac100.c +12 -0
@@ -13,6 +13,7 @@#include <common.h> #include <clk.h> +#include <reset.h> #include <cpu_func.h> #include <dm.h> #include <log.h>
@@ -90,6 +91,7 @@ struct ftgmac100_data {u32 max_speed;struct clk_bulk clks; +struct reset_ctl *reset_ctl;/* End of RX/TX ring buffer bits. Depend on model */ u32 rxdes0_edorr_mask;
@@ -568,6 +570,8 @@ static int ftgmac100_of_to_plat(struct udevice *dev) priv->txdes0_edotr_mask =BIT (15 ); } + priv->reset_ctl =devm_reset_control_get_optional (dev,NULL ); +return clk_get_bulk (dev, &priv->clks); }
@@ -593,6 +597,12 @@ static int ftgmac100_probe(struct udevice *dev)if (ret) goto out; +if (priv->reset_ctl) { + ret =reset_deassert (priv->reset_ctl); +if (ret) + goto out; + } +/* * If DM MDIO is enabled, the MDIO bus will be initialized later in * dm_eth_phy_connect
@@ -628,6 +638,8 @@ static int ftgmac100_remove(struct udevice *dev)free (priv->phydev);mdio_unregister (priv->bus);mdio_free (priv->bus); +if (priv->reset_ctl) +reset_assert (priv->reset_ctl);clk_release_bulk (&priv->clks);return 0 ;
Signature · 1 line
2.25.1
Quoted 11 lines
-----Original Message-----
From: Dylan Hung <[email protected]>
Sent: Thursday, July 27, 2023 9:58 AM
To: Ryan Chen <[email protected]>; ChiaWei Wang <[email protected]>; BMC-SW <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; Dylan Hung <[email protected]>
Subject: [PATCH] net: ftgmac100: Add reset control
Quoted 4 lines
Add optional reset control, especially for the Aspeed SOC. For the hardware without a reset line, the reset assertion/deassertion will be skipped.
Signed-off-by Dylan Hung <[email protected]>
Quoted 56 lines
--- drivers/net/ftgmac100.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/net/ftgmac100.c index renamed from drivers/net/ftgmac100.c +0
-0
a50cde338a..886b97119d100644drivers/net/ftgmac100.c +12
-1@@ -13,6 +13,7 @@#include <common.h> #include <clk.h> +#include <reset.h> #include <cpu_func.h> #include <dm.h> #include <log.h> @@ -90,6 +91,7 @@ struct ftgmac100_data {u32 max_speed;struct clk_bulk clks; +struct reset_ctl *reset_ctl;/* End of RX/TX ring buffer bits. Depend on model */ u32 rxdes0_edorr_mask;@@ -568,6 +570,8 @@ static int ftgmac100_of_to_plat(struct udevice *dev) priv->txdes0_edotr_mask =BIT (15 ); } + priv->reset_ctl =devm_reset_control_get_optional (dev,NULL ); +return clk_get_bulk (dev, &priv->clks); }@@ -593,6 +597,12 @@ static int ftgmac100_probe(struct udevice *dev)if (ret) goto out; +if (priv->reset_ctl) { + ret =reset_deassert (priv->reset_ctl); +if (ret) + goto out; + } +/* * If DM MDIO is enabled, the MDIO bus will be initialized later in * dm_eth_phy_connect @@ -628,6 +638,8 @@ static int ftgmac100_remove(struct udevice *dev)free (priv->phydev);mdio_unregister (priv->bus);mdio_free (priv->bus); +if (priv->reset_ctl) +reset_assert (priv->reset_ctl);clk_release_bulk (&priv->clks);return 0 ; --2.25.1
Quoted 62 lines · Dylan Hung
Add optional reset control, especially for the Aspeed SOC. For the hardware without a reset line, the reset assertion/deassertion will be skipped.
Signed-off-by Dylan Hung <[email protected]>--- drivers/net/ftgmac100.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/net/ftgmac100.c +12
-1@@ -13,6 +13,7 @@#include <common.h> #include <clk.h> +#include <reset.h> #include <cpu_func.h> #include <dm.h> #include <log.h> @@ -90,6 +91,7 @@ struct ftgmac100_data {u32 max_speed;struct clk_bulk clks; +struct reset_ctl *reset_ctl;/* End of RX/TX ring buffer bits. Depend on model */ u32 rxdes0_edorr_mask;@@ -568,6 +570,8 @@ static int ftgmac100_of_to_plat(struct udevice *dev) priv->txdes0_edotr_mask =BIT (15 ); } + priv->reset_ctl =devm_reset_control_get_optional (dev,NULL ); +return clk_get_bulk (dev, &priv->clks); }@@ -593,6 +597,12 @@ static int ftgmac100_probe(struct udevice *dev)if (ret) goto out; +if (priv->reset_ctl) { + ret =reset_deassert (priv->reset_ctl); +if (ret) + goto out; + } +/* * If DM MDIO is enabled, the MDIO bus will be initialized later in * dm_eth_phy_connect @@ -628,6 +638,8 @@ static int ftgmac100_remove(struct udevice *dev)free (priv->phydev);mdio_unregister (priv->bus);mdio_free (priv->bus); +if (priv->reset_ctl) +reset_assert (priv->reset_ctl);clk_release_bulk (&priv->clks);return 0 ; --
Quoted 2 lines
2.25.1
Quoted 7 lines · Dylan Hung
Add optional reset control, especially for the Aspeed SOC. For the hardware without a reset line, the reset assertion/deassertion will be skipped.
Signed-off-by Dylan Hung <[email protected]>Reviewed-by Ryan Chen <[email protected]>Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom