ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-omap2 / prm44xx.c

diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index a980d245a0bb5946feca644c2f3b5fa59ffb616f..243133c4bf0d998db3dd19385b1e1763c124f0fc 100644 (file)
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -707,10 +707,10 @@ int __init omap44xx_prm_init(const struct omap_prcm_init_data *data)
 {
        omap_prm_base_init();
 
-       if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx())
+       if (data->flags & PRM_HAS_IO_WAKEUP)
                prm_features |= PRM_HAS_IO_WAKEUP;
 
-       if (!soc_is_dra7xx())
+       if (data->flags & PRM_HAS_VOLTAGE)
                prm_features |= PRM_HAS_VOLTAGE;
 
        omap4_prminst_set_prm_dev_inst(data->device_inst_offset);