Am Thu, Feb 20, 2025 at 09:43:13AM +0100 schrieb Marc Kleine-Budde:
> On 20.02.2025 09:22:11, Dimitri Fedrau via B4 Relay wrote:
> > From: Dimitri Fedrau <dimitri.fedrau@xxxxxxxxxxxx>
> >
> > Currently the flexcan driver does only support adding PHYs by using the
> > "old" regulator bindings. Add support for CAN transceivers as a PHY. Add
> > the capability to ensure that the PHY is in operational state when the link
> > is set to an "up" state.
> >
> > Signed-off-by: Dimitri Fedrau <dimitri.fedrau@xxxxxxxxxxxx>
> > ---
> > drivers/net/can/flexcan/flexcan-core.c | 30 ++++++++++++++++++++++++------
> > drivers/net/can/flexcan/flexcan.h | 1 +
> > 2 files changed, 25 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c
> > index b347a1c93536d54efaa5f7d3347bd47c20860b3e..45d9a6957d9a806ed80d810a6a5f7eb99fcc702c 100644
> > --- a/drivers/net/can/flexcan/flexcan-core.c
> > +++ b/drivers/net/can/flexcan/flexcan-core.c
> > @@ -30,6 +30,7 @@
> > #include <linux/property.h>
> > #include <linux/regmap.h>
> > #include <linux/regulator/consumer.h>
> > +#include <linux/phy/phy.h>
> >
> > #include "flexcan.h"
> >
> > @@ -644,18 +645,22 @@ static void flexcan_clks_disable(const struct flexcan_priv *priv)
> >
> > static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv)
> > {
> > - if (!priv->reg_xceiver)
> > - return 0;
> > + if (priv->reg_xceiver)
> > + return regulator_enable(priv->reg_xceiver);
> > + else if (priv->transceiver)
> > + return phy_power_on(priv->transceiver);
> >
> > - return regulator_enable(priv->reg_xceiver);
> > + return 0;
> > }
> >
> > static inline int flexcan_transceiver_disable(const struct flexcan_priv *priv)
> > {
> > - if (!priv->reg_xceiver)
> > - return 0;
> > + if (priv->reg_xceiver)
> > + return regulator_disable(priv->reg_xceiver);
> > + else if (priv->transceiver)
> > + return phy_power_off(priv->transceiver);
> >
> > - return regulator_disable(priv->reg_xceiver);
> > + return 0;
> > }
> >
> > static int flexcan_chip_enable(struct flexcan_priv *priv)
> > @@ -2086,6 +2091,7 @@ static int flexcan_probe(struct platform_device *pdev)
> > struct net_device *dev;
> > struct flexcan_priv *priv;
> > struct regulator *reg_xceiver;
> > + struct phy *transceiver;
> > struct clk *clk_ipg = NULL, *clk_per = NULL;
> > struct flexcan_regs __iomem *regs;
> > struct flexcan_platform_data *pdata;
> > @@ -2101,6 +2107,14 @@ static int flexcan_probe(struct platform_device *pdev)
> > else if (IS_ERR(reg_xceiver))
> > return PTR_ERR(reg_xceiver);
> >
> > + transceiver = devm_phy_optional_get(&pdev->dev, NULL);
> > + if (PTR_ERR(transceiver) == -EPROBE_DEFER) {
> > + return -EPROBE_DEFER;
> > + } else if (IS_ERR(transceiver)) {
> > + dev_err(&pdev->dev, "failed to get phy\n");
> > + return PTR_ERR(transceiver);
> > + }
>
> Please use dev_err_probe(), it will be silent in case of EPROBE_DEFER.
Will fix it.
Best regards,
Dimitri Fedrau
