net: miiphybb: configs: Drop CONFIG_BITBANGMII_MULTI

It seems that every remaining system which enables BITBANGMII also
enables BITBANGMII_MULTI . Remove the BITBANGMII_MULTI symbol and
assume it is always enabled. This allows removal of a bit of legacy
code. No functional change intended.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 488115d..7b16923 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -38,7 +38,6 @@ CONFIG_SH_MMCIF=y
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index 2d6c83a..e6242e2 100644 (file)
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -85,7 +85,6 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_MV=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_ANEG_TIMEOUT=8000
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y

diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index d212f91..b53f2f3 100644 (file)
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig
index a400543..d2cc1cf 100644 (file)
--- a/configs/grpeach_defconfig
+++ b/configs/grpeach_defconfig
@@ -52,7 +52,6 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_SMSC=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_SH_ETHER=y

diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 9bce9e3..eeb9747 100644 (file)
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 0d4eed0..b568252 100644 (file)
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -38,7 +38,6 @@ CONFIG_SH_MMCIF=y
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 98a67be..cb18024 100644 (file)
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig
index aae4406..f4f5c57 100644 (file)
--- a/configs/r8a779a0_falcon_defconfig
+++ b/configs/r8a779a0_falcon_defconfig
@@ -17,7 +17,6 @@ CONFIG_DEFAULT_FDT_FILE="r8a779a0-falcon.dtb"
 CONFIG_SYS_PBSIZE=2068
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_RENESAS_RAVB=y

diff --git a/configs/r8a779g0_whitehawk_defconfig b/configs/r8a779g0_whitehawk_defconfig
index c74051d..b49a81d 100644 (file)
--- a/configs/r8a779g0_whitehawk_defconfig
+++ b/configs/r8a779g0_whitehawk_defconfig
@@ -19,7 +19,6 @@ CONFIG_SYS_CBSIZE=2048
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_RENESAS_RAVB=y

diff --git a/configs/r8a779h0_grayhawk_defconfig b/configs/r8a779h0_grayhawk_defconfig
index ef70921..5b9ad93 100644 (file)
--- a/configs/r8a779h0_grayhawk_defconfig
+++ b/configs/r8a779h0_grayhawk_defconfig
@@ -16,7 +16,6 @@ CONFIG_SYS_CBSIZE=2048
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_RENESAS_RAVB=y

diff --git a/configs/renesas_rcar3.config b/configs/renesas_rcar3.config
index 7f7fab7..9f2413a 100644 (file)
--- a/configs/renesas_rcar3.config
+++ b/configs/renesas_rcar3.config
@@ -1,5 +1,4 @@
 #include <configs/renesas_rcar64.config>
 
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_SYS_PBSIZE=2068

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 53597e9..1c70a16 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -38,7 +38,6 @@ CONFIG_SH_MMCIF=y
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index a25a562..59bb707 100644 (file)
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k
 CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_BITBANGMII=y
-CONFIG_BITBANGMII_MULTI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_SH_ETHER=y

diff --git a/doc/README.bitbangMII b/doc/README.bitbangMII
index 0a2fa48..05ab203 100644 (file)
--- a/doc/README.bitbangMII
+++ b/doc/README.bitbangMII
@@ -7,28 +7,11 @@ The driver requires that the following macros should be defined into the board
 configuration file:
 
 CONFIG_BITBANGMII      - Enable the miiphybb driver
-CONFIG_BITBANGMII_MULTI - Enable the multi bus support
 
