diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-28 21:00:01 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-28 21:00:01 +0000 |
| commit | 58f98ac38244ed93bb01dcf377937f1aec45202b (patch) | |
| tree | 35b9cc8a3d433d2c1bb70fe82b947f404becf8c2 /target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch | |
| parent | ff57652cf6b0f7a2f7e6f99a3293fbac1d0b6c5d (diff) | |
* upgrade ixp4xx to 2.6.23.12
* upgrade to the new ethernet driver (temporary breaks Marvell switch support on Compex units)
* handle NPE microcodes in a user friendly way - YAY for Intel for changing the license
* add support for the Lanready AP1000 (used in for example the Ligowave LGO2AGN)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10016 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch new file mode 100644 index 000000000..3d1350115 --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch @@ -0,0 +1,56 @@ +Index: linux-2.6.22-rc4-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +=================================================================== +--- linux-2.6.22-rc4-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.22-rc4-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +@@ -16,6 +16,7 @@ + #include <linux/serial_8250.h> + #include <linux/i2c-gpio.h> + ++#include <asm/setup.h> + #include <asm/mach-types.h> + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> +@@ -145,6 +146,35 @@ static struct sys_timer dsmg600_timer = + .init = dsmg600_timer_init, + }; + ++static char dsmg600_rtc_probe[] __initdata = "rtc-pcf8563.probe=0,0x51 "; ++ ++static void __init dsmg600_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(dsmg600_rtc_probe) + strlen(p) + 1 + 4) >> 2; ++ strlcpy(t->u.cmdline.cmdline, dsmg600_rtc_probe, COMMAND_LINE_SIZE); ++ strlcpy(t->u.cmdline.cmdline + strlen(dsmg600_rtc_probe), p, ++ COMMAND_LINE_SIZE - strlen(dsmg600_rtc_probe)); ++ ++ /* Terminate the table. */ ++ t = tag_next(t); ++ t->hdr.tag = ATAG_NONE; ++ t->hdr.size = 0; ++} ++ + static void __init dsmg600_init(void) + { + ixp4xx_sys_init(); +@@ -177,6 +207,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 + .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, + .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, + .boot_params = 0x00000100, ++ .fixup = dsmg600_fixup, + .map_io = ixp4xx_map_io, + .init_irq = ixp4xx_init_irq, + .timer = &dsmg600_timer, |