Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...

[pandora-kernel.git] / arch / arm / mach-msm / include / mach / msm_iomap-8x60.h

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 7c43a9b..a54e33b 100644 (file)
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -60,7 +60,11 @@
 
 #define MSM_TMR_BASE           IOMEM(0xF0200000)
 #define MSM_TMR_PHYS           0x02000000
-#define MSM_TMR_SIZE           (SZ_1M)
+#define MSM_TMR_SIZE           SZ_4K
+
+#define MSM_TMR0_BASE          IOMEM(0xF0201000)
+#define MSM_TMR0_PHYS          0x02040000
+#define MSM_TMR0_SIZE          SZ_4K
 
 #define MSM_GPT_BASE           (MSM_TMR_BASE + 0x4)
 #define MSM_DGT_BASE           (MSM_TMR_BASE + 0x24)