Merge branch 'origin' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-w90x900 / cpu.h

diff --git a/arch/arm/mach-w90x900/cpu.h b/arch/arm/mach-w90x900/cpu.h
index 40ff40845df0d67dd68c5800764713b5d8133e70..de29ddcb9459ba03f1d805f7c32f8a67ee0db078 100644 (file)
--- a/arch/arm/mach-w90x900/cpu.h
+++ b/arch/arm/mach-w90x900/cpu.h
@@ -43,35 +43,16 @@ extern void w90p910_init_io(struct map_desc *mach_desc, int size);
 extern void w90p910_init_uarts(struct w90x900_uartcfg *cfg, int no);
 extern void w90p910_init_clocks(int xtal);
 extern void w90p910_map_io(struct map_desc *mach_desc, int size);
+extern struct platform_device w90p910_serial_device;
 extern struct sys_timer w90x900_timer;
 
-#define W90X900_RES(name)                              \
-struct resource w90x900_##name##_resource[] = {                \
-       [0] = {                                         \
-               .start = name##_PA,                     \
-               .end   = name##_PA + 0x0ff,             \
-               .flags = IORESOURCE_MEM,                \
-       },                                              \
-       [1] = {                                         \
-               .start = IRQ_##name,                    \
-               .end   = IRQ_##name,                    \
-               .flags = IORESOURCE_IRQ,                \
-       }                                               \
-}
-
-#define W90X900_DEVICE(devname, regname, devid, platdevname)           \
-struct platform_device w90x900_##devname = {                           \
-       .name           = platdevname,                                  \
-       .id             = devid,                                        \
-       .num_resources  = ARRAY_SIZE(w90x900_##regname##_resource),     \
-       .resource       = w90x900_##regname##_resource,                 \
-}
-
-#define W90X900_UARTCFG(port, flag, uc, ulc, ufc)      \
-{                                                      \
-               .hwport = port,                         \
-               .flags  = flag,                         \
-               .ucon   = uc,                           \
-               .ulcon  = ulc,                          \
-               .ufcon  = ufc,                          \
+#define W90X900_8250PORT(name)                                 \
+{                                                              \
+       .membase        = name##_BA,                            \
+       .mapbase        = name##_PA,                            \
+       .irq            = IRQ_##name,                           \
+       .uartclk        = 11313600,                             \
+       .regshift       = 2,                                    \
+       .iotype         = UPIO_MEM,                             \
+       .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,    \
 }