summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Halpin <jack.halpin@gmail.com>2010-04-06 17:22:51 +0000
committerJack Halpin <jack.halpin@gmail.com>2010-04-06 17:22:51 +0000
commit48477f06bf1de21f69d0ede35fc0667fc8d67f0a (patch)
tree7d91de3f12d471b81265ad8e8322273631ea1a38
parentc0e416b1ff2b0355cdca57d186263de75ba2535f (diff)
downloadrockbox-48477f06bf1de21f69d0ede35fc0667fc8d67f0a.tar.gz
rockbox-48477f06bf1de21f69d0ede35fc0667fc8d67f0a.zip
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
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c8
1 files 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)
694 GPIOA_IS &= ~(1<<2); 694 GPIOA_IS &= ~(1<<2);
695 /* detect both raising and falling edges */ 695 /* detect both raising and falling edges */
696 GPIOA_IBE |= (1<<2); 696 GPIOA_IBE |= (1<<2);
697 /* Configure XPD for SD-MCI interface */
698 CCU_IO |= (1<<2);
697#endif 699#endif
698 700
699 VIC_INT_ENABLE = INTERRUPT_NAND; 701 VIC_INT_ENABLE = INTERRUPT_NAND;
@@ -919,11 +921,7 @@ long sd_last_disk_activity(void)
919void sd_enable(bool on) 921void sd_enable(bool on)
920{ 922{
921 /* TODO */ 923 /* TODO */
922 if(on) 924 (void) on;
923 CCU_IO |= (1<<2); /* XPD is SD-MCI interface (b3:2 = 01) */
924 else
925 CCU_IO &= ~(1<<2); /* XPD is general purpose IO (b3:2 = 00) */
926 return;
927} 925}
928 926
929tCardInfo *card_get_info_target(int card_no) 927tCardInfo *card_get_info_target(int card_no)