diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-10-17 02:15:06 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-17 15:41:03 -0400 |
commit | f16fcb634894fca5173ad6b3ee8dcc838386eeda (patch) | |
tree | 6fbbd63e4a965b8538446274d05162ded00413c3 /arch/arm/plat-mxc/include/mach | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) |
arm/imx: remove mx31_setup_weimcs() from mx31.h
The helper function mx31_setup_weimcs() references IOMEM() and
IMX_IO_P2V() but without required header mach/hardware.h included
in mx31.h. This will break the build of those mx31 based board file
with no direct inclusion of mach/hardware.h, or when indirect inclusion
to mach/hardware.h breaks.
For example, when the inclusion of mach/hardware.h gets removed from
mach/gpio.h, we will see the following compile error.
CC arch/arm/mach-imx/mach-pcm037_eet.o
In file included from arch/arm/mach-imx/devices-imx31.h:9:0,
from arch/arm/mach-imx/mach-pcm037_eet.c:20:
arch/arm/plat-mxc/include/mach/mx31.h: In function ‘mx31_setup_weimcs’:
arch/arm/plat-mxc/include/mach/mx31.h:129:2: error: implicit declaration of function ‘IOMEM’
arch/arm/plat-mxc/include/mach/mx31.h:129:2: error: implicit declaration of function ‘IMX_IO_P2V’
This patch removes mx31_setup_weimcs() from mx31.h and makes it local
to mach-qong.c, which is the only user for this helper.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index 79e7fc01bb59..e27619e442c0 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h | |||
@@ -1,10 +1,6 @@ | |||
1 | #ifndef __MACH_MX31_H__ | 1 | #ifndef __MACH_MX31_H__ |
2 | #define __MACH_MX31_H__ | 2 | #define __MACH_MX31_H__ |
3 | 3 | ||
4 | #ifndef __ASSEMBLER__ | ||
5 | #include <linux/io.h> | ||
6 | #endif | ||
7 | |||
8 | /* | 4 | /* |
9 | * IRAM | 5 | * IRAM |
10 | */ | 6 | */ |
@@ -122,16 +118,6 @@ | |||
122 | #define MX31_IO_P2V(x) IMX_IO_P2V(x) | 118 | #define MX31_IO_P2V(x) IMX_IO_P2V(x) |
123 | #define MX31_IO_ADDRESS(x) IOMEM(MX31_IO_P2V(x)) | 119 | #define MX31_IO_ADDRESS(x) IOMEM(MX31_IO_P2V(x)) |
124 | 120 | ||
125 | #ifndef __ASSEMBLER__ | ||
126 | static inline void mx31_setup_weimcs(size_t cs, | ||
127 | unsigned upper, unsigned lower, unsigned addional) | ||
128 | { | ||
129 | __raw_writel(upper, MX31_IO_ADDRESS(MX31_WEIM_CSCRxU(cs))); | ||
130 | __raw_writel(lower, MX31_IO_ADDRESS(MX31_WEIM_CSCRxL(cs))); | ||
131 | __raw_writel(addional, MX31_IO_ADDRESS(MX31_WEIM_CSCRxA(cs))); | ||
132 | } | ||
133 | #endif | ||
134 | |||
135 | #define MX31_INT_I2C3 3 | 121 | #define MX31_INT_I2C3 3 |
136 | #define MX31_INT_I2C2 4 | 122 | #define MX31_INT_I2C2 4 |
137 | #define MX31_INT_MPEG4_ENCODER 5 | 123 | #define MX31_INT_MPEG4_ENCODER 5 |