[NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012]

Remove the use of CONFIG_MV643XX_ETH_[012] variables on most platforms.
Instead, platform-specific code enables the ports supported by the
hardware.  After this patch, these config variables are only used in
arch/ppc, so also move them from drivers/net/Kconfig to arch/ppc/Kconfig.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Cc: Paul Mackerras <paulus@samba.org>

4 files changed, 15 insertions, 56 deletions

diff --git a/arch/mips/momentum/jaguar_atx/platform.c b/arch/mips/momentum/jaguar_atx/platform.c
index 81037709ba0d..c78ba3025af4 100644
--- a/arch/mips/momentum/jaguar_atx/platform.c
+++ b/arch/mips/momentum/jaguar_atx/platform.c
@@ -38,8 +38,6 @@ static struct platform_device mv643xx_eth_shared_device = {
 #define MV64x60_IRQ_ETH_1 49
 #define MV64x60_IRQ_ETH_2 50
 
-#ifdef CONFIG_MV643XX_ETH_0
-
 static struct resource mv64x60_eth0_resources[] = {
         [0] = {
                 .name   = "eth0 irq",
@@ -72,9 +70,6 @@ static struct platform_device eth0_device = {
                 .platform_data = &eth0_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_0 */
-
-#ifdef CONFIG_MV643XX_ETH_1
 
 static struct resource mv64x60_eth1_resources[] = {
         [0] = {
@@ -108,9 +103,6 @@ static struct platform_device eth1_device = {
                 .platform_data = &eth1_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_1 */
-
-#ifdef CONFIG_MV643XX_ETH_2
 
 static struct resource mv64x60_eth2_resources[] = {
         [0] = {
@@ -136,19 +128,12 @@ static struct platform_device eth2_device = {
                 .platform_data = &eth2_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_2 */
 
 static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
         &mv643xx_eth_shared_device,
-#ifdef CONFIG_MV643XX_ETH_0
         &eth0_device,
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
         &eth1_device,
-#endif
-#ifdef CONFIG_MV643XX_ETH_2
         &eth2_device,
-#endif
 };
 
 static u8 __init exchange_bit(u8 val, u8 cs)
@@ -215,15 +200,9 @@ static int __init mv643xx_eth_add_pds(void)
         int ret;
 
         get_mac(mac);
-#ifdef CONFIG_MV643XX_ETH_0
         eth_mac_add(eth1_mac_addr, mac, 0);
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
         eth_mac_add(eth1_mac_addr, mac, 1);
-#endif
-#ifdef CONFIG_MV643XX_ETH_2
         eth_mac_add(eth2_mac_addr, mac, 2);
-#endif
         ret = platform_add_devices(mv643xx_eth_pd_devs,
                         ARRAY_SIZE(mv643xx_eth_pd_devs));
 
diff --git a/arch/mips/momentum/ocelot_3/platform.c b/arch/mips/momentum/ocelot_3/platform.c
index 57cfe5c6e4a8..0ab8d231cf7d 100644
--- a/arch/mips/momentum/ocelot_3/platform.c
+++ b/arch/mips/momentum/ocelot_3/platform.c
@@ -38,8 +38,6 @@ static struct platform_device mv643xx_eth_shared_device = {
 #define MV64x60_IRQ_ETH_1 49
 #define MV64x60_IRQ_ETH_2 50
 
-#ifdef CONFIG_MV643XX_ETH_0
-
 static struct resource mv64x60_eth0_resources[] = {
         [0] = {
                 .name   = "eth0 irq",
@@ -72,9 +70,6 @@ static struct platform_device eth0_device = {
                 .platform_data = &eth0_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_0 */
-
-#ifdef CONFIG_MV643XX_ETH_1
 
 static struct resource mv64x60_eth1_resources[] = {
         [0] = {
@@ -108,9 +103,6 @@ static struct platform_device eth1_device = {
                 .platform_data = &eth1_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_1 */
-
-#ifdef CONFIG_MV643XX_ETH_2
 
 static struct resource mv64x60_eth2_resources[] = {
         [0] = {
@@ -136,19 +128,12 @@ static struct platform_device eth2_device = {
                 .platform_data = &eth2_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_2 */
 
 static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
         &mv643xx_eth_shared_device,
-#ifdef CONFIG_MV643XX_ETH_0
         &eth0_device,
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
         &eth1_device,
-#endif
-#ifdef CONFIG_MV643XX_ETH_2
         &eth2_device,
-#endif
 };
 
 static u8 __init exchange_bit(u8 val, u8 cs)
@@ -215,15 +200,9 @@ static int __init mv643xx_eth_add_pds(void)
         int ret;
 
         get_mac(mac);
-#ifdef CONFIG_MV643XX_ETH_0
         eth_mac_add(eth1_mac_addr, mac, 0);
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
         eth_mac_add(eth1_mac_addr, mac, 1);
-#endif
-#ifdef CONFIG_MV643XX_ETH_2
         eth_mac_add(eth2_mac_addr, mac, 2);
-#endif
         ret = platform_add_devices(mv643xx_eth_pd_devs,
                         ARRAY_SIZE(mv643xx_eth_pd_devs));
 
diff --git a/arch/mips/momentum/ocelot_c/platform.c b/arch/mips/momentum/ocelot_c/platform.c
index 6c495b2f1560..8e381d447573 100644
--- a/arch/mips/momentum/ocelot_c/platform.c
+++ b/arch/mips/momentum/ocelot_c/platform.c
@@ -37,8 +37,6 @@ static struct platform_device mv643xx_eth_shared_device = {
 #define MV64x60_IRQ_ETH_0 48
 #define MV64x60_IRQ_ETH_1 49
 
-#ifdef CONFIG_MV643XX_ETH_0
-
 static struct resource mv64x60_eth0_resources[] = {
         [0] = {
                 .name   = "eth0 irq",
@@ -71,9 +69,6 @@ static struct platform_device eth0_device = {
                 .platform_data = &eth0_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_0 */
-
-#ifdef CONFIG_MV643XX_ETH_1
 
 static struct resource mv64x60_eth1_resources[] = {
         [0] = {
@@ -107,16 +102,11 @@ static struct platform_device eth1_device = {
                 .platform_data = &eth1_pd,
         },
 };
-#endif /* CONFIG_MV643XX_ETH_1 */
 
 static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
         &mv643xx_eth_shared_device,
-#ifdef CONFIG_MV643XX_ETH_0
         &eth0_device,
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
         &eth1_device,
-#endif
         /* The third port is not wired up on the Ocelot C */
 };
 
@@ -184,12 +174,8 @@ static int __init mv643xx_eth_add_pds(void)
         int ret;
 
         get_mac(mac);
-#ifdef CONFIG_MV643XX_ETH_0
         eth_mac_add(eth1_mac_addr, mac, 0);
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
         eth_mac_add(eth1_mac_addr, mac, 1);
-#endif
         ret = platform_add_devices(mv643xx_eth_pd_devs,
                         ARRAY_SIZE(mv643xx_eth_pd_devs));
 
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 0df9c33629fd..ccce2a4a1522 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -845,6 +845,21 @@ config MV64X60
         select PPC_INDIRECT_PCI
         default y
 
+config MV643XX_ETH_0
+        bool
+        depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360 || HDPU)
+        default y
+
+config MV643XX_ETH_1
+        bool
+        depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360)
+        default y
+
+config MV643XX_ETH_2
+        bool
+        depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360)
+        default y
+
 menu "Set bridge options"
         depends on MV64X60