This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / arch / arm / mach-s3c2410 / s3c2440.c
index 7e50eb9..f4bb10c 100644 (file)
  * published by the Free Software Foundation.
  *
  * Modifications:
- *     24-Aug-2004 BJD  Start of s3c2440 support
- *     12-Oct-2004 BJD  Moved clock info out to clock.c
- *     01-Nov-2004 BJD  Fixed clock build code
- *     09-Nov-2004 BJD  Added sysdev for power management
- *     04-Nov-2004 BJD  New serial registration
- *     15-Nov-2004 BJD  Rename the i2c device for the s3c2440
+ *     24-Aug-2004 BJD  Start of s3c2440 support
 */
 
 #include <linux/kernel.h>
@@ -25,7 +20,6 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware/clock.h>
 
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
 
 #include "s3c2440.h"
-#include "clock.h"
-#include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 int s3c2440_clock_tick_rate = 12*1000*1000;  /* current timers at 12MHz */
 
 /* clock info */
+
+unsigned long s3c2440_baseclk = 12*1000*1000;  /* assume base is 12MHz */
 unsigned long s3c2440_hdiv;
 
+unsigned long s3c2440_fclk;
+unsigned long s3c2440_hclk;
+unsigned long s3c2440_pclk;
+
 static struct map_desc s3c2440_iodesc[] __initdata = {
        IODESC_ENT(USBHOST),
        IODESC_ENT(CLKPWR),
@@ -131,79 +124,9 @@ static struct platform_device *uart_devices[] __initdata = {
        &s3c_uart2
 };
 
-/* uart initialisation */
-
-static int __initdata s3c2440_uart_count;
-
-void __init s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-       struct platform_device *platdev;
-       int uart;
-
-       for (uart = 0; uart < no; uart++, cfg++) {
-               platdev = uart_devices[cfg->hwport];
-
-               s3c24xx_uart_devs[uart] = platdev;
-               platdev->dev.platform_data = cfg;
-       }
-
-       s3c2440_uart_count = uart;
-}
-
-/* s3c2440 specific clock sources */
-
-static struct clk s3c2440_clk_cam = {
-       .name           = "camera",
-       .enable         = s3c2410_clkcon_enable,
-       .ctrlbit        = S3C2440_CLKCON_CAMERA
-};
-
-static struct clk s3c2440_clk_ac97 = {
-       .name           = "ac97",
-       .enable         = s3c2410_clkcon_enable,
-       .ctrlbit        = S3C2440_CLKCON_CAMERA
-};
-
-#ifdef CONFIG_PM
-
-struct sleep_save s3c2440_sleep[] = {
-       SAVE_ITEM(S3C2440_DSC0),
-       SAVE_ITEM(S3C2440_DSC1),
-       SAVE_ITEM(S3C2440_GPJDAT),
-       SAVE_ITEM(S3C2440_GPJCON),
-       SAVE_ITEM(S3C2440_GPJUP)
-};
-
-static int s3c2440_suspend(struct sys_device *dev, u32 state)
-{
-       s3c2410_pm_do_save(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep));
-       return 0;
-}
-
-static int s3c2440_resume(struct sys_device *dev)
-{
-       s3c2410_pm_do_restore(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep));
-       return 0;
-}
-
-#else
-#define s3c2440_suspend NULL
-#define s3c2440_resume  NULL
-#endif
-
-static struct sysdev_class s3c2440_sysclass = {
-       set_kset_name("s3c2440-core"),
-       .suspend        = s3c2440_suspend,
-       .resume         = s3c2440_resume
-};
-
-static struct sys_device s3c2440_sysdev = {
-       .cls            = &s3c2440_sysclass,
-};
-
 void __init s3c2440_map_io(struct map_desc *mach_desc, int size)
 {
-       unsigned long clkdiv;
+       unsigned long tmp;
        unsigned long camdiv;
 
        /* register our io-tables */
@@ -214,15 +137,15 @@ void __init s3c2440_map_io(struct map_desc *mach_desc, int size)
        /* now we've got our machine bits initialised, work out what
         * clocks we've got */
 
-       s3c24xx_fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON),
-                                      s3c24xx_xtal) * 2;
+       s3c2440_fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON),
+                                      s3c2440_baseclk);
 
-       clkdiv = __raw_readl(S3C2410_CLKDIVN);
+       tmp = __raw_readl(S3C2410_CLKDIVN);
        camdiv = __raw_readl(S3C2440_CAMDIVN);
 
        /* work out clock scalings */
 
-       switch (clkdiv & S3C2440_CLKDIVN_HDIVN_MASK) {
+       switch (tmp & S3C2440_CLKDIVN_HDIVN_MASK) {
        case S3C2440_CLKDIVN_HDIVN_1:
                s3c2440_hdiv = 1;
                break;
@@ -236,40 +159,21 @@ void __init s3c2440_map_io(struct map_desc *mach_desc, int size)
                break;
 
        case S3C2440_CLKDIVN_HDIVN_3_6:
-               s3c2440_hdiv = (camdiv & S3C2440_CAMDIVN_HCLK3_HALF) ? 6 : 3;
+               s3c2440_hdiv = (camdiv & S3C2440_CAMDIVN_HCLK4_HALF) ? 6 : 3;
                break;
        }
 
-       s3c24xx_hclk = s3c24xx_fclk / s3c2440_hdiv;
-       s3c24xx_pclk = s3c24xx_hclk / ((clkdiv & S3C2440_CLKDIVN_PDIVN)? 2:1);
+       s3c2440_hclk = s3c2440_fclk / s3c2440_hdiv;
+       s3c2440_pclk = s3c2440_hclk / ((tmp & S3C2440_CLKDIVN_PDIVN) ? 2 : 1);
 
        /* print brieft summary of clocks, etc */
 
        printk("S3C2440: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",
-              print_mhz(s3c24xx_fclk), print_mhz(s3c24xx_hclk),
-              print_mhz(s3c24xx_pclk));
-
-       /* initialise the clocks here, to allow other things like the
-        * console to use them, and to add new ones after the initialisation
-        */
-
-       s3c2410_init_clocks();
-
-       /* add s3c2440 specific clocks */
-
-       s3c2440_clk_cam.parent = clk_get(NULL, "hclk");
-       s3c2440_clk_ac97.parent = clk_get(NULL, "pclk");
-
-       s3c2410_register_clock(&s3c2440_clk_ac97);
-       s3c2410_register_clock(&s3c2440_clk_cam);
-
-       clk_disable(&s3c2440_clk_ac97);
-       clk_disable(&s3c2440_clk_cam);
+              print_mhz(s3c2440_fclk), print_mhz(s3c2440_hclk),
+              print_mhz(s3c2440_pclk));
+}
 
-       /* rename any peripherals used differing from the s3c2410 */
 
-       s3c_device_i2c.name = "s3c2440-i2c";
-}
 
 int __init s3c2440_init(void)
 {
@@ -277,15 +181,12 @@ int __init s3c2440_init(void)
 
        printk("S3C2440: Initialising architecture\n");
 
-       ret = sysdev_class_register(&s3c2440_sysclass);
-       if (ret == 0)
-               ret = sysdev_register(&s3c2440_sysdev);
+       ret = platform_add_devices(uart_devices, ARRAY_SIZE(uart_devices));
+       if (ret)
+               return ret;
 
-       if (ret != 0)
-               printk(KERN_ERR "failed to register sysdev for s3c2440\n");
-
-       if (ret == 0)
-               ret = platform_add_devices(s3c24xx_uart_devs, s3c2440_uart_count);
+       // todo: board specific inits?
 
        return ret;
 }
+