Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2 files changed, 13 insertions, 5 deletions

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index b3404b7775b3..0d2074f51a59 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -231,14 +231,17 @@ static struct platform_device kirkwood_switch_device = {
 
 void __init kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq)
 {
+        int i;
+
         if (irq != NO_IRQ) {
                 kirkwood_switch_resources[0].start = irq;
                 kirkwood_switch_resources[0].end = irq;
                 kirkwood_switch_device.num_resources = 1;
         }
 
-        d->mii_bus = &kirkwood_ge00_shared.dev;
         d->netdev = &kirkwood_ge00.dev;
+        for (i = 0; i < d->nr_chips; i++)
+                d->chip[i].mii_bus = &kirkwood_ge00_shared.dev;
         kirkwood_switch_device.dev.platform_data = d;
 
         platform_device_register(&kirkwood_switch_device);
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index 9a0e905d10cd..e1c0516c4df3 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -75,7 +75,7 @@ static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {
         .duplex         = DUPLEX_FULL,
 };
 
-static struct dsa_platform_data rd88f6281_switch_data = {
+static struct dsa_chip_data rd88f6281_switch_chip_data = {
         .port_names[0]  = "lan1",
         .port_names[1]  = "lan2",
         .port_names[2]  = "lan3",
@@ -83,6 +83,11 @@ static struct dsa_platform_data rd88f6281_switch_data = {
         .port_names[5]  = "cpu",
 };
 
+static struct dsa_platform_data rd88f6281_switch_plat_data = {
+        .nr_chips       = 1,
+        .chip           = &rd88f6281_switch_chip_data,
+};
+
 static struct mv643xx_eth_platform_data rd88f6281_ge01_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
 };
@@ -105,12 +110,12 @@ static void __init rd88f6281_init(void)
         kirkwood_ge00_init(&rd88f6281_ge00_data);
         kirkwood_pcie_id(&dev, &rev);
         if (rev == MV88F6281_REV_A0) {
-                rd88f6281_switch_data.sw_addr = 10;
+                rd88f6281_switch_chip_data.sw_addr = 10;
                 kirkwood_ge01_init(&rd88f6281_ge01_data);
         } else {
-                rd88f6281_switch_data.port_names[4] = "wan";
+                rd88f6281_switch_chip_data.port_names[4] = "wan";
         }
-        kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);
+        kirkwood_ge00_switch_init(&rd88f6281_switch_plat_data, NO_IRQ);
 
         kirkwood_rtc_init();
         kirkwood_sata_init(&rd88f6281_sata_data);