imx: copy constants from mx2x.h to mx21.h using the appropriate namespace

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/arch/arm/plat-mxc/include/mach/mx21.h b/arch/arm/plat-mxc/include/mach/mx21.h
index 986f08bd9c0fbc2f8776d105b6c3f8cff660f9d3..bb297d8765a79891c028851ee0a0c07673c2e200 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx21.h
+++ b/arch/arm/plat-mxc/include/mach/mx21.h
@@ -25,6 +25,49 @@
 #ifndef __ASM_ARCH_MXC_MX21_H__
 #define __ASM_ARCH_MXC_MX21_H__
 
+#define MX21_AIPI_BASE_ADDR            0x10000000
+#define MX21_AIPI_BASE_ADDR_VIRT       0xf4000000
+#define MX21_AIPI_SIZE                 SZ_1M
+#define MX21_DMA_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x01000)
+#define MX21_WDOG_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x02000)
+#define MX21_GPT1_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x03000)
+#define MX21_GPT2_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x04000)
+#define MX21_GPT3_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x05000)
+#define MX21_PWM_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x06000)
+#define MX21_RTC_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x07000)
+#define MX21_KPP_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x08000)
+#define MX21_OWIRE_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x09000)
+#define MX21_UART1_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x0a000)
+#define MX21_UART2_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x0b000)
+#define MX21_UART3_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x0c000)
+#define MX21_UART4_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x0d000)
+#define MX21_CSPI1_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x0e000)
+#define MX21_CSPI2_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x0f000)
+#define MX21_SSI1_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x10000)
+#define MX21_SSI2_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x11000)
+#define MX21_I2C_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x12000)
+#define MX21_SDHC1_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x13000)
+#define MX21_SDHC2_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x14000)
+#define MX21_GPIO_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x15000)
+#define MX21_AUDMUX_BASE_ADDR                  (MX21_AIPI_BASE_ADDR + 0x16000)
+#define MX21_CSPI3_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x17000)
+#define MX21_LCDC_BASE_ADDR                    (MX21_AIPI_BASE_ADDR + 0x21000)
+#define MX21_SLCDC_BASE_ADDR                   (MX21_AIPI_BASE_ADDR + 0x22000)
+#define MX21_USBOTG_BASE_ADDR                  (MX21_AIPI_BASE_ADDR + 0x24000)
+#define MX21_EMMA_PP_BASE_ADDR                 (MX21_AIPI_BASE_ADDR + 0x26000)
+#define MX21_EMMA_PRP_BASE_ADDR                        (MX21_AIPI_BASE_ADDR + 0x26400)
+#define MX21_CCM_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x27000)
+#define MX21_SYSCTRL_BASE_ADDR                 (MX21_AIPI_BASE_ADDR + 0x27800)
+#define MX21_JAM_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x3e000)
+#define MX21_MAX_BASE_ADDR                     (MX21_AIPI_BASE_ADDR + 0x3f000)
+
+#define MX21_AVIC_BASE_ADDR            0x10040000
+
+#define MX21_SAHB1_BASE_ADDR           0x80000000
+#define MX21_SAHB1_BASE_ADDR_VIRT      0xf4100000
+#define MX21_SAHB1_SIZE                        SZ_1M
+#define MX21_CSI_BASE_ADDR                     (MX2x_SAHB1_BASE_ADDR + 0x0000)
+
 /* Memory regions and CS */
 #define MX21_SDRAM_BASE_ADDR           0xc0000000
 #define MX21_CSD1_BASE_ADDR            0xc4000000
@@ -50,22 +93,91 @@
 #define MX21_IRAM_BASE_ADDR            0xffffe800      /* internal ram */
 
 /* fixed interrupt numbers */
+#define MX21_INT_CSPI3         6
+#define MX21_INT_GPIO          8
 #define MX21_INT_FIRI          9
