ARM: OMAP: Move SleepX signal masking code to board-nokia770.c

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / pm.c

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index e4d9bed8ed5b84a8544716a5c80da3383fd741b1..ddf6b07dc9c78bbeb7480b28167621f903b210be 100644 (file)
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -165,7 +165,7 @@ void omap_pm_idle(void)
        if ((use_idlect1 != ~0) || !do_sleep) {
 
                __u32 saved_idlect1 = omap_readl(ARM_IDLECT1);
-               if (cpu_is_omap1510())
+               if (cpu_is_omap15xx())
                        use_idlect1 &= OMAP1510_BIG_SLEEP_REQUEST;
                else
                        use_idlect1 &= OMAP1610_IDLECT1_SLEEP_VAL;
@@ -204,7 +204,7 @@ static void omap_pm_wakeup_setup(void)
        if (cpu_is_omap730())
                level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) |
                        OMAP_IRQ_BIT(INT_730_IH2_IRQ);
-       else if (cpu_is_omap1510())
+       else if (cpu_is_omap15xx())
                level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
                        OMAP_IRQ_BIT(INT_1510_IH2_IRQ);
        else if (cpu_is_omap16xx())
@@ -218,7 +218,7 @@ static void omap_pm_wakeup_setup(void)
                omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |
                                OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)),
                                OMAP_IH2_1_MIR);
-       } else if (cpu_is_omap1510()) {
+       } else if (cpu_is_omap15xx()) {
                level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
                omap_writel(~level2_wake,  OMAP_IH2_MIR);
        } else if (cpu_is_omap16xx()) {
@@ -234,7 +234,7 @@ static void omap_pm_wakeup_setup(void)
 
        /*  New IRQ agreement, recalculate in cascade order */
        omap_writel(1, OMAP_IH2_CONTROL);
-       omap_writel(1, OMAP_IH1_CONTROL);
+       omap_writel(1, OMAP_IH1_CONTROL);
 }
 
 #define EN_DSPCK       13      /* ARM_CKCTL */
@@ -271,7 +271,7 @@ void omap_pm_suspend(void)
         * We have to save and restore very little register state to
         * idle the omap.
          *
