[PATCH v6 19/25] gpio/omap: cleanup prepare_for_idle and resume_after_idle

[Tarun Kanti DebBarma]

Cleanup  omap2_gpio_prepare_for_idle() and omap2_gpio_resume_after_idle()
by moving most of the stuff to *_runtime_suspend() and *_runtime_resume().

Signed-off-by: Tarun Kanti DebBarma 
Signed-off-by: Charulatha V 
Reviewed-by: Santosh Shilimkar 
---
 drivers/gpio/gpio-omap.c |  234 -
 1 files changed, 125 insertions(+), 109 deletions(-)

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index a267a30..9d68b15 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1126,142 +1126,153 @@ static int omap_gpio_resume(struct device *dev)
 static void omap_gpio_save_context(struct gpio_bank *bank);
 static void omap_gpio_restore_context(struct gpio_bank *bank);
 
-void omap2_gpio_prepare_for_idle(int off_mode)
+static int omap_gpio_runtime_suspend(struct device *dev)
 {
-   struct gpio_bank *bank;
+   struct platform_device *pdev = to_platform_device(dev);
+   struct gpio_bank *bank = platform_get_drvdata(pdev);
+   u32 l1 = 0, l2 = 0;
+   int j;
 
-   list_for_each_entry(bank, &omap_gpio_list, node) {
-   u32 l1 = 0, l2 = 0;
-   int j;
+   for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
+   clk_disable(bank->dbck);
 
-   if (!bank->loses_context)
-   continue;
+   /*
+* If going to OFF, remove triggering for all
+* non-wakeup GPIOs.  Otherwise spurious IRQs will be
+* generated.  See OMAP2420 Errata item 1.101.
+*/
+   if (!(bank->enabled_non_wakeup_gpios))
+   goto save_gpio_context;
 
-   for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
-   clk_disable(bank->dbck);
+   bank->saved_datain = __raw_readl(bank->base +
+   bank->regs->datain);
+   l1 = __raw_readl(bank->base + bank->regs->fallingdetect);
+   l2 = __raw_readl(bank->base + bank->regs->risingdetect);
 
-   if (!off_mode)
-   continue;
+   bank->saved_fallingdetect = l1;
+   bank->saved_risingdetect = l2;
+   l1 &= ~bank->enabled_non_wakeup_gpios;
+   l2 &= ~bank->enabled_non_wakeup_gpios;
 
-   if (IS_ERR_VALUE(pm_runtime_put_sync_suspend(bank->dev) < 0))
-   dev_err(bank->dev, "%s: GPIO bank %d "
-   "pm_runtime_put_sync_suspend failed\n",
-   __func__, bank->id);
+   __raw_writel(l1, bank->base + bank->regs->fallingdetect);
+   __raw_writel(l2, bank->base + bank->regs->risingdetect);
+
+save_gpio_context:
+   if (bank->get_context_loss_count)
+   bank->context_loss_count =
+   bank->get_context_loss_count(bank->dev);
+   omap_gpio_save_context(bank);
 
-   /* If going to OFF, remove triggering for all
-* non-wakeup GPIOs.  Otherwise spurious IRQs will be
-* generated.  See OMAP2420 Errata item 1.101. */
-   if (!(bank->enabled_non_wakeup_gpios))
-   goto save_gpio_context;
+   return 0;
+}
+
+static int omap_gpio_runtime_resume(struct device *dev)
+{
+   struct platform_device *pdev = to_platform_device(dev);
+   struct gpio_bank *bank = platform_get_drvdata(pdev);
+   u32 context_lost_cnt_after;
+   u32 l = 0, gen, gen0, gen1;
+   int j;
+
+   for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
+   clk_enable(bank->dbck);
 
-   bank->saved_datain = __raw_readl(bank->base +
-   bank->regs->datain);
-   l1 = __raw_readl(bank->base + bank->regs->fallingdetect);
-   l2 = __raw_readl(bank->base + bank->regs->risingdetect);
+   if (bank->get_context_loss_count) {
+   context_lost_cnt_after =
+   bank->get_context_loss_count(bank->dev);
+   if (context_lost_cnt_after != bank->context_loss_count ||
+   !context_lost_cnt_after)
+   omap_gpio_restore_context(bank);
+   else
+   return 0;
+   }
 
-   bank->saved_fallingdetect = l1;
-   bank->saved_risingdetect = l2;
-   l1 &= ~bank->enabled_non_wakeup_gpios;
-   l2 &= ~bank->enabled_non_wakeup_gpios;
+   if (!(bank->enabled_non_wakeup_gpios))
+   return 0;
 
-   __raw_writel(l1, bank->base + bank->regs->fallingdetect);
-   __raw_writel(l2, bank->base + bank->regs->risingdetect);
+   __raw_writel(bank->saved_fallingdetect,
+   bank->base + bank->regs->fallingdetect);
+   __raw_writel(bank->saved_risingdetect,
+   bank->base + bank->regs->risingdetect);
+   l = __raw_readl(bank->base + ba

Re: [PATCH v6 19/25] gpio/omap: cleanup prepare_for_idle and resume_after_idle

[Kevin Hilman]

Tarun Kanti DebBarma  writes:

> Cleanup  omap2_gpio_prepare_for_idle() and omap2_gpio_resume_after_idle()
> by moving most of the stuff to *_runtime_suspend() and *_runtime_resume().

Why? 

(I know the answer, but it should be in the changelog.)

> Signed-off-by: Tarun Kanti DebBarma 
> Signed-off-by: Charulatha V 
> Reviewed-by: Santosh Shilimkar 

Also, as pointed out in an earlier patch, now that this is moved out of
the idle path, where interrupts were known to be disabled, the register
accesses in the runtime PM callbacks need to be protected by the
spinlock just like they are in other parts of the driver.

[...]

> @@ -1305,9 +1316,14 @@ static void omap_gpio_restore_context(struct gpio_bank 
> *bank)
>   bank->base + bank->regs->fallingdetect);
>   __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
>  }
> +#else
> +#define omap_gpio_runtime_suspend NULL
> +#define omap_gpio_runtime_resume NULL
>  #endif
>  
>  static const struct dev_pm_ops gpio_pm_ops = {
> + .runtime_suspend= omap_gpio_runtime_suspend,
> + .runtime_resume = omap_gpio_runtime_resume,

Please use SET_RUNTIME_PM_OPS() (see.suspend= omap_gpio_suspend,
>   .resume = omap_gpio_resume,
>  };

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v6 19/25] gpio/omap: cleanup prepare_for_idle and resume_after_idle

[DebBarma, Tarun Kanti]

On Wed, Sep 7, 2011 at 5:23 AM, Kevin Hilman  wrote:
> Tarun Kanti DebBarma  writes:
>
>> Cleanup  omap2_gpio_prepare_for_idle() and omap2_gpio_resume_after_idle()
>> by moving most of the stuff to *_runtime_suspend() and *_runtime_resume().
>
> Why?
>
> (I know the answer, but it should be in the changelog.)
Ok.

>
>> Signed-off-by: Tarun Kanti DebBarma 
>> Signed-off-by: Charulatha V 
>> Reviewed-by: Santosh Shilimkar 
>
> Also, as pointed out in an earlier patch, now that this is moved out of
> the idle path, where interrupts were known to be disabled, the register
> accesses in the runtime PM callbacks need to be protected by the
> spinlock just like they are in other parts of the driver.
Ok.

>
> [...]
>
>> @@ -1305,9 +1316,14 @@ static void omap_gpio_restore_context(struct 
>> gpio_bank *bank)
>>                               bank->base + bank->regs->fallingdetect);
>>       __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
>>  }
>> +#else
>> +#define omap_gpio_runtime_suspend NULL
>> +#define omap_gpio_runtime_resume NULL
>>  #endif
>>
>>  static const struct dev_pm_ops gpio_pm_ops = {
>> +     .runtime_suspend        = omap_gpio_runtime_suspend,
>> +     .runtime_resume         = omap_gpio_runtime_resume,
>
> Please use SET_RUNTIME_PM_OPS() (see 
>>       .suspend                = omap_gpio_suspend,
>>       .resume                 = omap_gpio_resume,
>>  };
>
> Kevin
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html