56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c
|
|
--- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-10-09 15:31:38.000000000 -0500
|
|
+++ linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-10-11 01:06:33.000000000 -0500
|
|
@@ -17,6 +17,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>
|
|
@@ -142,6 +143,35 @@ static void nas100d_power_off(void)
|
|
gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH);
|
|
}
|
|
|
|
+static char nas100d_rtc_probe[] __initdata = "rtc-pcf8563.probe=0,0x51 ";
|
|
+
|
|
+static void __init nas100d_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(nas100d_rtc_probe) + strlen(p) + 1 + 4) >> 2;
|
|
+ strlcpy(t->u.cmdline.cmdline, nas100d_rtc_probe, COMMAND_LINE_SIZE);
|
|
+ strlcpy(t->u.cmdline.cmdline + strlen(nas100d_rtc_probe), p,
|
|
+ COMMAND_LINE_SIZE - strlen(nas100d_rtc_probe));
|
|
+
|
|
+ /* Terminate the table. */
|
|
+ t = tag_next(t);
|
|
+ t->hdr.tag = ATAG_NONE;
|
|
+ t->hdr.size = 0;
|
|
+}
|
|
+
|
|
static void __init nas100d_init(void)
|
|
{
|
|
ixp4xx_sys_init();
|
|
@@ -170,6 +200,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d"
|
|
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
|
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
|
|
.boot_params = 0x00000100,
|
|
+ .fixup = nas100d_fixup,
|
|
.map_io = ixp4xx_map_io,
|
|
.init_irq = ixp4xx_init_irq,
|
|
.timer = &ixp4xx_timer,
|