qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:37:10 +02:00
Code

ar71xx: rename ar71xx_mdio_* structures to ar71xx_mdio0_*

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28983 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-11-12 12:09:50 +00:00
parent f20b056795
commit 4e5c6e94da
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
View File

@ -119,7 +119,7 @@ void __init ar71xx_add_device_uart(void)
platform_device_register(pdev); platform_device_register(pdev);
} }
static struct resource ar71xx_mdio_resources[] = { static struct resource ar71xx_mdio0_resources[] = {
{ {
.name = "mdio_base", .name = "mdio_base",
.flags = IORESOURCE_MEM, .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", .name = "ag71xx-mdio",
.id = -1, .id = -1,
.resource = ar71xx_mdio_resources, .resource = ar71xx_mdio0_resources,
.num_resources = ARRAY_SIZE(ar71xx_mdio_resources), .num_resources = ARRAY_SIZE(ar71xx_mdio0_resources),
.dev = { .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) { switch (ar71xx_soc) {
case AR71XX_SOC_AR7240: case AR71XX_SOC_AR7240:
ar71xx_mdio_data.is_ar7240 = 1; ar71xx_mdio0_data.is_ar7240 = 1;
break; break;
case AR71XX_SOC_AR7241: case AR71XX_SOC_AR7241:
ar71xx_mdio_data.is_ar7240 = 1; ar71xx_mdio0_data.is_ar7240 = 1;
ar71xx_mdio_resources[0].start = AR71XX_GE1_BASE; ar71xx_mdio0_resources[0].start = AR71XX_GE1_BASE;
ar71xx_mdio_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1; ar71xx_mdio0_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1;
break; break;
case AR71XX_SOC_AR7242: case AR71XX_SOC_AR7242:
ar71xx_set_pll(AR71XX_PLL_REG_SEC_CONFIG, 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; break;
case AR71XX_SOC_AR9330: case AR71XX_SOC_AR9330:
case AR71XX_SOC_AR9331: case AR71XX_SOC_AR9331:
ar71xx_mdio_data.is_ar7240 = 1; ar71xx_mdio0_data.is_ar7240 = 1;
ar71xx_mdio_resources[0].start = AR71XX_GE1_BASE; ar71xx_mdio0_resources[0].start = AR71XX_GE1_BASE;
ar71xx_mdio_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1; ar71xx_mdio0_resources[0].end = AR71XX_GE1_BASE + 0x200 - 1;
break; break;
default: default:
break; 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; 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) 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 */ /* Reset the device */
ar71xx_device_stop(pdata->reset_bit); ar71xx_device_stop(pdata->reset_bit);

2
target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
View File

@ -40,7 +40,7 @@ extern struct platform_device ar71xx_eth0_device;
extern struct platform_device ar71xx_eth1_device; extern struct platform_device ar71xx_eth1_device;
void ar71xx_add_device_eth(unsigned int id) __init; 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_mdio(unsigned int id, u32 phy_mask) __init;
void ar71xx_add_device_uart(void) __init; void ar71xx_add_device_uart(void) __init;

2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
View File

@ -126,7 +126,7 @@ static void __init tl_wr841n_v1_setup(void)
ar71xx_eth0_data.duplex = DUPLEX_FULL; ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_add_device_eth(0); 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); &tl_wr841n_v1_dsa_data);
ar71xx_add_device_m25p80(&tl_wr841n_v1_flash_data); ar71xx_add_device_m25p80(&tl_wr841n_v1_flash_data);

2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
View File

@ -131,7 +131,7 @@ static void __init tl_wr941nd_setup(void)
ar71xx_eth0_data.duplex = DUPLEX_FULL; ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_add_device_eth(0); 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); &tl_wr941nd_dsa_data);
ar71xx_add_device_m25p80(&tl_wr941nd_flash_data); ar71xx_add_device_m25p80(&tl_wr941nd_flash_data);