+#define MX21_INT_SDHC2         10
+#define MX21_INT_SDHC1         11
+#define MX21_INT_I2C           12
+#define MX21_INT_SSI2          13
+#define MX21_INT_SSI1          14
+#define MX21_INT_CSPI2         15
+#define MX21_INT_CSPI1         16
+#define MX21_INT_UART4         17
+#define MX21_INT_UART3         18
+#define MX21_INT_UART2         19
+#define MX21_INT_UART1         20
+#define MX21_INT_KPP           21
+#define MX21_INT_RTC           22
+#define MX21_INT_PWM           23
+#define MX21_INT_GPT3          24
+#define MX21_INT_GPT2          25
+#define MX21_INT_GPT1          26
+#define MX21_INT_WDOG          27
+#define MX21_INT_PCMCIA                28
+#define MX21_INT_NANDFC                29
 #define MX21_INT_BMI           30
+#define MX21_INT_CSI           31
+#define MX21_INT_DMACH0                32
+#define MX21_INT_DMACH1                33
+#define MX21_INT_DMACH2                34
+#define MX21_INT_DMACH3                35
+#define MX21_INT_DMACH4                36
+#define MX21_INT_DMACH5                37
+#define MX21_INT_DMACH6                38
+#define MX21_INT_DMACH7                39
+#define MX21_INT_DMACH8                40
+#define MX21_INT_DMACH9                41
+#define MX21_INT_DMACH10       42
+#define MX21_INT_DMACH11       43
+#define MX21_INT_DMACH12       44
+#define MX21_INT_DMACH13       45
+#define MX21_INT_DMACH14       46
+#define MX21_INT_DMACH15       47
 #define MX21_INT_EMMAENC       49
 #define MX21_INT_EMMADEC       50
+#define MX21_INT_EMMAPRP       51
+#define MX21_INT_EMMAPP                52
 #define MX21_INT_USBWKUP       53
 #define MX21_INT_USBDMA                54
 #define MX21_INT_USBHOST       55
 #define MX21_INT_USBFUNC       56
 #define MX21_INT_USBMNP                57
 #define MX21_INT_USBCTRL       58
-#define MX21_INT_USBCTRL       58
+#define MX21_INT_SLCDC         60
+#define MX21_INT_LCDC          61
 
 /* fixed DMA request numbers */
+#define MX21_DMA_REQ_CSPI3_RX  1
+#define MX21_DMA_REQ_CSPI3_TX  2
+#define MX21_DMA_REQ_EXT       3
 #define MX21_DMA_REQ_FIRI_RX   4
+#define MX21_DMA_REQ_SDHC2     6
+#define MX21_DMA_REQ_SDHC1     7
+#define MX21_DMA_REQ_SSI2_RX0  8
+#define MX21_DMA_REQ_SSI2_TX0  9
+#define MX21_DMA_REQ_SSI2_RX1  10
+#define MX21_DMA_REQ_SSI2_TX1  11
+#define MX21_DMA_REQ_SSI1_RX0  12
+#define MX21_DMA_REQ_SSI1_TX0  13
+#define MX21_DMA_REQ_SSI1_RX1  14
+#define MX21_DMA_REQ_SSI1_TX1  15
+#define MX21_DMA_REQ_CSPI2_RX  16
+#define MX21_DMA_REQ_CSPI2_TX  17
+#define MX21_DMA_REQ_CSPI1_RX  18
+#define MX21_DMA_REQ_CSPI1_TX  19
+#define MX21_DMA_REQ_UART4_RX  20
+#define MX21_DMA_REQ_UART4_TX  21
+#define MX21_DMA_REQ_UART3_RX  22
+#define MX21_DMA_REQ_UART3_TX  23
+#define MX21_DMA_REQ_UART2_RX  24
+#define MX21_DMA_REQ_UART2_TX  25
+#define MX21_DMA_REQ_UART1_RX  26
+#define MX21_DMA_REQ_UART1_TX  27
 #define MX21_DMA_REQ_BMI_TX    28
 #define MX21_DMA_REQ_BMI_RX    29
+#define MX21_DMA_REQ_CSI_STAT  30
+#define MX21_DMA_REQ_CSI_RX    31
 
 /* these should go away */
 #define SDRAM_BASE_ADDR MX21_SDRAM_BASE_ADDR