net: bcmgenet: remove unused platform code

This effectively reverts b0ba512e25d7 ("net: bcmgenet: enable driver to
work without a device tree"). There has never been an in-tree user of
struct bcmgenet_platform_data, all devices use OF or ACPI.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/108b4e64-55d4-4b4e-9a11-3c810c319d66@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 3a27901781c2b2589a0f95678cf3df06401cac3c..4c4b519171f370efaa6ee58dca5a7615d4a3ca42 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5123,7 +5123,6 @@ F:        Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
 F:     drivers/net/ethernet/broadcom/genet/
 F:     drivers/net/ethernet/broadcom/unimac.h
 F:     drivers/net/mdio/mdio-bcm-unimac.c
-F:     include/linux/platform_data/bcmgenet.h
 F:     include/linux/platform_data/mdio-bcm-unimac.h
 
 BROADCOM IPROC ARM ARCHITECTURE

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 98971ae4f87dfc8be84a844e35d7543039a22240..d99ef92feb82bbad674b28dbd29bbecee4c796b8 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -35,7 +35,6 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/phy.h>
-#include <linux/platform_data/bcmgenet.h>
 
 #include <linux/unaligned.h>
 
@@ -3926,7 +3925,6 @@ MODULE_DEVICE_TABLE(of, bcmgenet_match);
 
 static int bcmgenet_probe(struct platform_device *pdev)
 {
-       struct bcmgenet_platform_data *pd = pdev->dev.platform_data;
        const struct bcmgenet_plat_data *pdata;
        struct bcmgenet_priv *priv;
        struct net_device *dev;
@@ -4010,9 +4008,6 @@ static int bcmgenet_probe(struct platform_device *pdev)
                priv->version = pdata->version;
                priv->dma_max_burst_length = pdata->dma_max_burst_length;
                priv->flags = pdata->flags;
-       } else {
-               priv->version = pd->genet_version;
-               priv->dma_max_burst_length = DMA_MAX_BURST_LENGTH;
        }
 
        priv->clk = devm_clk_get_optional(&priv->pdev->dev, "enet");
@@ -4062,16 +4057,13 @@ static int bcmgenet_probe(struct platform_device *pdev)
        if (device_get_phy_mode(&pdev->dev) == PHY_INTERFACE_MODE_INTERNAL)
                bcmgenet_power_up(priv, GENET_POWER_PASSIVE);
 
-       if (pd && !IS_ERR_OR_NULL(pd->mac_address))
-               eth_hw_addr_set(dev, pd->mac_address);
-       else
-               if (device_get_ethdev_address(&pdev->dev, dev))
-                       if (has_acpi_companion(&pdev->dev)) {
-                               u8 addr[ETH_ALEN];
+       if (device_get_ethdev_address(&pdev->dev, dev))
+               if (has_acpi_companion(&pdev->dev)) {
+                       u8 addr[ETH_ALEN];
 
-                               bcmgenet_get_hw_addr(priv, addr);
-                               eth_hw_addr_set(dev, addr);
-                       }
+                       bcmgenet_get_hw_addr(priv, addr);
+                       eth_hw_addr_set(dev, addr);
+               }
 
        if (!is_valid_ether_addr(dev->dev_addr)) {
                dev_warn(&pdev->dev, "using random Ethernet MAC\n");

diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 573e8b279e52f7f08118048660e8b1d8815ea1ab..38f854b94a799e2d3bb04d8444e05d8f874e4ece 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -20,7 +20,6 @@
 #include <linux/of.h>
 #include <linux/of_net.h>
 #include <linux/of_mdio.h>
-#include <linux/platform_data/bcmgenet.h>
 #include <linux/platform_data/mdio-bcm-unimac.h>
 
 #include "bcmgenet.h"
@@ -436,23 +435,6 @@ static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)
        return priv->mdio_dn;
 }
 
