From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753297Ab1LVO6h (ORCPT ); Thu, 22 Dec 2011 09:58:37 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:41414 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752699Ab1LVO6c (ORCPT ); Thu, 22 Dec 2011 09:58:32 -0500 From: Benoit Cousson To: , CC: , , , , , , , , , Benoit Cousson 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 Message-ID: <1324565806-31142-2-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1324565806-31142-1-git-send-email-b-cousson@ti.com> References: <1324565806-31142-1-git-send-email-b-cousson@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Kevin Hilman --- 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