Hi Florian,
On 20-09-02 21:39, Florian Fainelli wrote:
> The internal Gigabit PHY on Broadcom STB chips has a digital clock which
> drives its MDIO interface among other things, the driver now requests
> and manage that clock during .probe() and .remove() accordingly.
>
> Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
> ---
> drivers/net/phy/bcm7xxx.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
> index 692048d86ab1..f0ffcdcaef03 100644
> --- a/drivers/net/phy/bcm7xxx.c
> +++ b/drivers/net/phy/bcm7xxx.c
> @@ -11,6 +11,7 @@
> #include "bcm-phy-lib.h"
> #include <linux/bitops.h>
> #include <linux/brcmphy.h>
> +#include <linux/clk.h>
> #include <linux/mdio.h>
>
> /* Broadcom BCM7xxx internal PHY registers */
> @@ -39,6 +40,7 @@
>
> struct bcm7xxx_phy_priv {
> u64 *stats;
> + struct clk *clk;
> };
>
> static int bcm7xxx_28nm_d0_afe_config_init(struct phy_device *phydev)
> @@ -534,7 +536,19 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
> if (!priv->stats)
> return -ENOMEM;
>
> - return 0;
> + priv->clk = devm_clk_get_optional(&phydev->mdio.dev, NULL);
Since the clock is binded to the mdio-dev here..
> + if (IS_ERR(priv->clk))
> + return PTR_ERR(priv->clk);
> +
> + return clk_prepare_enable(priv->clk);
clould we use devm_add_action_or_reset() here so we don't have to
register the .remove() hook?
> +}
> +
> +static void bcm7xxx_28nm_remove(struct phy_device *phydev)
> +{
> + struct bcm7xxx_phy_priv *priv = phydev->priv;
> +
> + clk_disable_unprepare(priv->clk);
> + devm_clk_put(&phydev->mdio.dev, priv->clk);
Is this really necessary? The devm_clk_get_optional() function already
registers the devm_clk_release() hook.
Regards,
Marco
> }
>
> #define BCM7XXX_28NM_GPHY(_oui, _name) \
> @@ -552,6 +566,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
> .get_strings = bcm_phy_get_strings, \
> .get_stats = bcm7xxx_28nm_get_phy_stats, \
> .probe = bcm7xxx_28nm_probe, \
> + .remove = bcm7xxx_28nm_remove, \
> }
>
> #define BCM7XXX_28NM_EPHY(_oui, _name) \
> @@ -567,6 +582,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
> .get_strings = bcm_phy_get_strings, \
> .get_stats = bcm7xxx_28nm_get_phy_stats, \
> .probe = bcm7xxx_28nm_probe, \
> + .remove = bcm7xxx_28nm_remove, \
> }
>
> #define BCM7XXX_40NM_EPHY(_oui, _name) \
> --
> 2.25.1
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
