Re: [PATCH 4/6] arm: mach-omap2: remove "OMAP_DEVICE_NO_IDLE_ON_SUSPEND" check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thursday 18 April 2013 11:35 PM, Kevin Hilman wrote:
Sourav Poddar<sourav.poddar@xxxxxx>  writes:

Remove the "OMAP_DEVICE_NO_IDLE_ON_SUSPEND" check, since UART was the only one making
use of it. Now serial core/driver takes care of the case when "no_console_suspend"
is used in the bootargs and you need to keep the clock enable for console even while suspend.

Signed-off-by: Sourav Poddar<sourav.poddar@xxxxxx>
NAK.  This patch will break many things...

---
  arch/arm/mach-omap2/omap_device.c |    7 +------
  1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 381be7a..d6dce8f 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -620,11 +620,8 @@ static int _od_suspend_noirq(struct device *dev)
  	ret = pm_generic_suspend_noirq(dev);

  	if (!ret&&  !pm_runtime_status_suspended(dev)) {
-		if (pm_generic_runtime_suspend(dev) == 0) {
-			if (!(od->flags&  OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
-				omap_device_idle(pdev);
Why did you remove the omap_device_idle() here?
This patch is used along with patch3 to get rid of the issue. I posted them as a seperate patch beacuse of the subject line as one goes under drivers/* and the other
arm/mach-omap2/*..

This check was only valid for UART, and if od->flags is set to the
"OMAP_DEVICE_NO_IDLE_ON_SUSPEND" flag, then UART will not be idled. But now,
we no longer depend on od->flag value to prevent idling of our console UART as the
prepare/complete apis will take care of them.

+		if (pm_generic_runtime_suspend(dev) == 0)
  			od->flags |= OMAP_DEVICE_SUSPENDED;
-		}
  	}

  	return ret;
@@ -638,8 +635,6 @@ static int _od_resume_noirq(struct device *dev)
  	if ((od->flags&  OMAP_DEVICE_SUSPENDED)&&
  	!pm_runtime_status_suspended(dev)) {
  		od->flags&= ~OMAP_DEVICE_SUSPENDED;
-		if (!(od->flags&  OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
-			omap_device_enable(pdev);
And the _enable() here?

  		pm_generic_runtime_resume(dev);
  	}
Note that the check is for when the flag is *not* set, so this patch
changes behavior for all the drivers that do not use
_NO_IDLE_ON_SUSPEND.  I think that's the opposite of what you intended.

Kevin

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




[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux