vserver 1.9.5.x5

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

diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 397c546..e834c00 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/mach-h1940.c
  *
- * Copyright (c) 2003,2004 Simtec Electronics
+ * Copyright (c) 2003-2005 Simtec Electronics
  *   Ben Dooks <ben@simtec.co.uk>
  *
  * http://www.handhelds.org/projects/h1940.html
@@ -18,6 +18,11 @@
  *     17-Feb-2003 BJD  Copied to mach-ipaq.c
  *     21-Aug-2004 BJD  Added struct s3c2410_board
  *     04-Sep-2004 BJD  Changed uart init, renamed ipaq_ -> h1940_
+ *     18-Oct-2004 BJD  Updated new board structure name
+ *     04-Nov-2004 BJD  Change for new serial clock
+ *     04-Jan-2005 BJD  Updated uart init call
+ *     10-Jan-2005 BJD  Removed include of s3c2410.h
+ *     14-Jan-2005 BJD  Added clock init
 */
 
 #include <linux/kernel.h>
@@ -40,7 +45,9 @@
 //#include <asm/debug-ll.h>
 #include <asm/arch/regs-serial.h>
 
-#include "s3c2410.h"
+#include <linux/serial_core.h>
+
+#include "clock.h"
 #include "devs.h"
 #include "cpu.h"
 
@@ -56,7 +63,6 @@ static struct s3c2410_uartcfg h1940_uartcfgs[] = {
        [0] = {
                .hwport      = 0,
                .flags       = 0,
-               .clock       = &s3c2410_pclk,
                .ucon        = 0x3c5,
                .ulcon       = 0x03,
                .ufcon       = 0x51,
@@ -64,7 +70,6 @@ static struct s3c2410_uartcfg h1940_uartcfgs[] = {
        [1] = {
                .hwport      = 1,
                .flags       = 0,
-               .clock       = &s3c2410_pclk,
                .ucon        = 0x245,
                .ulcon       = 0x03,
                .ufcon       = 0x00,
@@ -73,7 +78,7 @@ static struct s3c2410_uartcfg h1940_uartcfgs[] = {
        [2] = {
                .hwport      = 2,
                .flags       = 0,
-               .clock       = &s3c2410_pclk,
+               .uart_flags  = UPF_CONS_FLOW,
                .ucon        = 0x3c5,
                .ulcon       = 0x43,
                .ufcon       = 0x51,
@@ -91,7 +96,7 @@ static struct platform_device *h1940_devices[] __initdata = {
        &s3c_device_iis,
 };
 
-static struct s3c2410_board h1940_board __initdata = {
+static struct s3c24xx_board h1940_board __initdata = {
        .devices       = h1940_devices,
        .devices_count = ARRAY_SIZE(h1940_devices)
 };
@@ -99,19 +104,15 @@ static struct s3c2410_board h1940_board __initdata = {
 void __init h1940_map_io(void)
 {
        s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc));
-       s3c2410_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs));
-       s3c2410_set_board(&h1940_board);
+       s3c24xx_init_clocks(0);
+       s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs));
+       s3c24xx_set_board(&h1940_board);
 }
 
 void __init h1940_init_irq(void)
 {
-       s3c2410_init_irq();
-
-}
+       s3c24xx_init_irq();
 
-void __init h1940_init_time(void)
-{
-       s3c2410_init_time();
 }
 
 MACHINE_START(H1940, "IPAQ-H1940")
@@ -120,5 +121,5 @@ MACHINE_START(H1940, "IPAQ-H1940")
      BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
      MAPIO(h1940_map_io)
      INITIRQ(h1940_init_irq)
-     INITTIME(h1940_init_time)
+       .timer          = &s3c24xx_timer,
 MACHINE_END