patches/2.6.20/85-nslu2-rtc-fixup.patch

   1 Index: linux-2.6.20-rc5-git2/arch/arm/mach-ixp4xx/nslu2-setup.c
   2 ===================================================================
   3 --- linux-2.6.20-rc5-git2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c       2007-01-23 03:04:37.000000000 -0800
   4 +++ linux-2.6.20-rc5-git2/arch/arm/mach-ixp4xx/nslu2-setup.c    2007-01-23 03:04:50.000000000 -0800
   5 @@ -20,6 +20,7 @@
   6  #include <linux/leds.h>
   7  #include <linux/mtd/mtd.h>
   8
   9 +#include <asm/setup.h>
  10  #include <asm/mach-types.h>
  11  #include <asm/mach/arch.h>
  12  #include <asm/mach/flash.h>
  13 @@ -240,11 +241,41 @@
  14         register_mtd_user(&nslu2_flash_notifier);
  15  }
  16
  17 +static char nslu2_rtc_probe[] __initdata = "rtc-x1205.probe=0,0x6f ";
  18 +
  19 +static void __init nslu2_fixup(struct machine_desc *desc,
  20 +               struct tag *tags, char **cmdline, struct meminfo *mi)
  21 +{
  22 +       struct tag *t = tags;
  23 +       char *p = *cmdline;
  24 +
  25 +       /* Find the end of the tags table, taking note of any cmdline tag. */
  26 +       for (; t->hdr.size; t = tag_next(t)) {
  27 +               if (t->hdr.tag == ATAG_CMDLINE) {
  28 +                       p = t->u.cmdline.cmdline;
  29 +               }
  30 +       }
  31 +
  32 +       /* Overwrite the end of the table with a new cmdline tag. */
  33 +       t->hdr.tag = ATAG_CMDLINE;
  34 +       t->hdr.size = (sizeof (struct tag_header) +
  35 +                      strlen(nslu2_rtc_probe) + strlen(p) + 1 + 4) >> 2;
  36 +       strlcpy(t->u.cmdline.cmdline, nslu2_rtc_probe, COMMAND_LINE_SIZE);
  37 +       strlcpy(t->u.cmdline.cmdline + strlen(nslu2_rtc_probe), p,
  38 +               COMMAND_LINE_SIZE - strlen(nslu2_rtc_probe));
  39 +
  40 +       /* Terminate the table. */
  41 +       t = tag_next(t);
  42 +       t->hdr.tag = ATAG_NONE;
  43 +       t->hdr.size = 0;
  44 +}
  45 +
  46  MACHINE_START(NSLU2, "Linksys NSLU2")
  47         /* Maintainer: www.nslu2-linux.org */
  48         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
  49         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
  50         .boot_params    = 0x00000100,
  51 +       .fixup          = nslu2_fixup,
  52         .map_io         = ixp4xx_map_io,
  53         .init_irq       = ixp4xx_init_irq,
  54         .timer          = &ixp4xx_timer,