diff options
author | Bridge Wu <bridge.wu@marvell.com> | 2007-12-21 06:27:08 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-26 10:07:53 -0500 |
commit | 5a1f21b1e546fafe840944f02949c1a8a8725132 (patch) | |
tree | 0d91ffd374c961507f6579b249c4ad9aa75e6b8b /arch/arm/mach-pxa/zylonite.c | |
parent | 8d33b05581d1bc66e2356957bb2739e177a9cc36 (diff) |
[ARM] pxa: mmc: add 3rd host controller support for pxa310
This patch is to add the third mmc controller support _only_
for pxa310.
On zylonite, the third controller support one slot.
Signed-off-by: Bridge Wu <bridge.wu@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/zylonite.c')
-rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 33986036f146..b49c69d024c7 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include "generic.h" | 30 | #include "generic.h" |
31 | 31 | ||
32 | #define MAX_SLOTS 2 | 32 | #define MAX_SLOTS 3 |
33 | struct platform_mmc_slot zylonite_mmc_slot[MAX_SLOTS]; | 33 | struct platform_mmc_slot zylonite_mmc_slot[MAX_SLOTS]; |
34 | 34 | ||
35 | int gpio_backlight; | 35 | int gpio_backlight; |
@@ -242,6 +242,8 @@ static void __init zylonite_init_mmc(void) | |||
242 | { | 242 | { |
243 | pxa_set_mci_info(&zylonite_mci_platform_data); | 243 | pxa_set_mci_info(&zylonite_mci_platform_data); |
244 | pxa3xx_set_mci2_info(&zylonite_mci2_platform_data); | 244 | pxa3xx_set_mci2_info(&zylonite_mci2_platform_data); |
245 | if (cpu_is_pxa310()) | ||
246 | pxa3xx_set_mci3_info(&zylonite_mci_platform_data); | ||
245 | } | 247 | } |
246 | #else | 248 | #else |
247 | static inline void zylonite_init_mmc(void) {} | 249 | static inline void zylonite_init_mmc(void) {} |