From 48477f06bf1de21f69d0ede35fc0667fc8d67f0a Mon Sep 17 00:00:00 2001 From: Jack Halpin Date: Tue, 6 Apr 2010 17:22:51 +0000 Subject: AS3525v2: Set XPD to SD-MMC interface in sd_init() for HAVE_MULTIDRIVE. XPD was being switched between SD-MMC interface and general i/o functions in the sd_enable() function similar to as3525v1. Since the as3525v2's do not seem to use XPD as general i/o there's no need to switch it back. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25497 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/sd-as3525v2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 4ca5fbc164..7765201d16 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c @@ -694,6 +694,8 @@ int sd_init(void) GPIOA_IS &= ~(1<<2); /* detect both raising and falling edges */ GPIOA_IBE |= (1<<2); + /* Configure XPD for SD-MCI interface */ + CCU_IO |= (1<<2); #endif VIC_INT_ENABLE = INTERRUPT_NAND; @@ -919,11 +921,7 @@ long sd_last_disk_activity(void) void sd_enable(bool on) { /* TODO */ - if(on) - CCU_IO |= (1<<2); /* XPD is SD-MCI interface (b3:2 = 01) */ - else - CCU_IO &= ~(1<<2); /* XPD is general purpose IO (b3:2 = 00) */ - return; + (void) on; } tCardInfo *card_get_info_target(int card_no) -- cgit v1.2.3