ACPI / LPSS: complete PM entries for LPSS power domain

PATCH Applied Fu, Zhonghui 2 participants 3 messages Sep 9, 2014 – Sep 11, 2014 ACPI

lore

Share & tools

lore

Fu, Zhonghui

author

2014-09-09 05:34 UTC #0 lore raw

PATCH 1/1 ACPI / LPSS: complete PM entries for LPSS power domain

Quoted 1 line

From de3dfa34bd7f219586057a1e0679f9e7515fa722 Mon Sep 17 00:00:00 2001

From: Fu Zhonghui <[email protected]>
Date: Tue, 9 Sep 2014 10:54:30 +0800
Subject: [PATCH] ACPI / LPSS: complete PM entries for LPSS power domain

PM entries of LPSS power domain were not implemented correctly in the patch "ACPI / LPSS: custom power domain for LPSS" commit ID c78b0830667a7e7c1f0ca65b76b33166a84806b3. This patch fixes and completes these PM entries.

Signed-off-by Li Aubrey <[email protected]>

Signed-off-by Mika Westerberg <[email protected]>

Signed-off-by Fu Zhonghui <[email protected]>

---
 drivers/acpi/acpi_lpss.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

drivers/acpi/acpi_lpss.c +5 -5

index 9dfec48..fddc1e8 100644
@@ -610,7 +610,7 @@ static int acpi_lpss_suspend_late(struct device *dev)
 	return acpi_dev_suspend_late(dev);
 }
 
