diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:24:06 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:24:29 -0400 |
| commit | 268aebe4d04bf2ac1e839eff2c83519768460189 (patch) | |
| tree | b456d91c8e495e0fb0aa84bd8708bed62b1e8dc4 /arch/arm/plat-mxc | |
| parent | 60e59920152c7bafc8a2eb3031a62f22c2bc9e95 (diff) | |
| parent | a019c5e25190107a88377cde8918c169d15a7add (diff) | |
Merge branch 'cleanup/__iomem' into next/cleanup
__iomem annotation cleanup branch from Arnd.
* cleanup/__iomem: (21 commits)
net: seeq: use __iomem pointers for MMIO
video: da8xx-fb: use __iomem pointers for MMIO
scsi: eesox: use __iomem pointers for MMIO
serial: ks8695: use __iomem pointers for MMIO
input: rpcmouse: use __iomem pointers for MMIO
ARM: samsung: use __iomem pointers for MMIO
ARM: spear13xx: use __iomem pointers for MMIO
ARM: sa1100: use __iomem pointers for MMIO
ARM: prima2: use __iomem pointers for MMIO
ARM: nomadik: use __iomem pointers for MMIO
ARM: msm: use __iomem pointers for MMIO
ARM: lpc32xx: use __iomem pointers for MMIO
ARM: ks8695: use __iomem pointers for MMIO
ARM: ixp4xx: use __iomem pointers for MMIO
ARM: iop32x: use __iomem pointers for MMIO
ARM: iop13xx: use __iomem pointers for MMIO
ARM: integrator: use __iomem pointers for MMIO
ARM: imx: use __iomem pointers for MMIO
ARM: ebsa110: use __iomem pointers for MMIO
ARM: at91: use __iomem pointers for MMIO
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index dbced61d9fda..ee9b1f9215df 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h | |||
| @@ -76,7 +76,7 @@ | |||
| 76 | #define MX31_RTIC_BASE_ADDR (MX31_AIPS2_BASE_ADDR + 0xec000) | 76 | #define MX31_RTIC_BASE_ADDR (MX31_AIPS2_BASE_ADDR + 0xec000) |
| 77 | 77 | ||
| 78 | #define MX31_ROMP_BASE_ADDR 0x60000000 | 78 | #define MX31_ROMP_BASE_ADDR 0x60000000 |
| 79 | #define MX31_ROMP_BASE_ADDR_VIRT 0xfc500000 | 79 | #define MX31_ROMP_BASE_ADDR_VIRT IOMEM(0xfc500000) |
| 80 | #define MX31_ROMP_SIZE SZ_1M | 80 | #define MX31_ROMP_SIZE SZ_1M |
| 81 | 81 | ||
| 82 | #define MX31_AVIC_BASE_ADDR 0x68000000 | 82 | #define MX31_AVIC_BASE_ADDR 0x68000000 |
| @@ -92,11 +92,11 @@ | |||
| 92 | #define MX31_CS3_BASE_ADDR 0xb2000000 | 92 | #define MX31_CS3_BASE_ADDR 0xb2000000 |
| 93 | 93 | ||
| 94 | #define MX31_CS4_BASE_ADDR 0xb4000000 | 94 | #define MX31_CS4_BASE_ADDR 0xb4000000 |
| 95 | #define MX31_CS4_BASE_ADDR_VIRT 0xf6000000 | 95 | #define MX31_CS4_BASE_ADDR_VIRT IOMEM(0xf6000000) |
| 96 | #define MX31_CS4_SIZE SZ_32M | 96 | #define MX31_CS4_SIZE SZ_32M |
| 97 | 97 | ||
| 98 | #define MX31_CS5_BASE_ADDR 0xb6000000 | 98 | #define MX31_CS5_BASE_ADDR 0xb6000000 |
| 99 | #define MX31_CS5_BASE_ADDR_VIRT 0xf8000000 | 99 | #define MX31_CS5_BASE_ADDR_VIRT IOMEM(0xf8000000) |
| 100 | #define MX31_CS5_SIZE SZ_32M | 100 | #define MX31_CS5_SIZE SZ_32M |
| 101 | 101 | ||
| 102 | #define MX31_X_MEMC_BASE_ADDR 0xb8000000 | 102 | #define MX31_X_MEMC_BASE_ADDR 0xb8000000 |