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_pxa300.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_pxa300.c')
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index 38c1ddc6cb1d..0e159a3024c0 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -133,6 +133,14 @@ static mfp_cfg_t pxa310_mfp_cfg[] __initdata = { | |||
133 | /* Ethernet */ | 133 | /* Ethernet */ |
134 | GPIO2_nCS3, | 134 | GPIO2_nCS3, |
135 | GPIO102_GPIO, | 135 | GPIO102_GPIO, |
136 | |||
137 | /* MMC3 */ | ||
138 | GPIO7_2_MMC3_DAT0, | ||
139 | GPIO8_2_MMC3_DAT1, | ||
140 | GPIO9_2_MMC3_DAT2, | ||
141 | GPIO10_2_MMC3_DAT3, | ||
142 | GPIO103_MMC3_CLK, | ||
143 | GPIO105_MMC3_CMD, | ||
136 | }; | 144 | }; |
137 | 145 | ||
138 | #define NUM_LCD_DETECT_PINS 7 | 146 | #define NUM_LCD_DETECT_PINS 7 |
@@ -205,5 +213,9 @@ void __init zylonite_pxa300_init(void) | |||
205 | if (cpu_is_pxa310()) { | 213 | if (cpu_is_pxa310()) { |
206 | pxa3xx_mfp_config(ARRAY_AND_SIZE(pxa310_mfp_cfg)); | 214 | pxa3xx_mfp_config(ARRAY_AND_SIZE(pxa310_mfp_cfg)); |
207 | gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO102); | 215 | gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO102); |
216 | |||
217 | /* MMC card detect & write protect for controller 2 */ | ||
218 | zylonite_mmc_slot[2].gpio_cd = EXT_GPIO(30); | ||
219 | zylonite_mmc_slot[2].gpio_wp = EXT_GPIO(31); | ||
208 | } | 220 | } |
209 | } | 221 | } |