From: Benoit Cousson <b-cousson@ti.com>
To: <rob.herring@calxeda.com>, <tony@atomide.com>
Cc: <linux-omap@vger.kernel.org>, <akpm@linux-foundation.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree-discuss@lists.ozlabs.org>,
<grant.likely@secretlab.ca>, <linux-i2c@vger.kernel.org>,
<sameo@linux.intel.com>, <ben-linux@fluff.org>,
Benoit Cousson <b-cousson@ti.com>
Subject: [PATCH v4 01/12] ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
Date: Thu, 22 Dec 2011 15:56:35 +0100 [thread overview]
Message-ID: <1324565806-31142-2-git-send-email-b-cousson@ti.com> (raw)
In-Reply-To: <1324565806-31142-1-git-send-email-b-cousson@ti.com>
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@ti.com>
Acked-by: Kevin Hilman <khilman@ti.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
next prev parent reply other threads:[~2011-12-22 14:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-22 14:56 [PATCH v4 00/12] OMAP4: Add DT support for i2c and twl6030 Benoit Cousson
2011-12-22 14:56 ` Benoit Cousson [this message]
2011-12-22 14:56 ` [PATCH v4 02/12] i2c: OMAP: Add DT support for i2c controller Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 03/12] mfd: twl-core: Add initial DT support for twl4030/twl6030 Benoit Cousson
2011-12-22 17:31 ` Samuel Ortiz
2012-01-02 9:04 ` Grant Likely
2012-01-03 14:09 ` Cousson, Benoit
2012-01-08 23:38 ` Samuel Ortiz
2011-12-22 14:56 ` [PATCH v4 04/12] rtc: rtc-twl: Add DT support for RTC inside twl4030/twl6030 Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 05/12] arm/dts: OMAP4: Add i2c controller nodes Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 06/12] arm/dts: OMAP3: " Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 07/12] arm/dts: twl6030: Add DTS file for twl6030 PMIC Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 08/12] arm/dts: twl4030: Add DTS file for twl4030 PM + Audio IC Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 09/12] arm/dts: omap4-panda: Add twl6030 and i2c EEPROM Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 10/12] arm/dts: omap4-sdp: Add twl6030, i2c3 and i2c4 devices Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 11/12] arm/dts: omap3-beagle: Add twl4030 and i2c EEPROM Benoit Cousson
2011-12-22 14:56 ` [PATCH v4 12/12] ARM: OMAP2+: board-generic: Remove i2c static init Benoit Cousson
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=1324565806-31142-2-git-send-email-b-cousson@ti.com \
--to=b-cousson@ti.com \
--cc=akpm@linux-foundation.org \
--cc=ben-linux@fluff.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rob.herring@calxeda.com \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®