net: macb: shrink macb_platform_data structure

This structure was used intensively for machine specific values
when DT was not used. Since the removal of AVR32 from the kernel,
this structure is only used for passing clocks from PCI macb wrapper, all
other fields being 0.
All other known platforms use DT.

Remove the leftovers but make sure that PCI macb still works as
expected by using default values:
- phydev->irq is set to PHY_POLL by mdiobus_alloc()
- mii_bus->phy_mask is cleared while allocating it
- bp->phy_interface is set to PHY_INTERFACE_MODE_MII if mode not found
in DT.

This simplifies driver probe path and particularly phy handling.

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 59531adcbb42d0f859184a204a0327016595f012..bd6a62f4bd7dcd529b12248806160003e5aa348f 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -285,34 +285,22 @@ static void macb_set_hwaddr(struct macb *bp)
 
 static void macb_get_hwaddr(struct macb *bp)
 {
-       struct macb_platform_data *pdata;
        u32 bottom;
        u16 top;
        u8 addr[6];
        int i;
 
-       pdata = dev_get_platdata(&bp->pdev->dev);
-
        /* Check all 4 address register for valid address */
        for (i = 0; i < 4; i++) {
                bottom = macb_or_gem_readl(bp, SA1B + i * 8);
                top = macb_or_gem_readl(bp, SA1T + i * 8);
 
-               if (pdata && pdata->rev_eth_addr) {
-                       addr[5] = bottom & 0xff;
-                       addr[4] = (bottom >> 8) & 0xff;
-                       addr[3] = (bottom >> 16) & 0xff;
-                       addr[2] = (bottom >> 24) & 0xff;
-                       addr[1] = top & 0xff;
-                       addr[0] = (top & 0xff00) >> 8;
-               } else {
-                       addr[0] = bottom & 0xff;
-                       addr[1] = (bottom >> 8) & 0xff;
-                       addr[2] = (bottom >> 16) & 0xff;
-                       addr[3] = (bottom >> 24) & 0xff;
-                       addr[4] = top & 0xff;
-                       addr[5] = (top >> 8) & 0xff;
-               }
+               addr[0] = bottom & 0xff;
+               addr[1] = (bottom >> 8) & 0xff;
+               addr[2] = (bottom >> 16) & 0xff;
+               addr[3] = (bottom >> 24) & 0xff;
+               addr[4] = top & 0xff;
+               addr[5] = (top >> 8) & 0xff;
 
                if (is_valid_ether_addr(addr)) {
                        memcpy(bp->dev->dev_addr, addr, sizeof(addr));
@@ -510,12 +498,10 @@ static void macb_handle_link_change(struct net_device *dev)
 static int macb_mii_probe(struct net_device *dev)
 {
        struct macb *bp = netdev_priv(dev);
-       struct macb_platform_data *pdata;
        struct phy_device *phydev;
        struct device_node *np;
-       int phy_irq, ret, i;
+       int ret, i;
 
-       pdata = dev_get_platdata(&bp->pdev->dev);
        np = bp->pdev->dev.of_node;
        ret = 0;
 
@@ -557,19 +543,6 @@ static int macb_mii_probe(struct net_device *dev)
                        return -ENXIO;
                }
 
-               if (pdata) {
-                       if (gpio_is_valid(pdata->phy_irq_pin)) {
-                               ret = devm_gpio_request(&bp->pdev->dev,
-                                                       pdata->phy_irq_pin, "phy int");
-                               if (!ret) {
-                                       phy_irq = gpio_to_irq(pdata->phy_irq_pin);
-                                       phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq;
-                               }
-                       } else {
-                               phydev->irq = PHY_POLL;
-                       }
-               }
-
                /* attach the mac to the phy */
                ret = phy_connect_direct(dev, phydev, &macb_handle_link_change,
                                         bp->phy_interface);
@@ -598,7 +571,6 @@ static int macb_mii_probe(struct net_device *dev)
 
 static int macb_mii_init(struct macb *bp)
 {
-       struct macb_platform_data *pdata;
        struct device_node *np;
        int err = -ENXIO;
 
@@ -618,7 +590,6 @@ static int macb_mii_init(struct macb *bp)
                 bp->pdev->name, bp->pdev->id);
        bp->mii_bus->priv = bp;
        bp->mii_bus->parent = &bp->pdev->dev;
-       pdata = dev_get_platdata(&bp->pdev->dev);
 
        dev_set_drvdata(&bp->dev->dev, bp->mii_bus);
 
@@ -632,9 +603,6 @@ static int macb_mii_init(struct macb *bp)
 
                err = mdiobus_register(bp->mii_bus);
        } else {
-               if (pdata)
-                       bp->mii_bus->phy_mask = pdata->phy_mask;
-
                err = of_mdiobus_register(bp->mii_bus, np);
        }
 
@@ -4050,7 +4018,6 @@ static int macb_probe(struct platform_device *pdev)
        struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;
        struct clk *tsu_clk = NULL;
        unsigned int queue_mask, num_queues;
-       struct macb_platform_data *pdata;
        bool native_io;
        struct phy_device *phydev;
        struct net_device *dev;
@@ -4182,15 +4149,11 @@ static int macb_probe(struct platform_device *pdev)
        }
 
        err = of_get_phy_mode(np);
-       if (err < 0) {
-               pdata = dev_get_platdata(&pdev->dev);
-               if (pdata && pdata->is_rmii)
-                       bp->phy_interface = PHY_INTERFACE_MODE_RMII;
-               else
-                       bp->phy_interface = PHY_INTERFACE_MODE_MII;
-       } else {
+       if (err < 0)
+               /* not found in DT, MII by default */
+               bp->phy_interface = PHY_INTERFACE_MODE_MII;
+       else
                bp->phy_interface = err;
-       }
 
        /* IP specific init */
        err = init(pdev);

diff --git a/include/linux/platform_data/macb.h b/include/linux/platform_data/macb.h
index 7815d50c26ff4bf021484cf801ee53be0ce09aaf..2bc51b82295612a092a195cd4a044f25e89fe752 100644 (file)
--- a/include/linux/platform_data/macb.h
+++ b/include/linux/platform_data/macb.h
@@ -12,19 +12,10 @@
 
 /**
  * struct macb_platform_data - platform data for MACB Ethernet
- * @phy_mask:          phy mask passed when register the MDIO bus
- *                     within the driver
- * @phy_irq_pin:       PHY IRQ
- * @is_rmii:           using RMII interface?
- * @rev_eth_addr:      reverse Ethernet address byte order
  * @pclk:              platform clock
  * @hclk:              AHB clock
  */
 struct macb_platform_data {
-       u32             phy_mask;
-       int             phy_irq_pin;
-       u8              is_rmii;
-       u8              rev_eth_addr;
        struct clk      *pclk;
        struct clk      *hclk;
 };