diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 19:18:56 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 19:18:56 -0500 |
commit | a46117836e23f97cf4660b0ebf8404ad151fb63d (patch) | |
tree | 2739f48d6ba3a7a8820f54929778ab69db314dba /arch/arm/plat-samsung/include | |
parent | bd4b9ba4cf9338932a065cd752fb5f28b26e4e39 (diff) | |
parent | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (diff) |
Merge branch 'samsung/driver' into next/drivers
* samsung/driver:
ARM: EXYNOS: Modified files for SPI consolidation work
ARM: S5P64X0: Enable SDHCI support
ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
ARM: S5P64X0: Add HSMMC setup for host Controller
Diffstat (limited to 'arch/arm/plat-samsung/include')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/sdhci.h | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index dcff7dd1ae8a..656dc00d30ed 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h | |||
@@ -123,6 +123,10 @@ extern void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | |||
123 | extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | 123 | extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w); |
124 | extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | 124 | extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w); |
125 | extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w); | 125 | extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w); |
126 | extern void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | ||
127 | extern void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | ||
128 | extern void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | ||
129 | extern void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | ||
126 | 130 | ||
127 | /* S3C2416 SDHCI setup */ | 131 | /* S3C2416 SDHCI setup */ |
128 | 132 | ||
@@ -146,6 +150,7 @@ static inline void s3c2416_default_sdhci0(void) { } | |||
146 | static inline void s3c2416_default_sdhci1(void) { } | 150 | static inline void s3c2416_default_sdhci1(void) { } |
147 | 151 | ||
148 | #endif /* CONFIG_S3C2416_SETUP_SDHCI */ | 152 | #endif /* CONFIG_S3C2416_SETUP_SDHCI */ |
153 | |||
149 | /* S3C64XX SDHCI setup */ | 154 | /* S3C64XX SDHCI setup */ |
150 | 155 | ||
151 | #ifdef CONFIG_S3C64XX_SETUP_SDHCI | 156 | #ifdef CONFIG_S3C64XX_SETUP_SDHCI |
@@ -201,6 +206,45 @@ static inline void s3c6400_default_sdhci2(void) { } | |||
201 | 206 | ||
202 | #endif /* CONFIG_S3C64XX_SETUP_SDHCI */ | 207 | #endif /* CONFIG_S3C64XX_SETUP_SDHCI */ |
203 | 208 | ||
209 | /* S5P64X0 SDHCI setup */ | ||
210 | |||
211 | #ifdef CONFIG_S5P64X0_SETUP_SDHCI | ||
212 | static inline void s5p64x0_default_sdhci0(void) | ||
213 | { | ||
214 | #ifdef CONFIG_S3C_DEV_HSMMC | ||
215 | s3c_hsmmc0_def_platdata.cfg_gpio = s5p64x0_setup_sdhci0_cfg_gpio; | ||
216 | #endif | ||
217 | } | ||
218 | |||
219 | static inline void s5p64x0_default_sdhci1(void) | ||
220 | { | ||
221 | #ifdef CONFIG_S3C_DEV_HSMMC1 | ||
222 | s3c_hsmmc1_def_platdata.cfg_gpio = s5p64x0_setup_sdhci1_cfg_gpio; | ||
223 | #endif | ||
224 | } | ||
225 | |||
226 | static inline void s5p6440_default_sdhci2(void) | ||
227 | { | ||
228 | #ifdef CONFIG_S3C_DEV_HSMMC2 | ||
229 | s3c_hsmmc2_def_platdata.cfg_gpio = s5p6440_setup_sdhci2_cfg_gpio; | ||
230 | #endif | ||
231 | } | ||
232 | |||
233 | static inline void s5p6450_default_sdhci2(void) | ||
234 | { | ||
235 | #ifdef CONFIG_S3C_DEV_HSMMC2 | ||
236 | s3c_hsmmc2_def_platdata.cfg_gpio = s5p6450_setup_sdhci2_cfg_gpio; | ||
237 | #endif | ||
238 | } | ||
239 | |||
240 | #else | ||
241 | static inline void s5p64x0_default_sdhci0(void) { } | ||
242 | static inline void s5p64x0_default_sdhci1(void) { } | ||
243 | static inline void s5p6440_default_sdhci2(void) { } | ||
244 | static inline void s5p6450_default_sdhci2(void) { } | ||
245 | |||
246 | #endif /* CONFIG_S5P64X0_SETUP_SDHCI */ | ||
247 | |||
204 | /* S5PC100 SDHCI setup */ | 248 | /* S5PC100 SDHCI setup */ |
205 | 249 | ||
206 | #ifdef CONFIG_S5PC100_SETUP_SDHCI | 250 | #ifdef CONFIG_S5PC100_SETUP_SDHCI |