vserver 2.0 rc7

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

diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c
index cd8d4ff..f8d3a97 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/arch/arm/mach-s3c2410/mach-rx3715.c
@@ -10,10 +10,12 @@
  * published by the Free Software Foundation.
  *
  * Modifications:
- *     16-Sep-2004 BJD Copied from mach-h1940.c
- *     25-Oct-2004 BJD Updates for 2.6.10-rc1
- *     10-Jan-2005 BJD Removed include of s3c2410.h s3c2440.h
- *     14-Jan-2005 BJD Added new clock init
+ *     16-Sep-2004 BJD  Copied from mach-h1940.c
+ *     25-Oct-2004 BJD  Updates for 2.6.10-rc1
+ *     10-Jan-2005 BJD  Removed include of s3c2410.h s3c2440.h
+ *     14-Jan-2005 BJD  Added new clock init
+ *     10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
+ *     14-Mar-2005 BJD  Fixed __iomem warnings
 */
 
 #include <linux/kernel.h>
@@ -48,8 +50,18 @@
 static struct map_desc rx3715_iodesc[] __initdata = {
        /* dump ISA space somewhere unused */
 
-       { S3C2410_VA_ISA_WORD, S3C2410_CS3, SZ_16M, MT_DEVICE },
-       { S3C2410_VA_ISA_BYTE, S3C2410_CS3, SZ_16M, MT_DEVICE },
+       { (u32)S3C24XX_VA_ISA_WORD, S3C2410_CS3, SZ_16M, MT_DEVICE },
+       { (u32)S3C24XX_VA_ISA_BYTE, S3C2410_CS3, SZ_16M, MT_DEVICE },
+};
+
+
+static struct s3c24xx_uart_clksrc rx3715_serial_clocks[] = {
+       [0] = {
+               .name           = "fclk",
+               .divisor        = 0,
+               .min_baud       = 0,
+               .max_baud       = 0,
+       }
 };
 
 static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
@@ -59,6 +71,8 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
                .ucon        = 0x3c5,
                .ulcon       = 0x03,
                .ufcon       = 0x51,
+               .clocks      = rx3715_serial_clocks,
+               .clocks_size = ARRAY_SIZE(rx3715_serial_clocks),
        },
        [1] = {
                .hwport      = 1,
@@ -66,6 +80,8 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
                .ucon        = 0x3c5,
                .ulcon       = 0x03,
                .ufcon       = 0x00,
+               .clocks      = rx3715_serial_clocks,
+               .clocks_size = ARRAY_SIZE(rx3715_serial_clocks),
        },
        /* IR port */
        [2] = {
@@ -74,6 +90,8 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
                .ucon        = 0x3c5,
                .ulcon       = 0x43,
                .ufcon       = 0x51,
+               .clocks      = rx3715_serial_clocks,
+               .clocks_size = ARRAY_SIZE(rx3715_serial_clocks),
        }
 };
 
@@ -114,7 +132,7 @@ static void __init rx3715_init_machine(void)
 
 MACHINE_START(RX3715, "IPAQ-RX3715")
      MAINTAINER("Ben Dooks <ben@fluff.org>")
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, S3C2410_VA_UART)
+     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
      BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
      MAPIO(rx3715_map_io)
      INITIRQ(rx3715_init_irq)