Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / pm33xx-core.c

diff --git a/arch/arm/mach-omap2/pm33xx-core.c b/arch/arm/mach-omap2/pm33xx-core.c
index 724cf5774a6cb403bdd06fa63f5d5acf388a4d89..c93b6efd565f9d08d3f5489503d7a7bdfc2a61a8 100644 (file)
--- a/arch/arm/mach-omap2/pm33xx-core.c
+++ b/arch/arm/mach-omap2/pm33xx-core.c
@@ -51,10 +51,12 @@ static int amx3_common_init(void)
 
        /* CEFUSE domain can be turned off post bootup */
        cefuse_pwrdm = pwrdm_lookup("cefuse_pwrdm");
-       if (cefuse_pwrdm)
-               omap_set_pwrdm_state(cefuse_pwrdm, PWRDM_POWER_OFF);
-       else
+       if (!cefuse_pwrdm)
                pr_err("PM: Failed to get cefuse_pwrdm\n");
+       else if (omap_type() != OMAP2_DEVICE_TYPE_GP)
+               pr_info("PM: Leaving EFUSE power domain active\n");
+       else
+               omap_set_pwrdm_state(cefuse_pwrdm, PWRDM_POWER_OFF);
 
        return 0;
 }