Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / arch / arm / plat-mxc / include / mach / mx53.h

diff --git a/arch/arm/plat-mxc/include/mach/mx53.h b/arch/arm/plat-mxc/include/mach/mx53.h
index 74cd093..a37e8c3 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx53.h
+++ b/arch/arm/plat-mxc/include/mach/mx53.h
@@ -9,6 +9,7 @@
 
 /* TZIC */
 #define MX53_TZIC_BASE_ADDR            0x0FFFC000
+#define MX53_TZIC_SIZE                 SZ_16K
 
 /*
  * AHCI SATA
@@ -176,10 +177,10 @@
 /*
  * DMA request assignments
  */
-#define MX53_DMA_REQ_SSI3_TX1          47
-#define MX53_DMA_REQ_SSI3_RX1          46
-#define MX53_DMA_REQ_SSI3_TX2          45
-#define MX53_DMA_REQ_SSI3_RX2          44
+#define MX53_DMA_REQ_SSI3_TX0          47
+#define MX53_DMA_REQ_SSI3_RX0          46
+#define MX53_DMA_REQ_SSI3_TX1          45
+#define MX53_DMA_REQ_SSI3_RX1          44
 #define MX53_DMA_REQ_UART3_TX  43
 #define MX53_DMA_REQ_UART3_RX  42
 #define MX53_DMA_REQ_ESAI_TX           41
@@ -194,14 +195,14 @@
 #define MX53_DMA_REQ_ASRC_DMA1 32
 #define MX53_DMA_REQ_EMI_WR            31
 #define MX53_DMA_REQ_EMI_RD            30
-#define MX53_DMA_REQ_SSI1_TX1          29
-#define MX53_DMA_REQ_SSI1_RX1          28
-#define MX53_DMA_REQ_SSI1_TX2          27
-#define MX53_DMA_REQ_SSI1_RX2          26
-#define MX53_DMA_REQ_SSI2_TX1          25
-#define MX53_DMA_REQ_SSI2_RX1          24
-#define MX53_DMA_REQ_SSI2_TX2          23
-#define MX53_DMA_REQ_SSI2_RX2          22
+#define MX53_DMA_REQ_SSI1_TX0          29
+#define MX53_DMA_REQ_SSI1_RX0          28
+#define MX53_DMA_REQ_SSI1_TX1          27
+#define MX53_DMA_REQ_SSI1_RX1          26
+#define MX53_DMA_REQ_SSI2_TX0          25
+#define MX53_DMA_REQ_SSI2_RX0          24
+#define MX53_DMA_REQ_SSI2_TX1          23
+#define MX53_DMA_REQ_SSI2_RX1          22
 #define MX53_DMA_REQ_I2C2_SDHC2        21
 #define MX53_DMA_REQ_I2C1_SDHC1        20
 #define MX53_DMA_REQ_UART1_TX  19
@@ -241,7 +242,7 @@
 #define MX53_INT_IPU_ERR       10
 #define MX53_INT_IPU_SYN       11
 #define MX53_INT_GPU   12
-#define MX53_INT_RESV13        13
+#define MX53_INT_UART4 13
 #define MX53_INT_USB_H1        14
 #define MX53_INT_EMI   15
 #define MX53_INT_USB_H2        16
@@ -314,7 +315,7 @@
 #define MX53_INT_CAN2  83
 #define MX53_INT_GPU2_IRQ      84
 #define MX53_INT_GPU2_BUSY     85
-#define MX53_INT_RESV86        86
+#define MX53_INT_UART5 86
 #define MX53_INT_FEC   87
 #define MX53_INT_OWIRE 88
 #define MX53_INT_CTI1_TG2      89