vserver 1.9.3

[linux-2.6.git] / arch / arm / mach-iop3xx / arch.c

diff --git a/arch/arm/mach-iop3xx/arch.c b/arch/arm/mach-iop3xx/arch.c
index 3df5e45..3aca667 100644 (file)
--- a/arch/arm/mach-iop3xx/arch.c
+++ b/arch/arm/mach-iop3xx/arch.c
@@ -21,56 +21,30 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#ifdef CONFIG_ARCH_IQ80310
-extern void iq80310_map_io(void);
-extern void iq80310_init_irq(void);
+#ifdef CONFIG_ARCH_IQ80331
+extern void iq80331_map_io(void);
+extern void iop331_init_irq(void);
+extern void iop331_init_time(void);
 #endif
 
-#ifdef CONFIG_ARCH_IQ80321
-extern void iq80321_map_io(void);
-extern void iop321_init_irq(void);
-extern void iop321_init_time(void);
-#endif
-
-#ifdef CONFIG_ARCH_IQ80310
-static void __init
-fixup_iq80310(struct machine_desc *desc, struct tag *tags,
-             char **cmdline, struct meminfo *mi)
-{
-       system_rev = (*(volatile unsigned int*)0xfe830000) & 0x0f;
-
-       if (system_rev)
-               system_rev = 0xF;
-}
-#endif
-
-#ifdef CONFIG_ARCH_IQ80321
+#ifdef CONFIG_ARCH_IQ80331
 static void __init
-fixup_iop321(struct machine_desc *desc, struct param_struct *params,
+fixup_iop331(struct machine_desc *desc, struct tag *tags,
              char **cmdline, struct meminfo *mi)
 {
 }
 #endif
 
-#ifdef CONFIG_ARCH_IQ80310
-MACHINE_START(IQ80310, "Cyclone IQ80310")
-       MAINTAINER("MontaVista Software Inc.")
-       BOOT_MEM(0xa0000000, 0xfe000000, 0xfe000000)
-       FIXUP(fixup_iq80310)
-       MAPIO(iq80310_map_io)
-       INITIRQ(iq80310_init_irq)
+#if defined(CONFIG_ARCH_IQ80331)
+MACHINE_START(IQ80331, "Intel IQ80331")
+       MAINTAINER("Intel Corp.")
+       BOOT_MEM(PHYS_OFFSET, 0xfff01000, 0xfffff000) // virtual, physical
+//     BOOT_MEM(PHYS_OFFSET, IQ80331_UART0_VIRT, IQ80331_UART0_PHYS)
+       MAPIO(iq80331_map_io)
+       INITIRQ(iop331_init_irq)
+       INITTIME(iop331_init_time)
+       BOOT_PARAMS(0x0100)
 MACHINE_END
-
-#elif defined(CONFIG_ARCH_IQ80321)
-MACHINE_START(IQ80321, "Intel IQ80321")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(PHYS_OFFSET, IQ80321_UART1, 0xfe800000)
-       FIXUP(fixup_iop321)
-       MAPIO(iq80321_map_io)
-       INITIRQ(iop321_init_irq)
-       INITTIME(iop321_init_time)
-MACHINE_END
-
 #else
-#error No machine descriptor defined for this IOP310 implementation
+#error No machine descriptor defined for this IOP3xx implementation
 #endif