[ixp4xx] refresh kernel patches
[openwrt.git] / target / linux / ixp4xx / patches / 186-nas100d_rtc_fixup.patch
1 Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
2 ===================================================================
3 --- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
4 +++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
5 @@ -18,6 +18,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 @@ -227,11 +228,42 @@ static void __init nas100d_init(void)
14 register_mtd_user(&nas100d_flash_notifier);
15 }
16
17 +static char nas100d_rtc_probe[] __initdata = "rtc-pcf8563.probe=0,0x51 ";
18 +
19 +static void __init nas100d_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 =
35 + (sizeof (struct tag_header) +
36 + strlen(nas100d_rtc_probe) + strlen(p) + 1 + 4) >> 2;
37 + strlcpy(t->u.cmdline.cmdline, nas100d_rtc_probe, COMMAND_LINE_SIZE);
38 + strlcpy(t->u.cmdline.cmdline + strlen(nas100d_rtc_probe), p,
39 + COMMAND_LINE_SIZE - strlen(nas100d_rtc_probe));
40 +
41 + /* Terminate the table. */
42 + t = tag_next(t);
43 + t->hdr.tag = ATAG_NONE;
44 + t->hdr.size = 0;
45 +}
46 +
47 MACHINE_START(NAS100D, "Iomega NAS 100d")
48 /* Maintainer: www.nslu2-linux.org */
49 .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
50 .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
51 .boot_params = 0x00000100,
52 + .fixup = nas100d_fixup,
53 .map_io = ixp4xx_map_io,
54 .init_irq = ixp4xx_init_irq,
55 .timer = &ixp4xx_timer,
This page took 0.045625 seconds and 5 git commands to generate.