[ixp4xx] refresh kernel patches

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-2.6.24 / 020-ixp4xx_rtc_info.patch

diff --git a/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch b/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch
index fab383f11cfdf706a0aead7bb7d96232e0c8baa6..60a3c28c1da7ee17be397ab97759927e4ac7780f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch
@@ -12,11 +12,11 @@ Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
 PATCH FOLLOWS
 KernelVersion: 2.6.24-git5
 
-diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
-index 332a066..ebeb566 100644
---- a/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
-@@ -19,6 +19,7 @@
+Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c
+@@ -18,6 +18,7 @@
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
  #include <linux/leds.h>
@@ -24,7 +24,7 @@ index 332a066..ebeb566 100644
  #include <linux/i2c-gpio.h>
  
  #include <asm/mach-types.h>
-@@ -49,6 +50,12 @@ static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = {
+@@ -47,6 +48,12 @@ static struct i2c_gpio_platform_data nsl
        .scl_pin                = NSLU2_SCL_PIN,
  };
  
@@ -37,7 +37,7 @@ index 332a066..ebeb566 100644
  #ifdef CONFIG_LEDS_IXP4XX
  static struct resource nslu2_led_resources[] = {
        {
-@@ -207,6 +214,9 @@ static void __init nslu2_init(void)
+@@ -183,6 +190,9 @@ static void __init nslu2_init(void)
  
        pm_power_off = nslu2_power_off;
  
@@ -47,28 +47,11 @@ index 332a066..ebeb566 100644
        /*
         * This is only useful on a modified machine, but it is valuable
         * to have it first in order to see debug messages, and so that
--- 
-1.5.2.5
-
-From d4ef1ee0daf96e42bf93421960eaded71e189712 Mon Sep 17 00:00:00 2001
-From: Rod Whitby <rod@whitby.id.au>
-Date: Tue, 29 Jan 2008 10:07:29 +1030
-Subject: ixp4xx: Register nas100d rtc i2c_board_info (Patch #4773)
-
-Register the i2c board info related to the RTC chip on the nas100d
-board to allow it to be found automatically on boot.
-
-Signed-off-by: Rod Whitby <rod@whitby.id.au>
-Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
-
-PATCH FOLLOWS
-KernelVersion: 2.6.24-git5
-
-diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
-index b0884c2..09f75b9 100644
---- a/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
-@@ -17,6 +17,7 @@
+Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
+@@ -16,6 +16,7 @@
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
  #include <linux/leds.h>
@@ -76,7 +59,7 @@ index b0884c2..09f75b9 100644
  #include <linux/i2c-gpio.h>
  
  #include <asm/mach-types.h>
-@@ -41,6 +42,12 @@ static struct platform_device nas100d_flash = {
+@@ -39,6 +40,12 @@ static struct platform_device nas100d_fl
        .resource               = &nas100d_flash_resource,
  };
  
@@ -89,7 +72,7 @@ index b0884c2..09f75b9 100644
  #ifdef CONFIG_LEDS_IXP4XX
  static struct resource nas100d_led_resources[] = {
        {
-@@ -181,6 +188,9 @@ static void __init nas100d_init(void)
+@@ -157,6 +164,9 @@ static void __init nas100d_init(void)
  
        pm_power_off = nas100d_power_off;
  
@@ -99,27 +82,10 @@ index b0884c2..09f75b9 100644
        /*
         * This is only useful on a modified machine, but it is valuable
         * to have it first in order to see debug messages, and so that
--- 
-1.5.2.5
-
-From aa9d35dae397402f57f1baa8d53fed75d76aed8d Mon Sep 17 00:00:00 2001
-From: Rod Whitby <rod@whitby.id.au>
-Date: Tue, 29 Jan 2008 10:09:41 +1030
-Subject: ixp4xx: Register dsmg600 rtc i2c_board_info (Patch #4774)
-
-Register the i2c board info related to the RTC chip on the dsmg600
-board to allow it to be found automatically on boot.
-
-Signed-off-by: Rod Whitby <rod@whitby.id.au>
-Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
-
-PATCH FOLLOWS
-KernelVersion: 2.6.24-git5
-
-diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
-index c473d40..a1c44ef 100644
---- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
-+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
+Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
 @@ -14,6 +14,7 @@
  #include <linux/kernel.h>
  #include <linux/serial.h>
@@ -128,7 +94,7 @@ index c473d40..a1c44ef 100644
  #include <linux/i2c-gpio.h>
  
  #include <asm/mach-types.h>
-@@ -51,6 +52,12 @@ static struct platform_device dsmg600_i2c_gpio = {
+@@ -51,6 +52,12 @@ static struct platform_device dsmg600_i2
        },
  };
  
@@ -151,6 +117,3 @@ index c473d40..a1c44ef 100644
        /* The UART is required on the DSM-G600 (Redboot cannot use the
         * NIC) -- do it here so that it does *not* get removed if
         * platform_add_devices fails!
--- 
-1.5.2.5
-