| Message ID | b7c378d570e12b0d619e291953deb2b333b16966.1726048404.git.jerome.forissier@linaro.org |
|---|---|
| State | Accepted |
| Commit | fd23e80165aafed2cf8c43dc8802c5a465f85a18 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Miscellaneous fixes | expand |
Hi Jerome, On Wed, 11 Sept 2024 at 03:59, Jerome Forissier <jerome.forissier@linaro.org> wrote: > > dtsec_init_phy() is defined only with MII so add the proper conditional > in the caller code. > > Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> > --- > drivers/net/fm/eth.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c > index 19f3f0fef07..63fe4b2d33c 100644 > --- a/drivers/net/fm/eth.c > +++ b/drivers/net/fm/eth.c > @@ -26,7 +26,8 @@ > > #include "fm.h" > > -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) && !defined(BITBANGMII) > +#if ((defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) && \ > + !defined(CONFIG_BITBANGMII)) > > #define TBIANA_SETTINGS (TBIANA_ASYMMETRIC_PAUSE | TBIANA_SYMMETRIC_PAUSE | \ > TBIANA_FULL_DUPLEX) > @@ -701,8 +702,11 @@ static int init_phy(struct fm_eth *fm_eth) > supported |= SUPPORTED_2500baseX_Full; > #endif > > +#if (CONFIG_IS_ENABLED(MII) || CONFIG_IS_ENABLED(CMD_MII)) && \ > + !CONFIG_IS_ENABLED(BITBANGMII) > if (fm_eth->type == FM_ETH_1G_E) > dtsec_init_phy(fm_eth); > +#endif Ugly! I wonder if we need a special Kconfig for this function? > > #ifdef CONFIG_PHYLIB > #ifdef CONFIG_DM_MDIO > -- > 2.40.1 > Regards, Simon
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 19f3f0fef07..63fe4b2d33c 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -26,7 +26,8 @@ #include "fm.h" -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) && !defined(BITBANGMII) +#if ((defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) && \ + !defined(CONFIG_BITBANGMII)) #define TBIANA_SETTINGS (TBIANA_ASYMMETRIC_PAUSE | TBIANA_SYMMETRIC_PAUSE | \ TBIANA_FULL_DUPLEX) @@ -701,8 +702,11 @@ static int init_phy(struct fm_eth *fm_eth) supported |= SUPPORTED_2500baseX_Full; #endif +#if (CONFIG_IS_ENABLED(MII) || CONFIG_IS_ENABLED(CMD_MII)) && \ + !CONFIG_IS_ENABLED(BITBANGMII) if (fm_eth->type == FM_ETH_1G_E) dtsec_init_phy(fm_eth); +#endif #ifdef CONFIG_PHYLIB #ifdef CONFIG_DM_MDIO
dtsec_init_phy() is defined only with MII so add the proper conditional in the caller code. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> --- drivers/net/fm/eth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)