ixp4xx: Updated patches to include all upstream-merged ixp4xx patches

[openwrt/staging/florian.git] / target / linux / ixp4xx / patches-2.6.24 / 091-nslu2_rtc_fixup.patch

diff --git a/target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch
deleted file mode 100644 (file)
index 49ca1e2..0000000
--- a/target/linux/ixp4xx/patches-2.6.24/091-nslu2_rtc_fixup.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nslu2-setup.c
---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c       2007-10-09 15:31:38.000000000 -0500
-+++ linux-2.6.23/arch/arm/mach-ixp4xx/nslu2-setup.c    2007-10-11 01:04:46.000000000 -0500
-@@ -19,6 +19,7 @@
- #include <linux/serial_8250.h>
- #include <linux/leds.h>
- 
-+#include <asm/setup.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/flash.h>
-@@ -171,6 +172,35 @@ static struct sys_timer nslu2_timer = {
-     .init   = nslu2_timer_init,
- };
- 
-+static char nslu2_rtc_probe[] __initdata = "rtc-isl1208.ignore=0,0x6f rtc-x1205.probe=0,0x6f ";
-+
-+static void __init nslu2_fixup(struct machine_desc *desc,
-+                struct tag *tags, char **cmdline, struct meminfo *mi)
-+{
-+    struct tag *t = tags;
-+    char *p = *cmdline;
-+
-+    /* Find the end of the tags table, taking note of any cmdline tag. */
-+    for (; t->hdr.size; t = tag_next(t)) {
-+        if (t->hdr.tag == ATAG_CMDLINE) {
-+            p = t->u.cmdline.cmdline;
-+        }
-+    }
-+
-+    /* Overwrite the end of the table with a new cmdline tag. */
-+    t->hdr.tag = ATAG_CMDLINE;
-+    t->hdr.size = (sizeof (struct tag_header) +
-+        strlen(nslu2_rtc_probe) + strlen(p) + 1 + 4) >> 2;
-+    strlcpy(t->u.cmdline.cmdline, nslu2_rtc_probe, COMMAND_LINE_SIZE);
-+    strlcpy(t->u.cmdline.cmdline + strlen(nslu2_rtc_probe), p,
-+        COMMAND_LINE_SIZE - strlen(nslu2_rtc_probe));
-+
-+    /* Terminate the table. */
-+    t = tag_next(t);
-+    t->hdr.tag = ATAG_NONE;
-+    t->hdr.size = 0;
-+}
-+
- static void __init nslu2_init(void)
- {
-       ixp4xx_sys_init();
-@@ -196,6 +226,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2")
-       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
-       .boot_params    = 0x00000100,
-+      .fixup          = nslu2_fixup,
-       .map_io         = ixp4xx_map_io,
-       .init_irq       = ixp4xx_init_irq,
-       .timer          = &nslu2_timer,