-static void bcmgenet_mii_pdata_init(struct bcmgenet_priv *priv,
-                                   struct unimac_mdio_pdata *ppd)
-{
-       struct device *kdev = &priv->pdev->dev;
-       struct bcmgenet_platform_data *pd = kdev->platform_data;
-
-       if (pd->phy_interface != PHY_INTERFACE_MODE_MOCA && pd->mdio_enabled) {
-               /*
-                * Internal or external PHY with MDIO access
-                */
-               if (pd->phy_address >= 0 && pd->phy_address < PHY_MAX_ADDR)
-                       ppd->phy_mask = 1 << pd->phy_address;
-               else
-                       ppd->phy_mask = 0;
-       }
-}
-
 static int bcmgenet_mii_wait(void *wait_func_data)
 {
        struct bcmgenet_priv *priv = wait_func_data;
@@ -467,7 +449,6 @@ static int bcmgenet_mii_wait(void *wait_func_data)
 static int bcmgenet_mii_register(struct bcmgenet_priv *priv)
 {
        struct platform_device *pdev = priv->pdev;
-       struct bcmgenet_platform_data *pdata = pdev->dev.platform_data;
        struct device_node *dn = pdev->dev.of_node;
        struct unimac_mdio_pdata ppd;
        struct platform_device *ppdev;
@@ -511,8 +492,6 @@ static int bcmgenet_mii_register(struct bcmgenet_priv *priv)
        ppdev->dev.parent = &pdev->dev;
        if (dn)
                ppdev->dev.of_node = bcmgenet_mii_of_find_mdio(priv);
-       else if (pdata)
-               bcmgenet_mii_pdata_init(priv, &ppd);
        else
                ppd.phy_mask = ~0;
 
@@ -594,58 +573,6 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
        return 0;
 }
 
-static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
-{
-       struct device *kdev = &priv->pdev->dev;
-       struct bcmgenet_platform_data *pd = kdev->platform_data;
-       char phy_name[MII_BUS_ID_SIZE + 3];
-       char mdio_bus_id[MII_BUS_ID_SIZE];
-       struct phy_device *phydev;
-
-       snprintf(mdio_bus_id, MII_BUS_ID_SIZE, "%s-%d",
-                UNIMAC_MDIO_DRV_NAME, priv->pdev->id);
-
-       if (pd->phy_interface != PHY_INTERFACE_MODE_MOCA && pd->mdio_enabled) {
-               snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT,
-                        mdio_bus_id, pd->phy_address);
-
-               /*
-                * Internal or external PHY with MDIO access
-                */
-               phydev = phy_attach(priv->dev, phy_name, pd->phy_interface);
-               if (IS_ERR(phydev)) {
-                       dev_err(kdev, "failed to register PHY device\n");
-                       return PTR_ERR(phydev);
-               }
-       } else {
-               /*
-                * MoCA port or no MDIO access.
-                * Use fixed PHY to represent the link layer.
-                */
-               struct fixed_phy_status fphy_status = {
-                       .link = 1,
-                       .speed = pd->phy_speed,
-                       .duplex = pd->phy_duplex,
-                       .pause = 0,
-                       .asym_pause = 0,
-               };
-
-               phydev = fixed_phy_register(&fphy_status, NULL);
-               if (IS_ERR(phydev)) {
-                       dev_err(kdev, "failed to register fixed PHY device\n");
-                       return PTR_ERR(phydev);
-               }
-
-               /* Make sure we initialize MoCA PHYs with a link down */
-               phydev->link = 0;
-
-       }
-
-       priv->phy_interface = pd->phy_interface;
-
-       return 0;
-}
-
 static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv)
 {
        struct device *kdev = &priv->pdev->dev;
@@ -656,7 +583,7 @@ static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv)
        else if (has_acpi_companion(kdev))
                return bcmgenet_phy_interface_init(priv);
        else
-               return bcmgenet_mii_pd_init(priv);
+               return -EINVAL;
 }
 
 int bcmgenet_mii_init(struct net_device *dev)

diff --git a/include/linux/platform_data/bcmgenet.h b/include/linux/platform_data/bcmgenet.h
deleted file mode 100644 (file)
index d8f8738..0000000
--- a/include/linux/platform_data/bcmgenet.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __LINUX_PLATFORM_DATA_BCMGENET_H__
-#define __LINUX_PLATFORM_DATA_BCMGENET_H__
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-#include <linux/phy.h>
-
-struct bcmgenet_platform_data {
-       bool            mdio_enabled;
-       phy_interface_t phy_interface;
-       int             phy_address;
-       int             phy_speed;
-       int             phy_duplex;
-       u8              mac_address[ETH_ALEN];
-       int             genet_version;
-};
-
-#endif