-If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs
-to define at least the following macros:
-
-MII_INIT      - Generic code to enable the MII bus (optional)
-MDIO_DECLARE  - Declaration needed to access to the MDIO pin (optional)
-MDIO_ACTIVE   - Activate the MDIO pin as out pin
-MDIO_TRISTATE - Activate the MDIO pin as input/tristate pin
-MDIO_READ     - Read the MDIO pin
-MDIO(v)       - Write v on the MDIO pin
-MDC_DECLARE   - Declaration needed to access to the MDC pin (optional)
-MDC(v)       - Write v on the MDC pin
-
-The previous macros make the driver compatible with the previous version
-(that didn't support the multi-bus).
-
-When the CONFIG_BITBANGMII_MULTI is also defined, the board code needs to fill
-the bb_miiphy_buses[] array with a record for each required bus and declare
-the bb_miiphy_buses_num variable with the number of mii buses.
-The record (struct bb_miiphy_bus) has the following fields/callbacks (see
-miiphy.h for details):
+The board code needs to fill the bb_miiphy_buses[] array with a record for
+each required bus and declare the bb_miiphy_buses_num variable with the
+number of mii buses. The record (struct bb_miiphy_bus) has the following
+fields/callbacks (see miiphy.h for details):
 
 char name[]           - The symbolic name that must be equal to the MII bus
                         registered name

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 13e7381..3132718 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -2,10 +2,6 @@
 config BITBANGMII
        bool "Bit-banged ethernet MII management channel support"
 
-config BITBANGMII_MULTI
-       bool "Enable the multi bus support"
-       depends on BITBANGMII
-
 config MV88E6352_SWITCH
        bool "Marvell 88E6352 switch support"
 

diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index b143137..171c171 100644 (file)
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -17,90 +17,6 @@
 #include <miiphy.h>
 #include <asm/global_data.h>
 
-#ifndef CONFIG_BITBANGMII_MULTI
-
-/*
- * If CONFIG_BITBANGMII_MULTI is not defined we use a
- * compatibility layer with the previous miiphybb implementation
- * based on macros usage.
- *
- */
-static int bb_mii_init_wrap(struct bb_miiphy_bus *bus)
-{
-#ifdef MII_INIT
-       MII_INIT;
-#endif
-       return 0;
-}
-
-static int bb_mdio_active_wrap(struct bb_miiphy_bus *bus)
-{
-#ifdef MDIO_DECLARE
-       MDIO_DECLARE;
-#endif
-       MDIO_ACTIVE;
-       return 0;
-}
-
-static int bb_mdio_tristate_wrap(struct bb_miiphy_bus *bus)
-{
-#ifdef MDIO_DECLARE
-       MDIO_DECLARE;
-#endif
-       MDIO_TRISTATE;
-       return 0;
-}
-
-static int bb_set_mdio_wrap(struct bb_miiphy_bus *bus, int v)
-{
-#ifdef MDIO_DECLARE
-       MDIO_DECLARE;
-#endif
-       MDIO(v);
-       return 0;
-}
-
-static int bb_get_mdio_wrap(struct bb_miiphy_bus *bus, int *v)
-{
-#ifdef MDIO_DECLARE
-       MDIO_DECLARE;
-#endif
-       *v = MDIO_READ;
-       return 0;
-}
-
-static int bb_set_mdc_wrap(struct bb_miiphy_bus *bus, int v)
-{
-#ifdef MDC_DECLARE
-       MDC_DECLARE;
-#endif
-       MDC(v);
-       return 0;
-}
-
-static int bb_delay_wrap(struct bb_miiphy_bus *bus)
-{
-       MIIDELAY;
-       return 0;
-}
-
-struct bb_miiphy_bus bb_miiphy_buses[] = {
-       {
-               .name = BB_MII_DEVNAME,
-               .init = bb_mii_init_wrap,
-               .mdio_active = bb_mdio_active_wrap,
-               .mdio_tristate = bb_mdio_tristate_wrap,
-               .set_mdio = bb_set_mdio_wrap,
-               .get_mdio = bb_get_mdio_wrap,
-               .set_mdc = bb_set_mdc_wrap,
-               .delay = bb_delay_wrap,
-       }
-};
-
-int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
-                         sizeof(bb_miiphy_buses[0]);
-#endif
-
 int bb_miiphy_init(void)
 {
        int i;
@@ -114,7 +30,6 @@ int bb_miiphy_init(void)
 
 static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname)
 {
-#ifdef CONFIG_BITBANGMII_MULTI
        int i;
 
        /* Search the correct bus */
@@ -124,10 +39,6 @@ static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname)
                }
        }
        return NULL;
-#else
-       /* We have just one bitbanging bus */
-       return &bb_miiphy_buses[0];
-#endif
 }
 
 /*****************************************************************************

diff --git a/include/miiphy.h b/include/miiphy.h
index 5abffd8..2bb4f62 100644 (file)
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -72,9 +72,7 @@ struct bb_miiphy_bus {
        int (*get_mdio)(struct bb_miiphy_bus *bus, int *v);
        int (*set_mdc)(struct bb_miiphy_bus *bus, int v);
        int (*delay)(struct bb_miiphy_bus *bus);
-#ifdef CONFIG_BITBANGMII_MULTI
        void *priv;
-#endif
 };
 
 extern struct bb_miiphy_bus bb_miiphy_buses[];