diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 16:03:45 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2011-10-08 09:03:07 -0400 |
commit | 97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110 (patch) | |
tree | 34c80d050a0cc8538d0fc22213772560dc3db2f3 /arch/arm/mach-pxa/include/mach/palmtx.h | |
parent | 7272889d3f40ed6aa2ade32bed5834789b3299cc (diff) |
ARM: pxa: use correct __iomem annotations
This tries to clear up the confusion between integers and iomem pointers
in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
values, in order to let the Linux type checking work correctly. This
patch moves the cast to __iomem as far back as possible, to the place
where the MMIO virtual address windows are defined.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/palmtx.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtx.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h index 10abc4f2e8e4..7074a6ed46c6 100644 --- a/arch/arm/mach-pxa/include/mach/palmtx.h +++ b/arch/arm/mach-pxa/include/mach/palmtx.h | |||
@@ -71,7 +71,7 @@ | |||
71 | 71 | ||
72 | /* Various addresses */ | 72 | /* Various addresses */ |
73 | #define PALMTX_PCMCIA_PHYS 0x28000000 | 73 | #define PALMTX_PCMCIA_PHYS 0x28000000 |
74 | #define PALMTX_PCMCIA_VIRT 0xf0000000 | 74 | #define PALMTX_PCMCIA_VIRT IOMEM(0xf0000000) |
75 | #define PALMTX_PCMCIA_SIZE 0x100000 | 75 | #define PALMTX_PCMCIA_SIZE 0x100000 |
76 | 76 | ||
77 | #define PALMTX_PHYS_RAM_START 0xa0000000 | 77 | #define PALMTX_PHYS_RAM_START 0xa0000000 |
@@ -84,8 +84,8 @@ | |||
84 | 84 | ||
85 | #define PALMTX_NAND_ALE_PHYS (PALMTX_PHYS_NAND_START | (1 << 24)) | 85 | #define PALMTX_NAND_ALE_PHYS (PALMTX_PHYS_NAND_START | (1 << 24)) |
86 | #define PALMTX_NAND_CLE_PHYS (PALMTX_PHYS_NAND_START | (1 << 25)) | 86 | #define PALMTX_NAND_CLE_PHYS (PALMTX_PHYS_NAND_START | (1 << 25)) |
87 | #define PALMTX_NAND_ALE_VIRT 0xff100000 | 87 | #define PALMTX_NAND_ALE_VIRT IOMEM(0xff100000) |
88 | #define PALMTX_NAND_CLE_VIRT 0xff200000 | 88 | #define PALMTX_NAND_CLE_VIRT IOMEM(0xff200000) |
89 | 89 | ||
90 | /* TOUCHSCREEN */ | 90 | /* TOUCHSCREEN */ |
91 | #define AC97_LINK_FRAME 21 | 91 | #define AC97_LINK_FRAME 21 |