random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: xilinx: Drop #ifdef CONFIG_DM_ETH around phy_connect_gmii2rgmii()

Browse Source 
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>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Bin Meng 2021-03-14 20:14:51 +08:00 committed by Priyanka Jain
parent 6c993815bb
commit 188ff18f94
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/phy/Kconfig
View File

@ -292,6 +292,7 @@ config PHY_XILINX
config PHY_XILINX_GMII2RGMII config PHY_XILINX_GMII2RGMII
bool "Xilinx GMII to RGMII Ethernet PHYs support" bool "Xilinx GMII to RGMII Ethernet PHYs support"
depends on DM_ETH
help help
This adds support for Xilinx GMII to RGMII IP core. This IP acts This adds support for Xilinx GMII to RGMII IP core. This IP acts
as bridge between MAC connected over GMII and external phy that as bridge between MAC connected over GMII and external phy that

6
drivers/net/phy/phy.c
View File

@ -942,15 +942,9 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev)
} }
#ifdef CONFIG_PHY_XILINX_GMII2RGMII #ifdef CONFIG_PHY_XILINX_GMII2RGMII
#ifdef CONFIG_DM_ETH
static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus, static struct phy_device *phy_connect_gmii2rgmii(struct mii_dev *bus,
struct udevice *dev, struct udevice *dev,
phy_interface_t interface) 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; struct phy_device *phydev = NULL;
ofnode node = dev_ofnode(dev); ofnode node = dev_ofnode(dev);