1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-26 14:22:03 +02:00
openwrt-xburst/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch
juhosg 0fc3447849 [ixp4xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11204 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-05-19 10:58:03 +00:00

57 lines
1.9 KiB
Diff

Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c
===================================================================
--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -18,6 +18,7 @@
#include <linux/leds.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>
@@ -163,6 +164,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)
{
uint8_t __iomem *f;
@@ -221,6 +251,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,