From mboxrd@z Thu Jan  1 00:00:00 1970
From: khilman@ti.com (Kevin Hilman)
Date: Fri, 09 Dec 2011 17:32:26 -0800
Subject: [PATCH v2 01/10] ARM: OMAP2+: pm: Do not init statically the SR
 and voltage layer with DT
In-Reply-To: <1323438631-28124-2-git-send-email-b-cousson@ti.com> (Benoit
 Cousson's message of "Fri, 9 Dec 2011 14:50:22 +0100")
References: <1323438631-28124-1-git-send-email-b-cousson@ti.com>
 <1323438631-28124-2-git-send-email-b-cousson@ti.com>
Message-ID: <87obvhgqj9.fsf@ti.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Benoit Cousson <b-cousson@ti.com> writes:

> 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>
> Cc: Kevin Hilman <khilman@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();