redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
Currently some cpu_is_X checks are used to setup prm_features, however
the same can be accomplished by just passing these flags from the PRM
init data. This is done in preparation to make PRM a separate driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
This commit is contained in:
Tero Kristo 2014-11-21 14:45:29 +02:00
parent 425dc8b2df
commit 8b5b9a22b5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-omap2/prm44xx.c
View file

@ -707,10 +707,10 @@ int __init omap44xx_prm_init(const struct omap_prcm_init_data *data)
{ {
omap_prm_base_init(); 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; prm_features |= PRM_HAS_IO_WAKEUP;
if (!soc_is_dra7xx()) if (data->flags & PRM_HAS_VOLTAGE)
prm_features |= PRM_HAS_VOLTAGE; prm_features |= PRM_HAS_VOLTAGE;
omap4_prminst_set_prm_dev_inst(data->device_inst_offset); omap4_prminst_set_prm_dev_inst(data->device_inst_offset);

3
arch/arm/mach-omap2/prm_common.c
View file

@ -669,6 +669,7 @@ static struct omap_prcm_init_data omap4_prm_data __initdata = {
.index = TI_CLKM_PRM, .index = TI_CLKM_PRM,
.init = omap44xx_prm_init, .init = omap44xx_prm_init,
.device_inst_offset = OMAP4430_PRM_DEVICE_INST, .device_inst_offset = OMAP4430_PRM_DEVICE_INST,
.flags = PRM_HAS_IO_WAKEUP | PRM_HAS_VOLTAGE,
}; };
#endif #endif
@ -677,6 +678,7 @@ static struct omap_prcm_init_data omap5_prm_data __initdata = {
.index = TI_CLKM_PRM, .index = TI_CLKM_PRM,
.init = omap44xx_prm_init, .init = omap44xx_prm_init,
.device_inst_offset = OMAP54XX_PRM_DEVICE_INST, .device_inst_offset = OMAP54XX_PRM_DEVICE_INST,
.flags = PRM_HAS_IO_WAKEUP | PRM_HAS_VOLTAGE,
}; };
#endif #endif
@ -685,6 +687,7 @@ static struct omap_prcm_init_data dra7_prm_data __initdata = {
.index = TI_CLKM_PRM, .index = TI_CLKM_PRM,
.init = omap44xx_prm_init, .init = omap44xx_prm_init,
.device_inst_offset = DRA7XX_PRM_DEVICE_INST, .device_inst_offset = DRA7XX_PRM_DEVICE_INST,
.flags = PRM_HAS_IO_WAKEUP,
}; };
#endif #endif