ar71xx: merge DSA switch patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18752 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 12 insertions, 140 deletions

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
index 43212ed3bf..e9a80ee7b6 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -825,6 +825,8 @@ static struct platform_device ar71xx_dsa_switch_device = {
 void __init ar71xx_add_device_dsa(unsigned int id,
 				  struct dsa_platform_data *d)
 {
+	int i;
+
 	switch (id) {
 	case 0:
 		d->netdev = &ar71xx_eth0_device.dev;
@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsigned int id,
 			id);
 		return;
 	}
-	d->mii_bus = &ar71xx_mdio_device.dev;
+
+	for (i = 0; i < d->nr_chips; i++)
+		d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
+
 	ar71xx_dsa_switch_device.dev.platform_data = d;
 
 	platform_device_register(&ar71xx_dsa_switch_device);
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 eb1a1b0da7..580ae19d92 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -104,7 +104,7 @@ static struct gpio_button tl_wr941nd_gpio_buttons[] __initdata = {
 	}
 };
 
-static struct dsa_platform_data tl_wr941nd_dsa_data = {
+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
 	.port_names[0]  = "wan",
 	.port_names[1]  = "lan1",
 	.port_names[2]  = "lan2",
@@ -113,6 +113,11 @@ static struct dsa_platform_data tl_wr941nd_dsa_data = {
 	.port_names[5]  = "cpu",
 };
 
+static struct dsa_platform_data tl_wr941nd_dsa_data = {
+	.nr_chips	= 1,
+	.chip		= &tl_wr941nd_dsa_chip,
+};
+
 static void __init tl_wr941nd_setup(void)
 {
 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
diff --git a/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
deleted file mode 100644
index ac2c7d9251..0000000000
--- a/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/mips/ar71xx/devices.c
-+++ b/arch/mips/ar71xx/devices.c
-@@ -825,6 +825,8 @@ static struct platform_device ar71xx_dsa
- void __init ar71xx_add_device_dsa(unsigned int id,
- 				  struct dsa_platform_data *d)
- {
-+	int i;
-+
- 	switch (id) {
- 	case 0:
- 		d->netdev = &ar71xx_eth0_device.dev;
-@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsign
- 			id);
- 		return;
- 	}
--	d->mii_bus = &ar71xx_mdio_device.dev;
-+
-+	for (i = 0; i < d->nr_chips; i++)
-+		d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
-+
- 	ar71xx_dsa_switch_device.dev.platform_data = d;
- 
- 	platform_device_register(&ar71xx_dsa_switch_device);
---- a/arch/mips/ar71xx/mach-tl-wr941nd.c
-+++ b/arch/mips/ar71xx/mach-tl-wr941nd.c
-@@ -104,7 +104,7 @@ static struct gpio_button tl_wr941nd_gpi
- 	}
- };
- 
--static struct dsa_platform_data tl_wr941nd_dsa_data = {
-+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
- 	.port_names[0]  = "wan",
- 	.port_names[1]  = "lan1",
- 	.port_names[2]  = "lan2",
-@@ -113,6 +113,11 @@ static struct dsa_platform_data tl_wr941
- 	.port_names[5]  = "cpu",
- };
- 
-+static struct dsa_platform_data tl_wr941nd_dsa_data = {
-+	.nr_chips	= 1,
-+	.chip		= &tl_wr941nd_dsa_chip,
-+};
-+
- static void __init tl_wr941nd_setup(void)
- {
- 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
diff --git a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
deleted file mode 100644
index ac2c7d9251..0000000000
--- a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/mips/ar71xx/devices.c
-+++ b/arch/mips/ar71xx/devices.c
-@@ -825,6 +825,8 @@ static struct platform_device ar71xx_dsa
- void __init ar71xx_add_device_dsa(unsigned int id,
- 				  struct dsa_platform_data *d)
- {
-+	int i;
-+
- 	switch (id) {
- 	case 0:
- 		d->netdev = &ar71xx_eth0_device.dev;
-@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsign
- 			id);
- 		return;
- 	}
--	d->mii_bus = &ar71xx_mdio_device.dev;
-+
-+	for (i = 0; i < d->nr_chips; i++)
-+		d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
-+
- 	ar71xx_dsa_switch_device.dev.platform_data = d;
- 
- 	platform_device_register(&ar71xx_dsa_switch_device);
---- a/arch/mips/ar71xx/mach-tl-wr941nd.c
-+++ b/arch/mips/ar71xx/mach-tl-wr941nd.c
-@@ -104,7 +104,7 @@ static struct gpio_button tl_wr941nd_gpi
- 	}
- };
- 
--static struct dsa_platform_data tl_wr941nd_dsa_data = {
-+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
- 	.port_names[0]  = "wan",
- 	.port_names[1]  = "lan1",
- 	.port_names[2]  = "lan2",
-@@ -113,6 +113,11 @@ static struct dsa_platform_data tl_wr941
- 	.port_names[5]  = "cpu",
- };
- 
-+static struct dsa_platform_data tl_wr941nd_dsa_data = {
-+	.nr_chips	= 1,
-+	.chip		= &tl_wr941nd_dsa_chip,
-+};
-+
- static void __init tl_wr941nd_setup(void)
- {
- 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
diff --git a/target/linux/ar71xx/patches-2.6.32/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.32/803-ar71xx-update-dsa-switch-support.patch
deleted file mode 100644
index ac2c7d9251..0000000000
--- a/target/linux/ar71xx/patches-2.6.32/803-ar71xx-update-dsa-switch-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/mips/ar71xx/devices.c
-+++ b/arch/mips/ar71xx/devices.c
-@@ -825,6 +825,8 @@ static struct platform_device ar71xx_dsa
- void __init ar71xx_add_device_dsa(unsigned int id,
- 				  struct dsa_platform_data *d)
- {
-+	int i;
-+
- 	switch (id) {
- 	case 0:
- 		d->netdev = &ar71xx_eth0_device.dev;
-@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsign
- 			id);
- 		return;
- 	}
--	d->mii_bus = &ar71xx_mdio_device.dev;
-+
-+	for (i = 0; i < d->nr_chips; i++)
-+		d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
-+
- 	ar71xx_dsa_switch_device.dev.platform_data = d;
- 
- 	platform_device_register(&ar71xx_dsa_switch_device);
---- a/arch/mips/ar71xx/mach-tl-wr941nd.c
-+++ b/arch/mips/ar71xx/mach-tl-wr941nd.c
-@@ -104,7 +104,7 @@ static struct gpio_button tl_wr941nd_gpi
- 	}
- };
- 
--static struct dsa_platform_data tl_wr941nd_dsa_data = {
-+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
- 	.port_names[0]  = "wan",
- 	.port_names[1]  = "lan1",
- 	.port_names[2]  = "lan2",
-@@ -113,6 +113,11 @@ static struct dsa_platform_data tl_wr941
- 	.port_names[5]  = "cpu",
- };
- 
-+static struct dsa_platform_data tl_wr941nd_dsa_data = {
-+	.nr_chips	= 1,
-+	.chip		= &tl_wr941nd_dsa_chip,
-+};
-+
- static void __init tl_wr941nd_setup(void)
- {
- 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);