net: phy: Remove non-DM_ETH code

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 79fbc115368a251bc1a6b760194e3abb830beda8..8eb6024829d8e07d4b64c9b18a245022a68dd34b 100644 (file)
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -338,7 +338,6 @@ static int aquantia_set_proto(struct phy_device *phydev,
 
 static int aquantia_dts_config(struct phy_device *phydev)
 {
-#ifdef CONFIG_DM_ETH
        ofnode node = phydev->node;
        u32 prop;
        u16 reg;
@@ -374,7 +373,6 @@ static int aquantia_dts_config(struct phy_device *phydev)
                          (u16)(prop << 1));
        }
 
-#endif
        return 0;
 }
 

diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index fa1fe08518f4baa1f7d97bc9dc36601cea6fc0e1..c6f9f916459bdea1fc421bd59b0338098a4ac821 100644 (file)
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -191,7 +191,6 @@ static int ar803x_regs_config(struct phy_device *phydev)
 
 static int ar803x_of_init(struct phy_device *phydev)
 {
-#if defined(CONFIG_DM_ETH)
        struct ar803x_priv *priv;
        ofnode node, vddio_reg_node;
        u32 strength, freq, min_uV, max_uV;
@@ -306,7 +305,6 @@ static int ar803x_of_init(struct phy_device *phydev)
 
        debug("%s: flags=%x clk_25m_reg=%04x clk_25m_mask=%04x\n", __func__,
              priv->flags, priv->clk_25m_reg, priv->clk_25m_mask);
-#endif
 
        return 0;
 }

diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 3d862636b6b274e45e8fe607ec5709d08f1f243f..a45152bddc971fcdd5caef7c8aaae6e6a4354155 100644 (file)
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -144,7 +144,6 @@ static int dp83867_config_port_mirroring(struct phy_device *phydev)
        return 0;
 }
 
-#if defined(CONFIG_DM_ETH)
 /**
  * dp83867_data_init - Convenience function for setting PHY specific data
  *
@@ -249,19 +248,6 @@ static int dp83867_of_init(struct phy_device *phydev)
 
        return 0;
 }
-#else
-static int dp83867_of_init(struct phy_device *phydev)
-{
-       struct dp83867_private *dp83867 = phydev->priv;
-
-       dp83867->rx_id_delay = DP83867_RGMIIDCTL_2_25_NS;
-       dp83867->tx_id_delay = DP83867_RGMIIDCTL_2_75_NS;
-       dp83867->fifo_depth = DEFAULT_FIFO_DEPTH;
-       dp83867->io_impedance = -EINVAL;
-
-       return 0;
-}
-#endif
 
 static int dp83867_config(struct phy_device *phydev)
 {

diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c
index c9461185cfe8cd772ab0393d1369d92d9540a1e6..23dbf42b68c6f1018730f1712dc9ec704303e7f5 100644 (file)
--- a/drivers/net/phy/dp83869.c
+++ b/drivers/net/phy/dp83869.c
@@ -157,7 +157,6 @@ static int dp83869_config_port_mirroring(struct phy_device *phydev)
        return 0;
 }
 
-#ifdef CONFIG_DM_ETH
 static const int dp83869_internal_delay[] = {250, 500, 750, 1000, 1250, 1500,
                                             1750, 2000, 2250, 2500, 2750, 3000,
                                             3250, 3500, 3750, 4000};
@@ -269,19 +268,6 @@ static int dp83869_of_init(struct phy_device *phydev)
 
        return 0;
 }
-#else
-static int dp83869_of_init(struct phy_device *phydev)
-{
-       struct dp83869_private *dp83869 = phydev->priv;
-
-       dp83869->rx_int_delay = DP83869_RGMIIDCTL_2_25_NS;
-       dp83869->tx_int_delay = DP83869_RGMIIDCTL_2_75_NS;
-       dp83869->fifo_depth = DEFAULT_FIFO_DEPTH;
-       dp83869->io_impedance = -EINVAL;
-
-       return 0;
-}
-#endif /* CONFIG_OF_MDIO */
 
 static int dp83869_configure_rgmii(struct phy_device *phydev,
                                   struct dp83869_private *dp83869)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 212a861596f6bd7e4415532e1cb0547cb25fa3ac..1a25775eee62ed44f4477588812764de4169f0e4 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -104,7 +104,6 @@
 #define MIIM_88E151x_MODE_SGMII                1
 #define MIIM_88E151x_RESET_OFFS                15
 
-#if IS_ENABLED(CONFIG_DM_ETH)
 static int marvell_read_page(struct phy_device *phydev)
 {
        return phy_read(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE);
@@ -179,12 +178,6 @@ static int marvell_of_reg_init(struct phy_device *phydev)
 err:
        return marvell_write_page(phydev, saved_page);
 }
-#else
-static int marvell_of_reg_init(struct phy_device *phydev)
-{
-       return 0;
-}
-#endif /* CONFIG_DM_ETH */
 
 static int m88e1xxx_phy_extread(struct phy_device *phydev, int addr,
                                int devaddr, int regnum)

diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index e5f578201f350a1df1fe76277163e342dc7f21ee..79ebdb5e82a07a396f1668fe4548db4dfa072255 100644 (file)
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -68,7 +68,6 @@ static int ksz90xx_startup(struct phy_device *phydev)
 }
 
 /* Common OF config bits for KSZ9021 and KSZ9031 */
-#ifdef CONFIG_DM_ETH
 struct ksz90x1_reg_field {
        const char      *name;
        const u8        size;   /* Size of the bitfield, in bits */
@@ -211,23 +210,6 @@ static int ksz9031_center_flp_timing(struct phy_device *phydev)
        return ret;
 }
 
-#else /* !CONFIG_DM_ETH */
-static int ksz9021_of_config(struct phy_device *phydev)
-{
-       return 0;
-}
-
-static int ksz9031_of_config(struct phy_device *phydev)
-{
-       return 0;
-}
-
-static int ksz9031_center_flp_timing(struct phy_device *phydev)
-{
-       return 0;
-}
-#endif
-
 /*
  * KSZ9021
  */

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 92143cf23691c478d5ed312eccb199e142371acd..80230b907c15ea1023455704e6d8e5cd1aab8a79 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -689,9 +689,7 @@ struct phy_device *phy_device_create(struct mii_dev *bus, int addr,
        dev->link = 0;
        dev->interface = PHY_INTERFACE_MODE_NA;
 
-#ifdef CONFIG_DM_ETH
        dev->node = ofnode_null();
-#endif
 
        dev->autoneg = AUTONEG_ENABLE;
 
@@ -922,13 +920,8 @@ struct phy_device *phy_find_by_mask(struct mii_dev *bus, uint phy_mask)
        return get_phy_device_by_mask(bus, phy_mask);
 }
 
-#ifdef CONFIG_DM_ETH
 void phy_connect_dev(struct phy_device *phydev, struct udevice *dev,
                     phy_interface_t interface)
-#else
-void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev,
-                    phy_interface_t interface)
-#endif
 {
        /* Soft Reset the PHY */
        phy_reset(phydev);
@@ -1011,15 +1004,9 @@ static struct phy_device *phy_connect_fixed(struct mii_dev *bus,
 }
 #endif
 
-#ifdef CONFIG_DM_ETH
 struct phy_device *phy_connect(struct mii_dev *bus, int addr,
                               struct udevice *dev,
                               phy_interface_t interface)
-#else
-struct phy_device *phy_connect(struct mii_dev *bus, int addr,
-                              struct eth_device *dev,
-                              phy_interface_t interface)
-#endif
 {
        struct phy_device *phydev = NULL;
        uint mask = (addr >= 0) ? (1 << addr) : 0xffffffff;

diff --git a/include/phy.h b/include/phy.h
index ff69536fca759273961d27471f1b6a21f226a628..87aa86c2e783803ad98ee9ac9050c071230bf67a 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -138,12 +138,8 @@ struct phy_device {
        struct phy_driver *drv;
        void *priv;
 
-#ifdef CONFIG_DM_ETH
        struct udevice *dev;
        ofnode node;
-#else
-       struct eth_device *dev;
-#endif
 
        /* forced speed & duplex (no autoneg)
         * partner speed & duplex & pause (autoneg)
@@ -233,8 +229,6 @@ static inline struct phy_device *fixed_phy_create(ofnode node)
 
 #endif
 
-#ifdef CONFIG_DM_ETH
-
 /**
  * phy_connect_dev() - Associates the given pair of PHY and Ethernet devices
  * @phydev:    PHY device
@@ -293,41 +287,6 @@ static inline ofnode phy_get_ofnode(struct phy_device *phydev)
        else
                return dev_ofnode(phydev->dev);
 }
-#else
-
-/**
- * phy_connect_dev() - Associates the given pair of PHY and Ethernet devices
- * @phydev:    PHY device
- * @dev:       Ethernet device
- * @interface: type of MAC-PHY interface
- */
-void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev,
-                    phy_interface_t interface);
-
-/**
- * phy_connect() - Creates a PHY device for the Ethernet interface
- * Creates a PHY device for the PHY at the given address, if one doesn't exist
- * already, and associates it with the Ethernet device.
- * The function may be called with addr <= 0, in this case addr value is ignored
- * and the bus is scanned to detect a PHY.  Scanning should only be used if only
- * one PHY is expected to be present on the MDIO bus, otherwise it is undefined
- * which PHY is returned.
- *
- * @bus:       MII/MDIO bus that hosts the PHY
- * @addr:      PHY address on MDIO bus
- * @dev:       Ethernet device to associate to the PHY
- * @interface: type of MAC-PHY interface
- * @return: pointer to phy_device if a PHY is found, or NULL otherwise
- */
-struct phy_device *phy_connect(struct mii_dev *bus, int addr,
-                               struct eth_device *dev,
-                               phy_interface_t interface);
-
-static inline ofnode phy_get_ofnode(struct phy_device *phydev)
-{
-       return ofnode_null();
-}
-#endif
 
 int phy_read(struct phy_device *phydev, int devad, int regnum);
 int phy_write(struct phy_device *phydev, int devad, int regnum, u16 val);