ARM: OMAP: Correct use of CONTROL_ regs for OMAP2

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / devices.c

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 3e84a03a0dc4d4b4e5cabd4fbbd115c0025aff21..c2828fe3dd7040e88999b909190ecf146b518ee0 100644 (file)
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -74,7 +74,7 @@ int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
 {
        static DEFINE_MUTEX(dsp_pdata_lock);
 
-       mutex_init(&kdev->lock);
+       spin_lock_init(&kdev->lock);
 
        mutex_lock(&dsp_pdata_lock);
        list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
@@ -89,6 +89,7 @@ static inline void omap_init_dsp(void) { }
 #endif /* CONFIG_OMAP_DSP */
 
 /*-------------------------------------------------------------------------*/
+#if    !defined(CONFIG_ARCH_OMAP243X)
 #if    defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define        OMAP1_I2C_BASE          0xfffb3800
@@ -97,6 +98,8 @@ static inline void omap_init_dsp(void) { }
 #define OMAP1_I2C_INT          INT_I2C
 #define OMAP2_I2C_INT1         56
 
+static u32 omap2_i2c1_clkrate  = 100;
+
 static struct resource i2c_resources1[] = {
        {
                .start          = 0,
@@ -112,16 +115,19 @@ static struct resource i2c_resources1[] = {
 /* DMA not used; works around erratum writing to non-empty i2c fifo */
 
 static struct platform_device omap_i2c_device1 = {
-        .name           = "i2c_omap",
-        .id             = 1,
+       .name           = "i2c_omap",
+       .id             = 1,
        .num_resources  = ARRAY_SIZE(i2c_resources1),
        .resource       = i2c_resources1,
+       .dev            = {
+               .platform_data  = &omap2_i2c1_clkrate,
+       },
 };
 
 /* See also arch/arm/mach-omap2/devices.c for second I2C on 24xx */
 static void omap_init_i2c(void)
 {
-       if (cpu_is_omap24xx()) {
+       if (cpu_is_omap242x()) {
                i2c_resources1[0].start = OMAP2_I2C_BASE1;
                i2c_resources1[0].end = OMAP2_I2C_BASE1 + OMAP_I2C_SIZE;
                i2c_resources1[1].start = OMAP2_I2C_INT1;
@@ -135,7 +141,7 @@ static void omap_init_i2c(void)
         * either don't wire up I2C, or chips that mux it differently...
         * it can include clocking and address info, maybe more.
         */
-       if (cpu_is_omap24xx()) {
+       if (cpu_class_is_omap2()) {
                if (machine_is_omap_h4()) {
                        omap_cfg_reg(M19_24XX_I2C1_SCL);
                        omap_cfg_reg(L15_24XX_I2C1_SDA);
@@ -151,12 +157,16 @@ static void omap_init_i2c(void)
 #else
 static inline void omap_init_i2c(void) {}
 #endif
-
+#endif
 /*-------------------------------------------------------------------------*/
 #if    defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
 
 static void omap_init_kp(void)
 {
+       /* REVISIT: 2430 keypad is on TWL4030 */
+       if (cpu_is_omap2430() || cpu_is_omap34xx())
+               return;
+
        if (machine_is_omap_h2() || machine_is_omap_h3()) {
                omap_cfg_reg(F18_1610_KBC0);
                omap_cfg_reg(D20_1610_KBC1);
@@ -254,6 +264,7 @@ static struct omap_mmc_conf mmc2_conf;
 
 static u64 mmc2_dmamask = 0xffffffff;
 
+
 static struct resource mmc2_resources[] = {
        {
                .start          = OMAP_MMC2_BASE,
@@ -283,6 +294,10 @@ static void __init omap_init_mmc(void)
        const struct omap_mmc_config    *mmc_conf;
        const struct omap_mmc_conf      *mmc;
 
+       /* REVISIT: 2430 has HS MMC */
+       if (cpu_is_omap2430() || cpu_is_omap34xx())
+               return;
+
        /* NOTE:  assumes MMC was never (wrongly) enabled */
        mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
        if (!mmc_conf)
@@ -324,6 +339,17 @@ static void __init omap_init_mmc(void)
                                omap_cfg_reg(MMC_DAT3);
                        }
                }
+               if (mmc->internal_clock) {
+                       /*
+                        * Use internal loop-back in MMC/SDIO
+                        * Module Input Clock selection
+                        */
+                       if (cpu_is_omap24xx()) {
+                               u32 v = omap_readl(OMAP2_CONTROL_DEVCONF);
+                               v |= (1 << 24);
+                               omap_writel(v, OMAP2_CONTROL_DEVCONF);
+                       }
+               }
                mmc1_conf = *mmc;
                (void) platform_device_register(&mmc_omap_device1);
        }
@@ -412,7 +438,14 @@ static inline void omap_init_uwire(void) {}
 #if    defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
 
 #ifdef CONFIG_ARCH_OMAP24XX
+
+#ifdef CONFIG_ARCH_OMAP2430
+/* WDT2 */
+#define        OMAP_WDT_BASE           0x49016000
+#else
 #define        OMAP_WDT_BASE           0x48022000
+#endif
+
 #else
 #define        OMAP_WDT_BASE           0xfffeb000
 #endif
@@ -495,10 +528,6 @@ static inline void omap_init_rng(void) {}
  */
 static int __init omap_init_devices(void)
 {
-/*
- * Need to enable relevant once for 2430 SDP
- */
-#ifndef CONFIG_MACH_OMAP_2430SDP
        /* please keep these calls, and their implementations above,
         * in alphabetical order so they're easier to sort through.
         */
@@ -508,8 +537,9 @@ static int __init omap_init_devices(void)
        omap_init_uwire();
        omap_init_wdt();
        omap_init_rng();
-#endif
-       omap_init_i2c();
+       if (!cpu_is_omap2430() && !cpu_is_omap34xx()) {
+               omap_init_i2c();
+       }
        return 0;
 }
 arch_initcall(omap_init_devices);