diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-06 09:55:20 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-06 09:55:20 -0800 |
| commit | 5dfcb3b58c6c8934dec8898827736a1e26732cdd (patch) | |
| tree | 1b1f40e80be8e12e3b2ef523e2bbe1481a7e898a /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
| parent | 55f4851a0b141faac119f04212e2911fd968812a (diff) | |
| parent | bc05244e65f26b7b6f87e0964bfe277803914ed9 (diff) | |
Merge tag 'omap-fixes-b2-for-3.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.7-rc4/fixes
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 652d0285bd6d..7bddfa5534f9 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -2125,6 +2125,14 @@ static struct omap_hwmod omap44xx_mcpdm_hwmod = { .name = "mcpdm", .class = &omap44xx_mcpdm_hwmod_class, .clkdm_name = "abe_clkdm", + /* + * It's suspected that the McPDM requires an off-chip main + * functional clock, controlled via I2C. This IP block is + * currently reset very early during boot, before I2C is + * available, so it doesn't seem that we have any choice in + * the kernel other than to avoid resetting it. + */ + .flags = HWMOD_EXT_OPT_MAIN_CLK, .mpu_irqs = omap44xx_mcpdm_irqs, .sdma_reqs = omap44xx_mcpdm_sdma_reqs, .main_clk = "mcpdm_fck", |