| Message ID | 20210302153451.19440-2-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | ppc: qemu: Add eTSEC support | expand |
On 3/2/21 4:34 PM, Bin Meng wrote: > At present phy_connect_gmii2rgmii() is implemented using a DM API > dev_of_offset() hence it cannot support a non-DM configuration. > Remove the non-DM version prototype of phy_connect_gmii2rgmii() > and make the driver depend on CONFIG_DM_ETH. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > drivers/net/phy/Kconfig | 1 + > drivers/net/phy/phy.c | 6 ------ > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig > index d69503067d..070ffa82cb 100644 > --- a/drivers/net/phy/Kconfig > +++ b/drivers/net/phy/Kconfig > @@ -292,6 +292,7 @@ config PHY_XILINX > > config PHY_XILINX_GMII2RGMII > bool "Xilinx GMII to RGMII Ethernet PHYs support" > + depends on DM_ETH > help > This adds support for Xilinx GMII to RGMII IP core. This IP acts > as bridge between MAC connected over GMII and external phy that > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index 89e3076bfd..d9e03baf7b 100644 > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > @@ -942,15 +942,9 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev) > } > > #ifdef CONFIG_PHY_XILINX_GMII2RGMII > -#ifdef CONFIG_DM_ETH > static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, > struct udevice *dev, > phy_interface_t interface) > -#else > -static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, > - struct eth_device *dev, > - phy_interface_t interface) > -#endif > { > struct phy_device *phydev = NULL; > int sn = dev_of_offset(dev); > Looks good to me. Acked-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
On Tue, Mar 2, 2021 at 5:35 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > At present phy_connect_gmii2rgmii() is implemented using a DM API > dev_of_offset() hence it cannot support a non-DM configuration. > Remove the non-DM version prototype of phy_connect_gmii2rgmii() > and make the driver depend on CONFIG_DM_ETH. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > drivers/net/phy/Kconfig | 1 + > drivers/net/phy/phy.c | 6 ------ > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig > index d69503067d..070ffa82cb 100644 > --- a/drivers/net/phy/Kconfig > +++ b/drivers/net/phy/Kconfig > @@ -292,6 +292,7 @@ config PHY_XILINX > > config PHY_XILINX_GMII2RGMII > bool "Xilinx GMII to RGMII Ethernet PHYs support" > + depends on DM_ETH > help > This adds support for Xilinx GMII to RGMII IP core. This IP acts > as bridge between MAC connected over GMII and external phy that > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index 89e3076bfd..d9e03baf7b 100644 > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > @@ -942,15 +942,9 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev) > } > > #ifdef CONFIG_PHY_XILINX_GMII2RGMII > -#ifdef CONFIG_DM_ETH > static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, > struct udevice *dev, > phy_interface_t interface) > -#else > -static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, > - struct eth_device *dev, > - phy_interface_t interface) > -#endif > { > struct phy_device *phydev = NULL; > int sn = dev_of_offset(dev); > -- > 2.25.1 > Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index d69503067d..070ffa82cb 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -292,6 +292,7 @@ config PHY_XILINX config PHY_XILINX_GMII2RGMII bool "Xilinx GMII to RGMII Ethernet PHYs support" + depends on DM_ETH help This adds support for Xilinx GMII to RGMII IP core. This IP acts as bridge between MAC connected over GMII and external phy that diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 89e3076bfd..d9e03baf7b 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -942,15 +942,9 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev) } #ifdef CONFIG_PHY_XILINX_GMII2RGMII -#ifdef CONFIG_DM_ETH static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, struct udevice *dev, phy_interface_t interface) -#else -static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, - struct eth_device *dev, - phy_interface_t interface) -#endif { struct phy_device *phydev = NULL; int sn = dev_of_offset(dev);
At present phy_connect_gmii2rgmii() is implemented using a DM API dev_of_offset() hence it cannot support a non-DM configuration. Remove the non-DM version prototype of phy_connect_gmii2rgmii() and make the driver depend on CONFIG_DM_ETH. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/net/phy/Kconfig | 1 + drivers/net/phy/phy.c | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-)