1 Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
2 ===================================================================
3 --- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
4 +++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
6 #include <linux/serial.h>
7 #include <linux/serial_8250.h>
9 +#include <asm/setup.h>
10 #include <asm/mach-types.h>
11 #include <asm/mach/arch.h>
12 #include <asm/mach/flash.h>
13 @@ -142,6 +143,36 @@ static struct sys_timer dsmg600_timer =
14 .init = dsmg600_timer_init,
17 +static char dsmg600_rtc_probe[] __initdata = "rtc-pcf8563.probe=0,0x51 ";
19 +static void __init dsmg600_fixup(struct machine_desc *desc,
20 + struct tag *tags, char **cmdline, struct meminfo *mi)
22 + struct tag *t = tags;
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;
32 + /* Overwrite the end of the table with a new cmdline tag. */
33 + t->hdr.tag = ATAG_CMDLINE;
35 + (sizeof (struct tag_header) +
36 + strlen(dsmg600_rtc_probe) + strlen(p) + 1 + 4) >> 2;
37 + strlcpy(t->u.cmdline.cmdline, dsmg600_rtc_probe, COMMAND_LINE_SIZE);
38 + strlcpy(t->u.cmdline.cmdline + strlen(dsmg600_rtc_probe), p,
39 + COMMAND_LINE_SIZE - strlen(dsmg600_rtc_probe));
41 + /* Terminate the table. */
43 + t->hdr.tag = ATAG_NONE;
47 static void __init dsmg600_init(void)
50 @@ -174,6 +205,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600
51 .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
52 .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
53 .boot_params = 0x00000100,
54 + .fixup = dsmg600_fixup,
55 .map_io = ixp4xx_map_io,
56 .init_irq = ixp4xx_init_irq,
57 .timer = &dsmg600_timer,