* [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
@ 2011-08-24 23:43 ` Kevin Hilman
0 siblings, 0 replies; 14+ messages in thread
From: Kevin Hilman @ 2011-08-24 23:43 UTC (permalink / raw)
To: linux-arm-kernel
commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM:
omap_device: add system PM methods for PM domain handling) mistakenly
used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods
for the PM domains noirq methods. Fix that by setting only the
suspend_noirq and resume_noirq methods with custom versions.
Note that all other PM domain methods (including the "normal"
suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS,
which configures them all to the default subsystem (platform_bus)
methods.
Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
arch/arm/plat-omap/omap_device.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index b6b4097..9a6a538 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
_od_runtime_idle)
USE_PLATFORM_PM_SLEEP_OPS
- SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
+ .suspend_noirq = _od_suspend_noirq,
+ .resume_noirq = _od_resume_noirq,
}
};
--
1.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
2011-08-24 23:43 ` Kevin Hilman
(?)
@ 2011-08-25 14:12 ` Rafael J. Wysocki
-1 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2011-08-25 14:12 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-pm, linux-omap, linux-arm-kernel
On Thursday, August 25, 2011, Kevin Hilman wrote:
> commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM:
> omap_device: add system PM methods for PM domain handling) mistakenly
> used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods
> for the PM domains noirq methods. Fix that by setting only the
> suspend_noirq and resume_noirq methods with custom versions.
>
> Note that all other PM domain methods (including the "normal"
> suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS,
> which configures them all to the default subsystem (platform_bus)
> methods.
>
> Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
Applied to linux-pm/pm-fixes, will be pushed for 3.1, thanks!
Rafael
> ---
> arch/arm/plat-omap/omap_device.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
> index b6b4097..9a6a538 100644
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
> _od_runtime_idle)
> USE_PLATFORM_PM_SLEEP_OPS
> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
> + .suspend_noirq = _od_suspend_noirq,
> + .resume_noirq = _od_resume_noirq,
> }
> };
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
2011-08-24 23:43 ` Kevin Hilman
@ 2011-08-25 14:12 ` Rafael J. Wysocki
-1 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2011-08-25 14:12 UTC (permalink / raw)
To: Kevin Hilman; +Cc: Santosh Shilimkar, linux-omap, linux-pm, linux-arm-kernel
On Thursday, August 25, 2011, Kevin Hilman wrote:
> commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM:
> omap_device: add system PM methods for PM domain handling) mistakenly
> used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods
> for the PM domains noirq methods. Fix that by setting only the
> suspend_noirq and resume_noirq methods with custom versions.
>
> Note that all other PM domain methods (including the "normal"
> suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS,
> which configures them all to the default subsystem (platform_bus)
> methods.
>
> Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
Applied to linux-pm/pm-fixes, will be pushed for 3.1, thanks!
Rafael
> ---
> arch/arm/plat-omap/omap_device.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
> index b6b4097..9a6a538 100644
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
> _od_runtime_idle)
> USE_PLATFORM_PM_SLEEP_OPS
> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
> + .suspend_noirq = _od_suspend_noirq,
> + .resume_noirq = _od_resume_noirq,
> }
> };
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
@ 2011-08-25 14:12 ` Rafael J. Wysocki
0 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2011-08-25 14:12 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday, August 25, 2011, Kevin Hilman wrote:
> commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM:
> omap_device: add system PM methods for PM domain handling) mistakenly
> used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods
> for the PM domains noirq methods. Fix that by setting only the
> suspend_noirq and resume_noirq methods with custom versions.
>
> Note that all other PM domain methods (including the "normal"
> suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS,
> which configures them all to the default subsystem (platform_bus)
> methods.
>
> Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
Applied to linux-pm/pm-fixes, will be pushed for 3.1, thanks!
Rafael
> ---
> arch/arm/plat-omap/omap_device.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
> index b6b4097..9a6a538 100644
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
> _od_runtime_idle)
> USE_PLATFORM_PM_SLEEP_OPS
> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
> + .suspend_noirq = _od_suspend_noirq,
> + .resume_noirq = _od_resume_noirq,
> }
> };
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
2011-08-24 23:43 ` Kevin Hilman
` (2 preceding siblings ...)
(?)
@ 2011-09-01 16:00 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2011-09-01 16:00 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-pm, linux-omap
On Thursday 25 August 2011, Kevin Hilman wrote:
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
> _od_runtime_idle)
> USE_PLATFORM_PM_SLEEP_OPS
> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
> + .suspend_noirq = _od_suspend_noirq,
> + .resume_noirq = _od_resume_noirq,
> }
> };
This breaks if CONFIG_SUSPEND is not set and the _od_suspend_noirq/_od_resume_noirq
functions are not defined.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
2011-08-24 23:43 ` Kevin Hilman
@ 2011-09-01 16:00 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2011-09-01 16:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Kevin Hilman, Rafael J. Wysocki, Santosh Shilimkar, linux-pm,
linux-omap
On Thursday 25 August 2011, Kevin Hilman wrote:
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
> _od_runtime_idle)
> USE_PLATFORM_PM_SLEEP_OPS
> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
> + .suspend_noirq = _od_suspend_noirq,
> + .resume_noirq = _od_resume_noirq,
> }
> };
This breaks if CONFIG_SUSPEND is not set and the _od_suspend_noirq/_od_resume_noirq
functions are not defined.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
@ 2011-09-01 16:00 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2011-09-01 16:00 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 25 August 2011, Kevin Hilman wrote:
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
> _od_runtime_idle)
> USE_PLATFORM_PM_SLEEP_OPS
> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
> + .suspend_noirq = _od_suspend_noirq,
> + .resume_noirq = _od_resume_noirq,
> }
> };
This breaks if CONFIG_SUSPEND is not set and the _od_suspend_noirq/_od_resume_noirq
functions are not defined.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
2011-09-01 16:00 ` Arnd Bergmann
@ 2011-09-01 17:50 ` Kevin Hilman
-1 siblings, 0 replies; 14+ messages in thread
From: Kevin Hilman @ 2011-09-01 17:50 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Rafael J. Wysocki, Santosh Shilimkar, linux-pm,
linux-omap
Arnd Bergmann <arnd@arndb.de> writes:
> On Thursday 25 August 2011, Kevin Hilman wrote:
>> --- a/arch/arm/plat-omap/omap_device.c
>> +++ b/arch/arm/plat-omap/omap_device.c
>> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
>> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
>> _od_runtime_idle)
>> USE_PLATFORM_PM_SLEEP_OPS
>> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
>> + .suspend_noirq = _od_suspend_noirq,
>> + .resume_noirq = _od_resume_noirq,
>> }
>> };
>
> This breaks if CONFIG_SUSPEND is not set and the _od_suspend_noirq/_od_resume_noirq
> functions are not defined.
Indeed.
Will post a fix shortly.
Kevin
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
@ 2011-09-01 17:50 ` Kevin Hilman
0 siblings, 0 replies; 14+ messages in thread
From: Kevin Hilman @ 2011-09-01 17:50 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann <arnd@arndb.de> writes:
> On Thursday 25 August 2011, Kevin Hilman wrote:
>> --- a/arch/arm/plat-omap/omap_device.c
>> +++ b/arch/arm/plat-omap/omap_device.c
>> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
>> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
>> _od_runtime_idle)
>> USE_PLATFORM_PM_SLEEP_OPS
>> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
>> + .suspend_noirq = _od_suspend_noirq,
>> + .resume_noirq = _od_resume_noirq,
>> }
>> };
>
> This breaks if CONFIG_SUSPEND is not set and the _od_suspend_noirq/_od_resume_noirq
> functions are not defined.
Indeed.
Will post a fix shortly.
Kevin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume
2011-09-01 16:00 ` Arnd Bergmann
(?)
(?)
@ 2011-09-01 17:50 ` Kevin Hilman
-1 siblings, 0 replies; 14+ messages in thread
From: Kevin Hilman @ 2011-09-01 17:50 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-pm, linux-omap, linux-arm-kernel
Arnd Bergmann <arnd@arndb.de> writes:
> On Thursday 25 August 2011, Kevin Hilman wrote:
>> --- a/arch/arm/plat-omap/omap_device.c
>> +++ b/arch/arm/plat-omap/omap_device.c
>> @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = {
>> SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
>> _od_runtime_idle)
>> USE_PLATFORM_PM_SLEEP_OPS
>> - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
>> + .suspend_noirq = _od_suspend_noirq,
>> + .resume_noirq = _od_resume_noirq,
>> }
>> };
>
> This breaks if CONFIG_SUSPEND is not set and the _od_suspend_noirq/_od_resume_noirq
> functions are not defined.
Indeed.
Will post a fix shortly.
Kevin
^ permalink raw reply [flat|nested] 14+ messages in thread