From: "Mark A. Greer" - Adapt Katana to the new names used by the ethernet driver. - Remove SRAM allocation code for mv643xx_enet until it's had more review. Signed-off-by: Dale Farnsworth Signed-off-by: Mark A. Greer Signed-off-by: Andrew Morton --- 25-akpm/arch/ppc/platforms/katana.c | 22 ++++------------------ 25-akpm/arch/ppc/syslib/mv64x60.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 28 deletions(-) diff -puN arch/ppc/platforms/katana.c~ppc32-artesyn-katana-enet-update arch/ppc/platforms/katana.c --- 25/arch/ppc/platforms/katana.c~ppc32-artesyn-katana-enet-update 2005-02-17 17:56:35.000000000 -0800 +++ 25-akpm/arch/ppc/platforms/katana.c 2005-02-17 17:56:35.000000000 -0800 @@ -558,32 +558,18 @@ katana_fixup_mpsc_pdata(struct platform_ static void __init katana_fixup_eth_pdata(struct platform_device *pdev) { - struct mv64xxx_eth_platform_data *eth_pd; + struct mv643xx_eth_platform_data *eth_pd; static u16 phy_addr[] = { KATANA_ETH0_PHY_ADDR, KATANA_ETH1_PHY_ADDR, KATANA_ETH2_PHY_ADDR, }; - int rx_size = KATANA_ETH_RX_QUEUE_SIZE * MV64340_ETH_DESC_SIZE; - int tx_size = KATANA_ETH_TX_QUEUE_SIZE * MV64340_ETH_DESC_SIZE; eth_pd = pdev->dev.platform_data; eth_pd->force_phy_addr = 1; eth_pd->phy_addr = phy_addr[pdev->id]; eth_pd->tx_queue_size = KATANA_ETH_TX_QUEUE_SIZE; eth_pd->rx_queue_size = KATANA_ETH_RX_QUEUE_SIZE; - eth_pd->tx_sram_addr = mv643xx_sram_alloc(tx_size); - - if (eth_pd->tx_sram_addr) - eth_pd->tx_sram_size = tx_size; - else - printk(KERN_ERR "mv643xx_sram_alloc failed\n"); - - eth_pd->rx_sram_addr = mv643xx_sram_alloc(rx_size); - if (eth_pd->rx_sram_addr) - eth_pd->rx_sram_size = rx_size; - else - printk(KERN_ERR "mv643xx_sram_alloc failed\n"); } #endif @@ -599,9 +585,9 @@ katana_platform_notify(struct device *de { MPSC_CTLR_NAME "1", katana_fixup_mpsc_pdata }, #endif #if defined(CONFIG_MV643XX_ETH) - { MV64XXX_ETH_NAME "0", katana_fixup_eth_pdata }, - { MV64XXX_ETH_NAME "1", katana_fixup_eth_pdata }, - { MV64XXX_ETH_NAME "2", katana_fixup_eth_pdata }, + { MV643XX_ETH_NAME "0", katana_fixup_eth_pdata }, + { MV643XX_ETH_NAME "1", katana_fixup_eth_pdata }, + { MV643XX_ETH_NAME "2", katana_fixup_eth_pdata }, #endif }; struct platform_device *pdev; diff -puN arch/ppc/syslib/mv64x60.c~ppc32-artesyn-katana-enet-update arch/ppc/syslib/mv64x60.c --- 25/arch/ppc/syslib/mv64x60.c~ppc32-artesyn-katana-enet-update 2005-02-17 17:56:35.000000000 -0800 +++ 25-akpm/arch/ppc/syslib/mv64x60.c 2005-02-17 17:56:35.000000000 -0800 @@ -314,15 +314,15 @@ static struct platform_device mpsc1_devi static struct resource mv64x60_eth_shared_resources[] = { [0] = { .name = "ethernet shared base", - .start = MV64340_ETH_SHARED_REGS, - .end = MV64340_ETH_SHARED_REGS + - MV64340_ETH_SHARED_REGS_SIZE - 1, + .start = MV643XX_ETH_SHARED_REGS, + .end = MV643XX_ETH_SHARED_REGS + + MV643XX_ETH_SHARED_REGS_SIZE - 1, .flags = IORESOURCE_MEM, }, }; static struct platform_device mv64x60_eth_shared_device = { - .name = MV64XXX_ETH_SHARED_NAME, + .name = MV643XX_ETH_SHARED_NAME, .id = 0, .num_resources = ARRAY_SIZE(mv64x60_eth_shared_resources), .resource = mv64x60_eth_shared_resources, @@ -338,10 +338,10 @@ static struct resource mv64x60_eth0_reso }, }; -static struct mv64xxx_eth_platform_data eth0_pd; +static struct mv643xx_eth_platform_data eth0_pd; static struct platform_device eth0_device = { - .name = MV64XXX_ETH_NAME, + .name = MV643XX_ETH_NAME, .id = 0, .num_resources = ARRAY_SIZE(mv64x60_eth0_resources), .resource = mv64x60_eth0_resources, @@ -361,10 +361,10 @@ static struct resource mv64x60_eth1_reso }, }; -static struct mv64xxx_eth_platform_data eth1_pd; +static struct mv643xx_eth_platform_data eth1_pd; static struct platform_device eth1_device = { - .name = MV64XXX_ETH_NAME, + .name = MV643XX_ETH_NAME, .id = 1, .num_resources = ARRAY_SIZE(mv64x60_eth1_resources), .resource = mv64x60_eth1_resources, @@ -384,10 +384,10 @@ static struct resource mv64x60_eth2_reso }, }; -static struct mv64xxx_eth_platform_data eth2_pd; +static struct mv643xx_eth_platform_data eth2_pd; static struct platform_device eth2_device = { - .name = MV64XXX_ETH_NAME, + .name = MV643XX_ETH_NAME, .id = 2, .num_resources = ARRAY_SIZE(mv64x60_eth2_resources), .resource = mv64x60_eth2_resources, _