-static int acpi_lpss_restore_early(struct device *dev)
+static int acpi_lpss_resume_early(struct device *dev)
 {
 	int ret = acpi_dev_resume_early(dev);

@@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev)
 static struct dev_pm_domain acpi_lpss_pm_domain = {
 	.ops = {
 #ifdef CONFIG_PM_SLEEP
-		.suspend_late = acpi_lpss_suspend_late,
-		.restore_early = acpi_lpss_restore_early,
 		.prepare = acpi_subsys_prepare,
 		.complete = acpi_subsys_complete,
 		.suspend = acpi_subsys_suspend,
-		.resume_early = acpi_subsys_resume_early,
+		.suspend_late = acpi_lpss_suspend_late,
+		.resume_early = acpi_lpss_resume_early,
 		.freeze = acpi_subsys_freeze,
 		.poweroff = acpi_subsys_suspend,
-		.poweroff_late = acpi_subsys_suspend_late,
+		.poweroff_late = acpi_lpss_suspend_late,
+		.restore_early = acpi_lpss_resume_early,
 #endif
 #ifdef CONFIG_PM_RUNTIME
 		.runtime_suspend = acpi_lpss_runtime_suspend,

-- 1.7.1

Rafael J. Wysocki

Applied

2014-09-09 20:24 UTC #1 lore raw

Quoted 5 lines · Zhonghui

From de3dfa34bd7f219586057a1e0679f9e7515fa722 Mon Sep 17 00:00:00 2001
From: Fu Zhonghui <[email protected]>
Date: Tue, 9 Sep 2014 10:54:30 +0800
Subject: [PATCH] ACPI / LPSS: complete PM entries for LPSS power domain

Quoted 8 lines

PM entries of LPSS power domain were not implemented correctly in the patch "ACPI / LPSS: custom power domain for LPSS" commit ID c78b0830667a7e7c1f0ca65b76b33166a84806b3. This patch fixes and completes these PM entries.
Signed-off-by Li Aubrey <[email protected]>
Signed-off-by Mika Westerberg <[email protected]>
Signed-off-by Fu Zhonghui <[email protected]>

Queued up for 3.17-rc5, thanks!

Quoted 43 lines

---
 drivers/acpi/acpi_lpss.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

drivers/acpi/acpi_lpss.c +5 -7

index 9dfec48..fddc1e8 100644
@@ -610,7 +610,7 @@ static int acpi_lpss_suspend_late(struct device *dev)
 	return acpi_dev_suspend_late(dev);
 }
 
-static int acpi_lpss_restore_early(struct device *dev)
+static int acpi_lpss_resume_early(struct device *dev)
 {
 	int ret = acpi_dev_resume_early(dev);

@@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev)
 static struct dev_pm_domain acpi_lpss_pm_domain = {
 	.ops = {
 #ifdef CONFIG_PM_SLEEP
-		.suspend_late = acpi_lpss_suspend_late,
-		.restore_early = acpi_lpss_restore_early,
 		.prepare = acpi_subsys_prepare,
 		.complete = acpi_subsys_complete,
 		.suspend = acpi_subsys_suspend,
-		.resume_early = acpi_subsys_resume_early,
+		.suspend_late = acpi_lpss_suspend_late,
+		.resume_early = acpi_lpss_resume_early,
 		.freeze = acpi_subsys_freeze,
 		.poweroff = acpi_subsys_suspend,
-		.poweroff_late = acpi_subsys_suspend_late,
+		.poweroff_late = acpi_lpss_suspend_late,
+		.restore_early = acpi_lpss_resume_early,
 #endif
 #ifdef CONFIG_PM_RUNTIME
 		.runtime_suspend = acpi_lpss_runtime_suspend,
-- 1.7.1
 
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines

I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Fu, Zhonghui

author

2014-09-11 07:42 UTC #2 lore raw

Many thanks.

Thanks,
Zhonghui

Quoted 59 lines · Rafael J. Wysocki

Quoted 5 lines · Zhonghui
From de3dfa34bd7f219586057a1e0679f9e7515fa722 Mon Sep 17 00:00:00 2001
From: Fu Zhonghui <[email protected]>
Date: Tue, 9 Sep 2014 10:54:30 +0800
Subject: [PATCH] ACPI / LPSS: complete PM entries for LPSS power domain
Quoted 8 lines
PM entries of LPSS power domain were not implemented correctly in the patch "ACPI / LPSS: custom power domain for LPSS" commit ID c78b0830667a7e7c1f0ca65b76b33166a84806b3. This patch fixes and completes these PM entries.
Signed-off-by Li Aubrey <[email protected]>
Signed-off-by Mika Westerberg <[email protected]>
Signed-off-by Fu Zhonghui <[email protected]>
Queued up for 3.17-rc5, thanks!
Quoted 43 lines
---
 drivers/acpi/acpi_lpss.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/acpi/acpi_lpss.c +5 -7
index 9dfec48..fddc1e8 100644
@@ -610,7 +610,7 @@ static int acpi_lpss_suspend_late(struct device *dev)
 	return acpi_dev_suspend_late(dev);
 }
 
-static int acpi_lpss_restore_early(struct device *dev)
+static int acpi_lpss_resume_early(struct device *dev)
 {
 	int ret = acpi_dev_resume_early(dev);
 
@@ -650,15 +650,15 @@ static int acpi_lpss_runtime_resume(struct device *dev)
 static struct dev_pm_domain acpi_lpss_pm_domain = {
 	.ops = {
 #ifdef CONFIG_PM_SLEEP
-		.suspend_late = acpi_lpss_suspend_late,
-		.restore_early = acpi_lpss_restore_early,
 		.prepare = acpi_subsys_prepare,
 		.complete = acpi_subsys_complete,
 		.suspend = acpi_subsys_suspend,
-		.resume_early = acpi_subsys_resume_early,
+		.suspend_late = acpi_lpss_suspend_late,
+		.resume_early = acpi_lpss_resume_early,
 		.freeze = acpi_subsys_freeze,
 		.poweroff = acpi_subsys_suspend,
-		.poweroff_late = acpi_subsys_suspend_late,
+		.poweroff_late = acpi_lpss_suspend_late,
+		.restore_early = acpi_lpss_resume_early,
 #endif
 #ifdef CONFIG_PM_RUNTIME
 		.runtime_suspend = acpi_lpss_runtime_suspend,
-- 1.7.1
 
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html