OMAP3: PM: UART: disable clocks when idle

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / pm34xx.c

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 457639f233aa9f2bf40c5c6844ff8cd959a1dac4..da112b8b08a1ff79cfe79977c382b0ac765f1ec7 100644 (file)
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -29,6 +29,7 @@
 #include <mach/pm.h>
 #include <mach/clockdomain.h>
 #include <mach/powerdomain.h>
+#include <mach/serial.h>
 
 #include "cm.h"
 #include "cm-regbits-34xx.h"
@@ -109,7 +110,7 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
                cm_write_mod_reg(fclk, OMAP3430_PER_MOD, CM_FCLKEN);
        }
 
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                /* USBHOST */
                wkst = prm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, PM_WKST);
                if (wkst) {
@@ -171,9 +172,15 @@ static void omap_sram_idle(void)
        disable_smartreflex(SR2);
 
        omap2_gpio_prepare_for_retention();
+       omap_uart_prepare_idle(0);
+       omap_uart_prepare_idle(1);
+       omap_uart_prepare_idle(2);
 
        _omap_sram_idle(NULL, save_state);
 
+       omap_uart_resume_idle(2);
+       omap_uart_resume_idle(1);
+       omap_uart_resume_idle(0);
        omap2_gpio_resume_after_retention();
 
        /* Enable smartreflex after WFI */
@@ -194,7 +201,7 @@ static int omap3_fclks_active(void)
 
        fck_core1 = cm_read_mod_reg(CORE_MOD,
                                    CM_FCLKEN1);
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                fck_core3 = cm_read_mod_reg(CORE_MOD,
                                            OMAP3430ES2_CM_FCLKEN3);
                fck_sgx = cm_read_mod_reg(OMAP3430ES2_SGX_MOD,
@@ -210,6 +217,11 @@ static int omap3_fclks_active(void)
                                  CM_FCLKEN);
        fck_per = cm_read_mod_reg(OMAP3430_PER_MOD,
                                  CM_FCLKEN);
+
+       /* Ignore UART clocks.  These are handled by UART core (serial.c) */
+       fck_core1 &= ~(OMAP3430_EN_UART1 | OMAP3430_EN_UART2);
+       fck_per &= ~OMAP3430_EN_UART3;
+
        if (fck_core1 | fck_core3 | fck_sgx | fck_dss |
            fck_cam | fck_per | fck_usbhost)
                return 1;
@@ -220,6 +232,8 @@ static int omap3_can_sleep(void)
 {
        if (!enable_dyn_sleep)
                return 0;
+       if (!omap_uart_can_sleep())
+               return 0;
        if (omap3_fclks_active())
                return 0;
        if (atomic_read(&sleep_block) > 0)
@@ -239,8 +253,13 @@ static int set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
        if (pwrdm == NULL || IS_ERR(pwrdm))
                return -EINVAL;
 
-       cur_state = pwrdm_read_next_pwrst(pwrdm);
+       while (!(pwrdm->pwrsts & (1 << state))) {
+               if (state == PWRDM_POWER_OFF)
+                       return ret;
+               state--;
+       }
 
+       cur_state = pwrdm_read_next_pwrst(pwrdm);
        if (cur_state == state)
                return ret;
 
@@ -307,6 +326,7 @@ static int omap3_pm_suspend(void)
                        goto restore;
        }
 
+       omap_uart_prepare_suspend();
        omap_sram_idle();
 
 restore:
@@ -314,7 +334,7 @@ restore:
        list_for_each_entry(pwrst, &pwrst_list, node) {
                set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
                state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
-               if (state != pwrst->next_state) {
+               if (state > pwrst->next_state) {
                        printk(KERN_INFO "Powerdomain (%s) didn't enter "
                               "target state %d\n",
                               pwrst->pwrdm->name, pwrst->next_state);
@@ -368,7 +388,7 @@ static void __init prcm_setup_regs(void)
        prm_write_mod_reg(0, OMAP3430_NEON_MOD, PM_WKDEP);
        prm_write_mod_reg(0, OMAP3430_CAM_MOD, PM_WKDEP);
        prm_write_mod_reg(0, OMAP3430_PER_MOD, PM_WKDEP);
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                prm_write_mod_reg(0, OMAP3430ES2_SGX_MOD, PM_WKDEP);
                prm_write_mod_reg(0, OMAP3430ES2_USBHOST_MOD, PM_WKDEP);
        } else
@@ -418,7 +438,7 @@ static void __init prcm_setup_regs(void)
                OMAP3430_AUTO_DES1,
                CORE_MOD, CM_AUTOIDLE2);
 
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                cm_write_mod_reg(
                        OMAP3430ES2_AUTO_USBTLL,
                        CORE_MOD, CM_AUTOIDLE3);
@@ -465,7 +485,7 @@ static void __init prcm_setup_regs(void)
                OMAP3430_PER_MOD,
                CM_AUTOIDLE);
 
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                cm_write_mod_reg(
                        OMAP3430ES2_AUTO_USBHOST,
                        OMAP3430ES2_USBHOST_MOD,
@@ -476,9 +496,8 @@ static void __init prcm_setup_regs(void)
         * Set all plls to autoidle. This is needed until autoidle is
         * enabled by clockfw
         */
-       cm_write_mod_reg(1 << OMAP3430_CLKTRCTRL_IVA2_SHIFT,
-                        OMAP3430_IVA2_MOD,
-                        CM_AUTOIDLE2);
+       cm_write_mod_reg(1 << OMAP3430_AUTO_IVA2_DPLL_SHIFT,
+                        OMAP3430_IVA2_MOD, CM_AUTOIDLE2);
        cm_write_mod_reg(1 << OMAP3430_AUTO_MPU_DPLL_SHIFT,
                         MPU_MOD,
                         CM_AUTOIDLE2);
@@ -501,10 +520,12 @@ static void __init prcm_setup_regs(void)
                             OMAP3_PRM_CLKSRC_CTRL_OFFSET);
 
        /* setup wakup source */
-       prm_write_mod_reg(OMAP3430_EN_IO | OMAP3430_EN_GPIO1 | OMAP3430_EN_GPT1,
+       prm_write_mod_reg(OMAP3430_EN_IO | OMAP3430_EN_GPIO1 |
+                         OMAP3430_EN_GPT1 | OMAP3430_EN_GPT12,
                          WKUP_MOD, PM_WKEN);
        /* No need to write EN_IO, that is always enabled */
-       prm_write_mod_reg(OMAP3430_EN_GPIO1 | OMAP3430_EN_GPT1,
+       prm_write_mod_reg(OMAP3430_EN_GPIO1 | OMAP3430_EN_GPT1 |
+                         OMAP3430_EN_GPT12,
                          WKUP_MOD, OMAP3430_PM_MPUGRPSEL);
        /* For some reason IO doesn't generate wakeup event even if
         * it is selected to mpu wakeup goup */
@@ -540,7 +561,7 @@ static int __init clkdms_setup(struct clockdomain *clkdm)
 
 int __init omap3_pm_init(void)
 {
-       struct power_state *pwrst;
+       struct power_state *pwrst, *tmp;
        int ret;
 
        printk(KERN_ERR "Power Management for TI OMAP3.\n");
@@ -583,7 +604,7 @@ err1:
        return ret;
 err2:
        free_irq(INT_34XX_PRCM_MPU_IRQ, NULL);
-       list_for_each_entry(pwrst, &pwrst_list, node) {
+       list_for_each_entry_safe(pwrst, tmp, &pwrst_list, node) {
                list_del(&pwrst->node);
                kfree(pwrst);
        }