Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / arm / mach-footbridge / cats-hw.c

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index 0aec69f..5b64d5c 100644 (file)
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -8,9 +8,16 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/tty.h>
 
+#include <asm/hardware/dec21285.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <asm/setup.h>
+
+#include <asm/mach/arch.h>
+
+#include "common.h"
 
 #define CFG_PORT       0x370
 #define INDEX_PORT     (CFG_PORT)
@@ -62,3 +69,28 @@ static int __init cats_hw_init(void)
 }
 
 __initcall(cats_hw_init);
+
+/*
+ * CATS uses soft-reboot by default, since
+ * hard reboots fail on early boards.
+ */
+static void __init
+fixup_cats(struct machine_desc *desc, struct tag *tags,
+          char **cmdline, struct meminfo *mi)
+{
+       ORIG_VIDEO_LINES  = 25;
+       ORIG_VIDEO_POINTS = 16;
+       ORIG_Y = 24;
+}
+
+MACHINE_START(CATS, "Chalice-CATS")
+       /* Maintainer: Philip Blundell */
+       .phys_io        = DC21285_ARMCSR_BASE,
+       .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .soft_reboot    = 1,
+       .fixup          = fixup_cats,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
+       .timer          = &isa_timer,
+MACHINE_END