On Fri, Dec 09, 2011 at 03:02:32PM +0100, Benoit Cousson wrote:
> 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 <[email protected]>

Acked-by: Grant Likely <[email protected]>

> Cc: Kevin Hilman <[email protected]>
> ---
>  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
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to