diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 21:24:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 21:24:55 -0800 |
| commit | 87530db5ec7d519c7ba334e414307c5130ae2da8 (patch) | |
| tree | a1720bb29998d8d658e91ed106263561a8101bf0 /arch/ppc/platforms/85xx/mpc8560_ads.c | |
| parent | a148058c5cf72ad23fb6c4cf9828f7276e13151c (diff) | |
| parent | d5f079000b20887bfbc84d772a27709c5665e652 (diff) | |
| download | linux-87530db5ec7d519c7ba334e414307c5130ae2da8.tar.gz linux-87530db5ec7d519c7ba334e414307c5130ae2da8.tar.bz2 linux-87530db5ec7d519c7ba334e414307c5130ae2da8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc/platforms/85xx/mpc8560_ads.c')
| -rw-r--r-- | arch/ppc/platforms/85xx/mpc8560_ads.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c index 8e39a5517092..442c7ff195d3 100644 --- a/arch/ppc/platforms/85xx/mpc8560_ads.c +++ b/arch/ppc/platforms/85xx/mpc8560_ads.c @@ -56,10 +56,6 @@ #include <syslib/ppc85xx_setup.h> -static const char *GFAR_PHY_0 = "phy0:0"; -static const char *GFAR_PHY_1 = "phy0:1"; -static const char *GFAR_PHY_3 = "phy0:3"; - /* ************************************************************************ * * Setup the architecture @@ -99,20 +95,21 @@ mpc8560ads_setup_arch(void) mdata->irq[2] = -1; mdata->irq[3] = MPC85xx_IRQ_EXT5; mdata->irq[31] = -1; - mdata->paddr += binfo->bi_immr_base; /* setup the board related information for the enet controllers */ pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1); if (pdata) { pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; - pdata->bus_id = GFAR_PHY_0; + pdata->bus_id = 0; + pdata->phy_id = 0; memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6); } pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2); if (pdata) { pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; - pdata->bus_id = GFAR_PHY_1; + pdata->bus_id = 0; + pdata->phy_id = 1; memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6); } |