ar71xx: rename ar71xx_mdio_* structures to ar71xx_mdio0_*

SVN-Revision: 28983

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
index fa22c0df8b318b0fe0a9a84ee1dbcb5e7d74654b..26b1cf3c7d2668f2d8eb92b733b67b5ff4c24cb5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -119,7 +119,7 @@ void __init ar71xx_add_device_uart(void)
        platform_device_register(pdev);
 }
 
-static struct resource ar71xx_mdio_resources[] = {
+static struct resource ar71xx_mdio0_resources[] = {
        {
                .name   = "mdio_base",
                .flags  = IORESOURCE_MEM,
@@ -128,15 +128,15 @@ static struct resource ar71xx_mdio_resources[] = {
        }
 };
 
-static struct ag71xx_mdio_platform_data ar71xx_mdio_data;
+static struct ag71xx_mdio_platform_data ar71xx_mdio0_data;
 
-struct platform_device ar71xx_mdio_device = {
+struct platform_device ar71xx_mdio0_device = {
        .name           = "ag71xx-mdio",
        .id             = -1,
-       .resource       = ar71xx_mdio_resources,
-       .num_resources  = ARRAY_SIZE(ar71xx_mdio_resources),
+       .resource       = ar71xx_mdio0_resources,
+       .num_resources  = ARRAY_SIZE(ar71xx_mdio0_resources),
        .dev = {
-               .platform_data = &ar71xx_mdio_data,
+               .platform_data = &ar71xx_mdio0_data,
        },
 };
 
@@ -178,12 +178,12 @@ void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask)
 
        switch (ar71xx_soc) {
        case AR71XX_SOC_AR7240:
-               ar71xx_mdio_data.is_ar7240 = 1;
+               ar71xx_mdio0_data.is_ar7240 = 1;
                break;
        case AR71XX_SOC_AR7241:
-               ar71xx_mdio_data.is_ar7240 = 1;
-               ar71xx_mdio_resources[0].start = AR71XX_GE1_BASE;
-               ar71xx_mdio_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1;
+               ar71xx_mdio0_data.is_ar7240 = 1;
+               ar71xx_mdio0_resources[0].start = AR71XX_GE1_BASE;
+               ar71xx_mdio0_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1;
                break;
        case AR71XX_SOC_AR7242:
                ar71xx_set_pll(AR71XX_PLL_REG_SEC_CONFIG,
@@ -192,17 +192,17 @@ void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask)
                break;
        case AR71XX_SOC_AR9330:
        case AR71XX_SOC_AR9331:
-               ar71xx_mdio_data.is_ar7240 = 1;
-               ar71xx_mdio_resources[0].start = AR71XX_GE1_BASE;
-               ar71xx_mdio_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1;
+               ar71xx_mdio0_data.is_ar7240 = 1;
+               ar71xx_mdio0_resources[0].start = AR71XX_GE1_BASE;
+               ar71xx_mdio0_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1;
                break;
        default:
                break;
        }
 
-       ar71xx_mdio_data.phy_mask = phy_mask;
+       ar71xx_mdio0_data.phy_mask = phy_mask;
 
-       platform_device_register(&ar71xx_mdio_device);
+       platform_device_register(&ar71xx_mdio0_device);
 }
 
 struct ar71xx_eth_pll_data ar71xx_eth0_pll_data;
@@ -724,7 +724,7 @@ void __init ar71xx_add_device_eth(unsigned int id)
        }
 
        if (pdata->mii_bus_dev == NULL)
-               pdata->mii_bus_dev = &ar71xx_mdio_device.dev;
+               pdata->mii_bus_dev = &ar71xx_mdio0_device.dev;
 
        /* Reset the device */
        ar71xx_device_stop(pdata->reset_bit);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
index 7a222c71398387c7c7c6f61bbdca07347257d930..f24d562c3e754552896d4cfc06e5e5fbe39bd2be 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
@@ -40,7 +40,7 @@ extern struct platform_device ar71xx_eth0_device;
 extern struct platform_device ar71xx_eth1_device;
 void ar71xx_add_device_eth(unsigned int id) __init;
 
-extern struct platform_device ar71xx_mdio_device;
+extern struct platform_device ar71xx_mdio0_device;
 void ar71xx_add_device_mdio(unsigned int id, u32 phy_mask) __init;
 
 void ar71xx_add_device_uart(void) __init;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
index c5135ecdc6da05f3945a8d371db48c9c19f984d6..3871b7e0779b4beddf069d09721f248aa9b17276 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
@@ -126,7 +126,7 @@ static void __init tl_wr841n_v1_setup(void)
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
        ar71xx_add_device_eth(0);
-       ar71xx_add_device_dsa(&ar71xx_eth0_device.dev, &ar71xx_mdio_device.dev,
+       ar71xx_add_device_dsa(&ar71xx_eth0_device.dev, &ar71xx_mdio0_device.dev,
                              &tl_wr841n_v1_dsa_data);
 
        ar71xx_add_device_m25p80(&tl_wr841n_v1_flash_data);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index 2815b7d66c8df1b47b2b7714675936308e55a27b..f8e605dcdc136c07efe803489c45f8595dafe3c1 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -131,7 +131,7 @@ static void __init tl_wr941nd_setup(void)
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
        ar71xx_add_device_eth(0);
-       ar71xx_add_device_dsa(&ar71xx_eth0_device.dev, &ar71xx_mdio_device.dev,
+       ar71xx_add_device_dsa(&ar71xx_eth0_device.dev, &ar71xx_mdio0_device.dev,
                              &tl_wr941nd_dsa_data);
 
        ar71xx_add_device_m25p80(&tl_wr941nd_flash_data);