All of lore.kernel.org
 help / color / mirror / Atom feed
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Paul Walmsley <paul@pwsan.com>,
	Kevin Hilman <khilman@deeprootsystems.com>
Subject: [PATCH] ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
Date: Fri, 8 Feb 2013 20:41:44 +0530	[thread overview]
Message-ID: <1360336306-18277-1-git-send-email-santosh.shilimkar@ti.com> (raw)

Commit 1416408d {ARM: OMAP2+: PM: share some suspend-related functions
across OMAP2, 3, 4} moved suspend code to common place but now with
that change, for DT build on OMAP4, suspend hooks are not getting
registered which results in no suspend support.

The DT return condition is limited to PMIC and smartreflex
initialization and hence restrict it so that suspend ops gets
registered.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/pm.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index f4b3143..1ec4299 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -345,19 +345,19 @@ int __init omap2_common_pm_late_init(void)
 	 * a completely different mechanism.
 	 * Disable this part if a DT blob is available.
 	 */
-	if (of_have_populated_dt())
-		return 0;
+	if (!of_have_populated_dt()) {
 
-	/* Init the voltage layer */
-	omap_pmic_late_init();
-	omap_voltage_late_init();
+		/* Init the voltage layer */
+		omap_pmic_late_init();
+		omap_voltage_late_init();
 
-	/* Initialize the voltages */
-	omap3_init_voltages();
-	omap4_init_voltages();
+		/* Initialize the voltages */
+		omap3_init_voltages();
+		omap4_init_voltages();
 
-	/* Smartreflex device init */
-	omap_devinit_smartreflex();
+		/* Smartreflex device init */
+		omap_devinit_smartreflex();
+	}
 
 #ifdef CONFIG_SUSPEND
 	suspend_set_ops(&omap_pm_ops);
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
Date: Fri, 8 Feb 2013 20:41:44 +0530	[thread overview]
Message-ID: <1360336306-18277-1-git-send-email-santosh.shilimkar@ti.com> (raw)

Commit 1416408d {ARM: OMAP2+: PM: share some suspend-related functions
across OMAP2, 3, 4} moved suspend code to common place but now with
that change, for DT build on OMAP4, suspend hooks are not getting
registered which results in no suspend support.

The DT return condition is limited to PMIC and smartreflex
initialization and hence restrict it so that suspend ops gets
registered.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/pm.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index f4b3143..1ec4299 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -345,19 +345,19 @@ int __init omap2_common_pm_late_init(void)
 	 * a completely different mechanism.
 	 * Disable this part if a DT blob is available.
 	 */
-	if (of_have_populated_dt())
-		return 0;
+	if (!of_have_populated_dt()) {
 
-	/* Init the voltage layer */
-	omap_pmic_late_init();
-	omap_voltage_late_init();
+		/* Init the voltage layer */
+		omap_pmic_late_init();
+		omap_voltage_late_init();
 
-	/* Initialize the voltages */
-	omap3_init_voltages();
-	omap4_init_voltages();
+		/* Initialize the voltages */
+		omap3_init_voltages();
+		omap4_init_voltages();
 
-	/* Smartreflex device init */
-	omap_devinit_smartreflex();
+		/* Smartreflex device init */
+		omap_devinit_smartreflex();
+	}
 
 #ifdef CONFIG_SUSPEND
 	suspend_set_ops(&omap_pm_ops);
-- 
1.7.9.5

             reply	other threads:[~2013-02-08 15:10 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-08 15:11 Santosh Shilimkar [this message]
2013-02-08 15:11 ` [PATCH] ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init() Santosh Shilimkar
2013-02-08 15:11 ` [PATCH] ARM: OMAP2+: Remove duplicate omap4430_init_late() declaration Santosh Shilimkar
2013-02-08 15:11   ` Santosh Shilimkar
2013-02-08 15:21   ` Felipe Balbi
2013-02-08 15:21     ` Felipe Balbi
2013-02-15  9:35   ` Santosh Shilimkar
2013-02-15  9:35     ` Santosh Shilimkar
2013-03-04 18:19     ` Tony Lindgren
2013-03-04 18:19       ` Tony Lindgren
2013-02-08 15:11 ` [PATCH] ARM: OMAP4: PM: Avoid expensive cpu_suspend() path for all CPU power states except off Santosh Shilimkar
2013-02-08 15:11   ` Santosh Shilimkar
2013-02-08 15:26   ` Felipe Balbi
2013-02-08 15:26     ` Felipe Balbi
2013-02-08 15:34     ` Santosh Shilimkar
2013-02-08 15:34       ` Santosh Shilimkar
2013-02-08 21:19   ` Kevin Hilman
2013-02-08 21:19     ` Kevin Hilman
2013-02-12  4:55     ` Santosh Shilimkar
2013-02-12  4:55       ` Santosh Shilimkar
2013-02-12 15:18       ` Kevin Hilman
2013-02-12 15:18         ` Kevin Hilman
2013-02-13  5:05         ` Santosh Shilimkar
2013-02-13  5:05           ` Santosh Shilimkar
2013-02-08 15:20 ` [PATCH] ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init() Felipe Balbi
2013-02-08 15:20   ` Felipe Balbi
2013-02-08 15:34 ` Paul Walmsley
2013-02-08 15:34   ` Paul Walmsley
2013-02-08 15:36   ` Santosh Shilimkar
2013-02-08 15:36     ` Santosh Shilimkar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360336306-18277-1-git-send-email-santosh.shilimkar@ti.com \
    --to=santosh.shilimkar@ti.com \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=paul@pwsan.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.