Преглед изворни кода

OMAP3: clock: use std _MASK suffix for CM_FCLKEN_IVA2 defines

Add _MASK suffix to CM_FCLKEN_IVA2 bitfieds to conform with the rest
of the usage in cm-regbits-34xx.h of using _SHIFT and _MASK suffixes.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Kevin Hilman пре 15 година
родитељ
комит
dfa6d6f892
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      arch/arm/mach-omap2/cm-regbits-34xx.h
  2. 1 1
      arch/arm/mach-omap2/pm34xx.c

+ 1 - 1
arch/arm/mach-omap2/cm-regbits-34xx.h

@@ -55,7 +55,7 @@
 /* Bits specific to each register */
 /* Bits specific to each register */
 
 
 /* CM_FCLKEN_IVA2 */
 /* 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
 #define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT		0
 
 
 /* CM_CLKEN_PLL_IVA2 */
 /* CM_CLKEN_PLL_IVA2 */

+ 1 - 1
arch/arm/mach-omap2/pm34xx.c

@@ -688,7 +688,7 @@ static void __init omap3_iva_idle(void)
 			  OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
 			  OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
 
 
 	/* Enable IVA2 clock */
 	/* 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);
 			 OMAP3430_IVA2_MOD, CM_FCLKEN);
 
 
 	/* Set IVA2 boot mode to 'idle' */
 	/* Set IVA2 boot mode to 'idle' */