[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1324565806-31142-2-git-send-email-b-cousson@ti.com>
Date: Thu, 22 Dec 2011 15:56:35 +0100
From: Benoit Cousson <b-cousson@...com>
To: <rob.herring@...xeda.com>, <tony@...mide.com>
CC: <linux-omap@...r.kernel.org>, <akpm@...ux-foundation.org>,
<linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<devicetree-discuss@...ts.ozlabs.org>, <grant.likely@...retlab.ca>,
<linux-i2c@...r.kernel.org>, <sameo@...ux.intel.com>,
<ben-linux@...ff.org>, Benoit Cousson <b-cousson@...com>
Subject: [PATCH v4 01/12] ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
In the case of DT, the PMIC and SR initialization will be done using
a completely different mechanism.
Disable this part if a DT blob is available.
Signed-off-by: Benoit Cousson <b-cousson@...com>
Acked-by: Kevin Hilman <khilman@...com>
---
arch/arm/mach-omap2/pm.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 1881fe9..ad4f693 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -227,6 +227,14 @@ postcore_initcall(omap2_common_pm_init);
static int __init omap2_common_pm_late_init(void)
{
+ /*
+ * In the case of DT, the PMIC and SR initialization will be done using
+ * a completely different mechanism.
+ * Disable this part if a DT blob is available.
+ */
+ if (of_have_populated_dt())
+ return 0;
+
/* Init the voltage layer */
omap_pmic_late_init();
omap_voltage_late_init();
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists