diff options
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx27.h | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 2d6a64bbac44..5a38e09f9eac 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -176,7 +176,9 @@ static struct platform_device *platform_devices[] __initdata = { | |||
176 | * setup other stuffs to access the sram. */ | 176 | * setup other stuffs to access the sram. */ |
177 | static void __init pcm038_init_sram(void) | 177 | static void __init pcm038_init_sram(void) |
178 | { | 178 | { |
179 | mx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00); | 179 | __raw_writel(0x0000d843, MX27_IO_ADDRESS(MX27_WEIM_CSCRxU(1))); |
180 | __raw_writel(0x22252521, MX27_IO_ADDRESS(MX27_WEIM_CSCRxL(1))); | ||
181 | __raw_writel(0x22220a00, MX27_IO_ADDRESS(MX27_WEIM_CSCRxA(1))); | ||
180 | } | 182 | } |
181 | 183 | ||
182 | static const struct imxi2c_platform_data pcm038_i2c1_data __initconst = { | 184 | static const struct imxi2c_platform_data pcm038_i2c1_data __initconst = { |
diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h index 1dc1c522601b..6265357284d7 100644 --- a/arch/arm/plat-mxc/include/mach/mx27.h +++ b/arch/arm/plat-mxc/include/mach/mx27.h | |||
@@ -24,10 +24,6 @@ | |||
24 | #ifndef __MACH_MX27_H__ | 24 | #ifndef __MACH_MX27_H__ |
25 | #define __MACH_MX27_H__ | 25 | #define __MACH_MX27_H__ |
26 | 26 | ||
27 | #ifndef __ASSEMBLER__ | ||
28 | #include <linux/io.h> | ||
29 | #endif | ||
30 | |||
31 | #define MX27_AIPI_BASE_ADDR 0x10000000 | 27 | #define MX27_AIPI_BASE_ADDR 0x10000000 |
32 | #define MX27_AIPI_SIZE SZ_1M | 28 | #define MX27_AIPI_SIZE SZ_1M |
33 | #define MX27_DMA_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x01000) | 29 | #define MX27_DMA_BASE_ADDR (MX27_AIPI_BASE_ADDR + 0x01000) |
@@ -131,16 +127,6 @@ | |||
131 | #define MX27_IO_P2V(x) IMX_IO_P2V(x) | 127 | #define MX27_IO_P2V(x) IMX_IO_P2V(x) |
132 | #define MX27_IO_ADDRESS(x) IOMEM(MX27_IO_P2V(x)) | 128 | #define MX27_IO_ADDRESS(x) IOMEM(MX27_IO_P2V(x)) |
133 | 129 | ||
134 | #ifndef __ASSEMBLER__ | ||
135 | static inline void mx27_setup_weimcs(size_t cs, | ||
136 | unsigned upper, unsigned lower, unsigned addional) | ||
137 | { | ||
138 | __raw_writel(upper, MX27_IO_ADDRESS(MX27_WEIM_CSCRxU(cs))); | ||
139 | __raw_writel(lower, MX27_IO_ADDRESS(MX27_WEIM_CSCRxL(cs))); | ||
140 | __raw_writel(addional, MX27_IO_ADDRESS(MX27_WEIM_CSCRxA(cs))); | ||
141 | } | ||
142 | #endif | ||
143 | |||
144 | /* fixed interrupt numbers */ | 130 | /* fixed interrupt numbers */ |
145 | #define MX27_INT_I2C2 1 | 131 | #define MX27_INT_I2C2 1 |
146 | #define MX27_INT_GPT6 2 | 132 | #define MX27_INT_GPT6 2 |