ixp4xx/fsg3: Added LEDs support, and refreshed patches for 2.6.23.12

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-2.6.23 / 054-fsg3_mac_plat_info.patch

diff --git a/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
index 3a9f62607104473c3e500fda5cf880f3e321c521..9a8d3f30f4d9fb02f5398529ffc10b9b03f8b5fd 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
@@ -1,44 +1,45 @@
-diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
-index 11336e6..ec3d517 100644
---- a/arch/arm/mach-ixp4xx/fsg-setup.c
-+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
-@@ -142,12 +142,39 @@ static struct platform_device fsg_uart = {
+Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/fsg-setup.c
+===================================================================
+--- linux-2.6.23.12.orig/arch/arm/mach-ixp4xx/fsg-setup.c      2008-01-05 13:53:26.000000000 +1030
++++ linux-2.6.23.12/arch/arm/mach-ixp4xx/fsg-setup.c   2008-01-05 13:56:28.000000000 +1030
+@@ -94,6 +94,31 @@
        .resource               = fsg_uart_resources,
  };
  
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info fsg_plat_eth[] = {
-+        {
-+                .phy            = 5,
-+                .rxq            = 3,
-+              .txreadyq       = 20,
-+        }, {
-+                .phy            = 4,
-+                .rxq            = 4,
-+              .txreadyq       = 21,
-+        }
-+};
-+
-+static struct platform_device fsg_eth[] = {
-+        {
-+                .name                   = "ixp4xx_eth",
-+                .id                     = IXP4XX_ETH_NPEB,
-+                .dev.platform_data      = fsg_plat_eth,
-+        }, {
-+                .name                   = "ixp4xx_eth",
-+                .id                     = IXP4XX_ETH_NPEC,
-+                .dev.platform_data      = fsg_plat_eth + 1,
-+        }
-+};
-+
++ /* Built-in 10/100 Ethernet MAC interfaces */
++ static struct eth_plat_info fsg_plat_eth[] = {
++         {
++                 .phy            = 5,
++                 .rxq            = 3,
++              .txreadyq       = 20,
++         }, {
++                 .phy            = 4,
++                 .rxq            = 4,
++              .txreadyq       = 21,
++         }
++ };
++ 
++ static struct platform_device fsg_eth[] = {
++         {
++                 .name                   = "ixp4xx_eth",
++                 .id                     = IXP4XX_ETH_NPEB,
++                 .dev.platform_data      = fsg_plat_eth,
++         }, {
++                 .name                   = "ixp4xx_eth",
++                 .id                     = IXP4XX_ETH_NPEC,
++                 .dev.platform_data      = fsg_plat_eth + 1,
++         }
++ };
++ 
+ static struct platform_device fsg_leds = {
+       .name           = "fsg-led",
+       .id             = -1,
+@@ -102,6 +127,8 @@
  static struct platform_device *fsg_devices[] __initdata = {
-       &fsg_i2c_gpio,
+       &fsg_i2c_controller,
        &fsg_flash,
- #ifdef CONFIG_LEDS_IXP4XX
-       &fsg_leds,
- #endif
 +      &fsg_eth[0],
 +      &fsg_eth[1],
+       &fsg_leds,
  };
  
- static void __init fsg_init(void)