-        * Save interrupt, MPUI, ARM and UPLD control registers.
+        * Save interrupt, MPUI, ARM and UPLD control registers.
         */
 
        if (cpu_is_omap730()) {
@@ -284,7 +284,7 @@ void omap_pm_suspend(void)
                MPUI730_SAVE(EMIFS_CONFIG);
                MPUI730_SAVE(EMIFF_SDRAM_CONFIG);
 
-       } else if (cpu_is_omap1510()) {
+       } else if (cpu_is_omap15xx()) {
                MPUI1510_SAVE(OMAP_IH1_MIR);
                MPUI1510_SAVE(OMAP_IH2_MIR);
                MPUI1510_SAVE(MPUI_CTRL);
@@ -308,7 +308,7 @@ void omap_pm_suspend(void)
        ARM_SAVE(ARM_CKCTL);
        ARM_SAVE(ARM_IDLECT1);
        ARM_SAVE(ARM_IDLECT2);
-       if (!(cpu_is_omap1510()))
+       if (!(cpu_is_omap15xx()))
                ARM_SAVE(ARM_IDLECT3);
        ARM_SAVE(ARM_EWUPCT);
        ARM_SAVE(ARM_RSTCT1);
@@ -371,7 +371,7 @@ void omap_pm_suspend(void)
         * Step 6c: ARM and Traffic controller shutdown
         *
         * Jump to assembly code. The processor will stay there
-        * until wake up.
+        * until wake up.
         */
         omap_sram_suspend(arg0, arg1);
 
@@ -393,7 +393,7 @@ void omap_pm_suspend(void)
         * Restore ARM state, except ARM_IDLECT1/2 which omap_cpu_suspend did
         */
 
-       if (!(cpu_is_omap1510()))
+       if (!(cpu_is_omap15xx()))
                ARM_RESTORE(ARM_IDLECT3);
        ARM_RESTORE(ARM_CKCTL);
        ARM_RESTORE(ARM_EWUPCT);
@@ -409,7 +409,7 @@ void omap_pm_suspend(void)
                MPUI730_RESTORE(OMAP_IH1_MIR);
                MPUI730_RESTORE(OMAP_IH2_0_MIR);
                MPUI730_RESTORE(OMAP_IH2_1_MIR);
-       } else if (cpu_is_omap1510()) {
+       } else if (cpu_is_omap15xx()) {
                MPUI1510_RESTORE(MPUI_CTRL);
                MPUI1510_RESTORE(MPUI_DSP_BOOT_CONFIG);
                MPUI1510_RESTORE(MPUI_DSP_API_CONFIG);
@@ -470,7 +470,7 @@ static int omap_pm_read_proc(
        ARM_SAVE(ARM_CKCTL);
        ARM_SAVE(ARM_IDLECT1);
        ARM_SAVE(ARM_IDLECT2);
-       if (!(cpu_is_omap1510()))
+       if (!(cpu_is_omap15xx()))
                ARM_SAVE(ARM_IDLECT3);
        ARM_SAVE(ARM_EWUPCT);
        ARM_SAVE(ARM_RSTCT1);
@@ -491,7 +491,7 @@ static int omap_pm_read_proc(
                MPUI730_SAVE(MPUI_DSP_API_CONFIG);
                MPUI730_SAVE(EMIFF_SDRAM_CONFIG);
                MPUI730_SAVE(EMIFS_CONFIG);
-       } else if (cpu_is_omap1510()) {
+       } else if (cpu_is_omap15xx()) {
                MPUI1510_SAVE(MPUI_CTRL);
                MPUI1510_SAVE(MPUI_DSP_STATUS);
                MPUI1510_SAVE(MPUI_DSP_BOOT_CONFIG);
@@ -554,34 +554,34 @@ static int omap_pm_read_proc(
                           MPUI730_SHOW(MPUI_DSP_API_CONFIG),
                           MPUI730_SHOW(EMIFF_SDRAM_CONFIG),
                           MPUI730_SHOW(EMIFS_CONFIG));
-               } else if (cpu_is_omap1510()) {
+               } else if (cpu_is_omap15xx()) {
                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
                           "MPUI1510_CTRL_REG             0x%-8x \n"
                           "MPUI1510_DSP_STATUS_REG:      0x%-8x \n"
                           "MPUI1510_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
-                          "MPUI1510_DSP_API_CONFIG_REG:  0x%-8x \n"
-                          "MPUI1510_SDRAM_CONFIG_REG:    0x%-8x \n"
-                          "MPUI1510_EMIFS_CONFIG_REG:    0x%-8x \n",
-                          MPUI1510_SHOW(MPUI_CTRL),
-                          MPUI1510_SHOW(MPUI_DSP_STATUS),
-                          MPUI1510_SHOW(MPUI_DSP_BOOT_CONFIG),
-                          MPUI1510_SHOW(MPUI_DSP_API_CONFIG),
-                          MPUI1510_SHOW(EMIFF_SDRAM_CONFIG),
-                          MPUI1510_SHOW(EMIFS_CONFIG));
+                          "MPUI1510_DSP_API_CONFIG_REG:  0x%-8x \n"
+                          "MPUI1510_SDRAM_CONFIG_REG:    0x%-8x \n"
+                          "MPUI1510_EMIFS_CONFIG_REG:    0x%-8x \n",
+                          MPUI1510_SHOW(MPUI_CTRL),
+                          MPUI1510_SHOW(MPUI_DSP_STATUS),
+                          MPUI1510_SHOW(MPUI_DSP_BOOT_CONFIG),
+                          MPUI1510_SHOW(MPUI_DSP_API_CONFIG),
+                          MPUI1510_SHOW(EMIFF_SDRAM_CONFIG),
+                          MPUI1510_SHOW(EMIFS_CONFIG));
                } else if (cpu_is_omap16xx()) {
                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
                           "MPUI1610_CTRL_REG             0x%-8x \n"
                           "MPUI1610_DSP_STATUS_REG:      0x%-8x \n"
                           "MPUI1610_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
-                          "MPUI1610_DSP_API_CONFIG_REG:  0x%-8x \n"
-                          "MPUI1610_SDRAM_CONFIG_REG:    0x%-8x \n"
-                          "MPUI1610_EMIFS_CONFIG_REG:    0x%-8x \n",
-                          MPUI1610_SHOW(MPUI_CTRL),
-                          MPUI1610_SHOW(MPUI_DSP_STATUS),
-                          MPUI1610_SHOW(MPUI_DSP_BOOT_CONFIG),
-                          MPUI1610_SHOW(MPUI_DSP_API_CONFIG),
-                          MPUI1610_SHOW(EMIFF_SDRAM_CONFIG),
-                          MPUI1610_SHOW(EMIFS_CONFIG));
+                          "MPUI1610_DSP_API_CONFIG_REG:  0x%-8x \n"
+                          "MPUI1610_SDRAM_CONFIG_REG:    0x%-8x \n"
+                          "MPUI1610_EMIFS_CONFIG_REG:    0x%-8x \n",
+                          MPUI1610_SHOW(MPUI_CTRL),
+                          MPUI1610_SHOW(MPUI_DSP_STATUS),
+                          MPUI1610_SHOW(MPUI_DSP_BOOT_CONFIG),
+                          MPUI1610_SHOW(MPUI_DSP_API_CONFIG),
+                          MPUI1610_SHOW(EMIFF_SDRAM_CONFIG),
+                          MPUI1610_SHOW(EMIFS_CONFIG));
                }
 
                g_read_completed++;
@@ -694,10 +694,10 @@ static struct irqaction omap_wakeup_irq = {
 
 
 static struct pm_ops omap_pm_ops ={
-       .pm_disk_mode = 0,
-        .prepare        = omap_pm_prepare,
-        .enter          = omap_pm_enter,
-        .finish         = omap_pm_finish,
+       .pm_disk_mode   = 0,
+       .prepare        = omap_pm_prepare,
+       .enter          = omap_pm_enter,
+       .finish         = omap_pm_finish,
 };
 
 static int __init omap_pm_init(void)
@@ -714,7 +714,7 @@ static int __init omap_pm_init(void)
                                                omap730_idle_loop_suspend_sz);
                omap_sram_suspend = omap_sram_push(omap730_cpu_suspend,
                                                   omap730_cpu_suspend_sz);
-       } else if (cpu_is_omap1510()) {
+       } else if (cpu_is_omap15xx()) {
                omap_sram_idle = omap_sram_push(omap1510_idle_loop_suspend,
                                                omap1510_idle_loop_suspend_sz);
                omap_sram_suspend = omap_sram_push(omap1510_cpu_suspend,
@@ -738,15 +738,6 @@ static int __init omap_pm_init(void)
        else if (cpu_is_omap16xx())
                setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);
 
-#if 0
-       /* --- BEGIN BOARD-DEPENDENT CODE --- */
-       /* Sleepx mask direction */
-       omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
-       /* Unmask sleepx signal */
-       omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
-       /* --- END BOARD-DEPENDENT CODE --- */
-#endif
-
        /* Program new power ramp-up time
         * (0 for most boards since we don't lower voltage when in deep sleep)
         */