4 files changed, 9 insertions, 68 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index b02d4a3ffa37..40f356d9f21b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -18,56 +18,14 @@ config STMMAC_PLATFORM
         depends on STMMAC_ETH
         default y
         ---help---
-          This selects the platform specific bus support for
-          the stmmac device driver. This is the driver used
-          on many embedded STM platforms based on ARM and SuperH
-          processors.
+          This selects the platform specific bus support for the stmmac driver.
+          This is the driver used on several SoCs:
+          STi, Allwinner, Amlogic Meson, Altera SOCFPGA.
+
           If you have a controller with this interface, say Y or M here.
 
           If unsure, say N.
 
-config DWMAC_MESON
-        bool "Amlogic Meson dwmac support"
-        depends on STMMAC_PLATFORM && ARCH_MESON
-        help
-          Support for Ethernet controller on Amlogic Meson SoCs.
-
-          This selects the Amlogic Meson SoC glue layer support for
-          the stmmac device driver. This driver is used for Meson6 and
-          Meson8 SoCs.
-
-config DWMAC_SOCFPGA
-        bool "SOCFPGA dwmac support"
-        depends on STMMAC_PLATFORM && MFD_SYSCON && (ARCH_SOCFPGA || COMPILE_TEST)
-        help
-          Support for ethernet controller on Altera SOCFPGA
-
-          This selects the Altera SOCFPGA SoC glue layer support
-          for the stmmac device driver. This driver is used for
-          arria5 and cyclone5 FPGA SoCs.
-
-config DWMAC_SUNXI
-        bool "Allwinner GMAC support"
-        depends on STMMAC_PLATFORM && ARCH_SUNXI
-        default y
-        ---help---
-          Support for Allwinner A20/A31 GMAC ethernet controllers.
-
-          This selects Allwinner SoC glue layer support for the
-          stmmac device driver. This driver is used for A20/A31
-          GMAC    ethernet controller.
-
-config DWMAC_STI
-        bool "STi GMAC support"
-        depends on STMMAC_PLATFORM && ARCH_STI
-        default y
-        ---help---
-          Support for ethernet controller on STi SOCs.
-
-          This selects STi SoC glue layer support for the stmmac
-          device driver. This driver is used on for the STi series
-          SOCs GMAC ethernet controller.
-
 config STMMAC_PCI
         bool "STMMAC PCI bus support"
         depends on STMMAC_ETH && PCI
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index 0533d0ba783d..034da704f22f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -1,10 +1,8 @@
 obj-$(CONFIG_STMMAC_ETH) += stmmac.o
-stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o
 stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o
-stmmac-$(CONFIG_DWMAC_MESON) += dwmac-meson.o
-stmmac-$(CONFIG_DWMAC_SUNXI) += dwmac-sunxi.o
-stmmac-$(CONFIG_DWMAC_STI) += dwmac-sti.o
-stmmac-$(CONFIG_DWMAC_SOCFPGA) += dwmac-socfpga.o
+stmmac-$(CONFIG_STMMAC_PLATFORM) +=     stmmac_platform.o dwmac-meson.o \
+                                        dwmac-sunxi.o dwmac-sti.o \
+                                        dwmac-socfpga.o
 stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o  \
               chain_mode.o dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o \
               dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o \
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index c3c40650b309..23aad9adef5a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -137,20 +137,13 @@ void stmmac_disable_eee_mode(struct stmmac_priv *priv);
 bool stmmac_eee_init(struct stmmac_priv *priv);
 
 #ifdef CONFIG_STMMAC_PLATFORM
-#ifdef CONFIG_DWMAC_MESON
 extern const struct stmmac_of_data meson6_dwmac_data;
-#endif
-#ifdef CONFIG_DWMAC_SUNXI
 extern const struct stmmac_of_data sun7i_gmac_data;
-#endif
-#ifdef CONFIG_DWMAC_STI
 extern const struct stmmac_of_data stih4xx_dwmac_data;
 extern const struct stmmac_of_data stid127_dwmac_data;
-#endif
-#ifdef CONFIG_DWMAC_SOCFPGA
 extern const struct stmmac_of_data socfpga_gmac_data;
-#endif
 extern struct platform_driver stmmac_pltfr_driver;
+
 static inline int stmmac_register_platform(void)
 {
         int err;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index db56fa7ce8f9..f4fe854f3ee3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -30,22 +30,14 @@
 #include "stmmac.h"
 
 static const struct of_device_id stmmac_dt_ids[] = {
-#ifdef CONFIG_DWMAC_MESON
+        /* SoC specific glue layers should come before generic bindings */
         { .compatible = "amlogic,meson6-dwmac", .data = &meson6_dwmac_data},
-#endif
-#ifdef CONFIG_DWMAC_SUNXI
         { .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},
-#endif
-#ifdef CONFIG_DWMAC_STI
         { .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},
         { .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},
         { .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},
         { .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},
-#endif
-#ifdef CONFIG_DWMAC_SOCFPGA
         { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data },
-#endif
-        /* SoC specific glue layers should come before generic bindings */
         { .compatible = "st,spear600-gmac"},
         { .compatible = "snps,dwmac-3.610"},
         { .compatible = "snps,dwmac-3.70a"},