From 5a9a2afc1044ebd3b35d75d71559e685ded3d7ac Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 24 Feb 2010 12:05:48 -0700 Subject: [PATCH] --- yaml --- r: 184787 b: refs/heads/master c: dfa6d6f892bef0afa2a39d27e4bd1763b972d206 h: refs/heads/master i: 184785: 5f41046a7eceb882976f0b03e521b085a136e2cc 184783: eac3238322c4ac3e4b4d37b18f5e5c1e7d9e994f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/cm-regbits-34xx.h | 2 +- trunk/arch/arm/mach-omap2/pm34xx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28c4bc71a337..9cd7ce17c3e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24d82e3421a48a0db68026275dca64537291cf8f +refs/heads/master: dfa6d6f892bef0afa2a39d27e4bd1763b972d206 diff --git a/trunk/arch/arm/mach-omap2/cm-regbits-34xx.h b/trunk/arch/arm/mach-omap2/cm-regbits-34xx.h index 6923deb98a28..a76e835ed4fa 100644 --- a/trunk/arch/arm/mach-omap2/cm-regbits-34xx.h +++ b/trunk/arch/arm/mach-omap2/cm-regbits-34xx.h @@ -55,7 +55,7 @@ /* Bits specific to each register */ /* CM_FCLKEN_IVA2 */ -#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2 (1 << 0) +#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK (1 << 0) #define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT 0 /* CM_CLKEN_PLL_IVA2 */ diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c index 5087b153b093..62e27aaf9fd6 100644 --- a/trunk/arch/arm/mach-omap2/pm34xx.c +++ b/trunk/arch/arm/mach-omap2/pm34xx.c @@ -688,7 +688,7 @@ static void __init omap3_iva_idle(void) OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL); /* Enable IVA2 clock */ - cm_write_mod_reg(OMAP3430_CM_FCLKEN_IVA2_EN_IVA2, + cm_write_mod_reg(OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK, OMAP3430_IVA2_MOD, CM_FCLKEN); /* Set IVA2 boot mode to 'idle' */