Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / arch / arm / mach-exynos4 / include / mach / regs-mct.h

diff --git a/arch/arm/mach-exynos4/include/mach/regs-mct.h b/arch/arm/mach-exynos4/include/mach/regs-mct.h
index ca9c843..80dd02a 100644 (file)
--- a/arch/arm/mach-exynos4/include/mach/regs-mct.h
+++ b/arch/arm/mach-exynos4/include/mach/regs-mct.h
@@ -31,8 +31,9 @@
 #define EXYNOS4_MCT_G_INT_ENB          EXYNOS4_MCTREG(0x248)
 #define EXYNOS4_MCT_G_WSTAT            EXYNOS4_MCTREG(0x24C)
 
-#define EXYNOS4_MCT_L0_BASE            EXYNOS4_MCTREG(0x300)
-#define EXYNOS4_MCT_L1_BASE            EXYNOS4_MCTREG(0x400)
+#define _EXYNOS4_MCT_L_BASE            EXYNOS4_MCTREG(0x300)
+#define EXYNOS4_MCT_L_BASE(x)          (_EXYNOS4_MCT_L_BASE + (0x100 * x))
+#define EXYNOS4_MCT_L_MASK             (0xffffff00)
 
 #define MCT_L_TCNTB_OFFSET             (0x00)
 #define MCT_L_ICNTB_OFFSET             (0x08)