evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OMAP2 clockdomain: modem clockdomain is only present on OMAP2430

Browse source 
For some reason, previously, we included the MDM clockdomain on all 24xx,
but the stacked die-on-die modem configuration (chassis mode) is only
available on OMAP2430.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Paul Walmsley 2010-01-26 20:12:59 -07:00
parent a260170028
commit 3d309cdef3
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
arch/arm/mach-omap2/clockdomains.h
View file

@ -109,30 +109,6 @@ static struct clkdm_dep dsp_24xx_wkdeps[] = {
{ NULL }, { NULL },
}; };
/*
* 2420/2430 PM_WKDEP_MDM: CORE, MPU, WKUP
* XXX This is probably 2430-only; 2420 did not have a stacked modem config.
*/
static struct clkdm_dep mdm_24xx_wkdeps[] = {
{
.clkdm_name = "core_l3_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{
.clkdm_name = "core_l4_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{
.clkdm_name = "mpu_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{
.clkdm_name = "wkup_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{ NULL },
};
/* /*
* 2420 PM_WKDEP_MPU: CORE, DSP, WKUP * 2420 PM_WKDEP_MPU: CORE, DSP, WKUP
* 2430 adds MDM * 2430 adds MDM
@ -191,6 +167,35 @@ static struct clkdm_dep core_24xx_wkdeps[] = {
#endif #endif
/* 2430-specific possible wakeup dependencies */
#ifdef CONFIG_ARCH_OMAP2430
/* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */
static struct clkdm_dep mdm_2430_wkdeps[] = {
{
.clkdm_name = "core_l3_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{
.clkdm_name = "core_l4_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{
.clkdm_name = "mpu_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{
.clkdm_name = "wkup_clkdm",
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
},
{ NULL },
};
#endif /* CONFIG_ARCH_OMAP2430 */
/* 34XX-specific possible dependencies */ /* 34XX-specific possible dependencies */
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP34XX
@ -549,7 +554,7 @@ static struct clockdomain mdm_clkdm = {
.clkstctrl_reg = OMAP2430_CM_REGADDR(OMAP2430_MDM_MOD, .clkstctrl_reg = OMAP2430_CM_REGADDR(OMAP2430_MDM_MOD,
OMAP2_CM_CLKSTCTRL), OMAP2_CM_CLKSTCTRL),
.dep_bit = OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT, .dep_bit = OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT,
.wkdep_srcs = mdm_24xx_wkdeps, .wkdep_srcs = mdm_2430_wkdeps,
.clktrctrl_mask = OMAP2430_AUTOSTATE_MDM_MASK, .clktrctrl_mask = OMAP2430_AUTOSTATE_MDM_MASK,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
}; };