Merge tag 'for_3.16/samsung-clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / arch / mips / pmcs-msp71xx / msp_eth.c

diff --git a/arch/mips/pmcs-msp71xx/msp_eth.c b/arch/mips/pmcs-msp71xx/msp_eth.c
index c584df393de2e04509b425f08ccc3e7b475d5091..15679b427f4404bba2efc90941bfe9b2e0d3c128 100644 (file)
--- a/arch/mips/pmcs-msp71xx/msp_eth.c
+++ b/arch/mips/pmcs-msp71xx/msp_eth.c
@@ -38,73 +38,6 @@
 #define MSP_ETHERNET_GPIO1     15
 #define MSP_ETHERNET_GPIO2     16
 
-#ifdef CONFIG_MSP_HAS_TSMAC
-#define MSP_TSMAC_SIZE 0x10020
-#define MSP_TSMAC_ID   "pmc_tsmac"
-
-static struct resource msp_tsmac0_resources[] = {
-       [0] = {
-               .start  = MSP_MAC0_BASE,
-               .end    = MSP_MAC0_BASE + MSP_TSMAC_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = MSP_INT_MAC0,
-               .end    = MSP_INT_MAC0,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct resource msp_tsmac1_resources[] = {
-       [0] = {
-               .start  = MSP_MAC1_BASE,
-               .end    = MSP_MAC1_BASE + MSP_TSMAC_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = MSP_INT_MAC1,
-               .end    = MSP_INT_MAC1,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-static struct resource msp_tsmac2_resources[] = {
-       [0] = {
-               .start  = MSP_MAC2_BASE,
-               .end    = MSP_MAC2_BASE + MSP_TSMAC_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = MSP_INT_SAR,
-               .end    = MSP_INT_SAR,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-
-static struct platform_device tsmac_device[] = {
-       [0] = {
-               .name   = MSP_TSMAC_ID,
-               .id     = 0,
-               .num_resources = ARRAY_SIZE(msp_tsmac0_resources),
-               .resource = msp_tsmac0_resources,
-       },
-       [1] = {
-               .name   = MSP_TSMAC_ID,
-               .id     = 1,
-               .num_resources = ARRAY_SIZE(msp_tsmac1_resources),
-               .resource = msp_tsmac1_resources,
-       },
-       [2] = {
-               .name   = MSP_TSMAC_ID,
-               .id     = 2,
-               .num_resources = ARRAY_SIZE(msp_tsmac2_resources),
-               .resource = msp_tsmac2_resources,
-       },
-};
-#define msp_eth_devs   tsmac_device
-
-#else
-/* If it is not TSMAC assume MSP_ETH (100Mbps) */
 #define MSP_ETH_ID     "pmc_mspeth"
 #define MSP_ETH_SIZE   0xE0
 static struct resource msp_eth0_resources[] = {
@@ -152,7 +85,6 @@ static struct platform_device mspeth_device[] = {
 };
 #define msp_eth_devs   mspeth_device
 
-#endif
 int __init msp_eth_setup(void)
 {
        int i, ret = 0;
@@ -161,14 +93,6 @@ int __init msp_eth_setup(void)
        msp_gpio_pin_mode(MSP_GPIO_OUTPUT, MSP_ETHERNET_GPIO0);
        msp_gpio_pin_hi(MSP_ETHERNET_GPIO0);
 
-#ifdef CONFIG_MSP_HAS_TSMAC
-       /* 3 phys on boards with TSMAC */
-       msp_gpio_pin_mode(MSP_GPIO_OUTPUT, MSP_ETHERNET_GPIO1);
-       msp_gpio_pin_hi(MSP_ETHERNET_GPIO1);
-
-       msp_gpio_pin_mode(MSP_GPIO_OUTPUT, MSP_ETHERNET_GPIO2);
-       msp_gpio_pin_hi(MSP_ETHERNET_GPIO2);
-#endif
        for (i = 0; i < ARRAY_SIZE(msp_eth_devs); i++) {
                ret = platform_device_register(&msp_eth_devs[i]);
                printk(KERN_INFO "device: %d, return value = %d\n", i, ret);