summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorJack Halpin <jack.halpin@gmail.com>2010-04-07 05:47:12 +0000
committerJack Halpin <jack.halpin@gmail.com>2010-04-07 05:47:12 +0000
commitf25f17c5b60ade629b8b7b0449a6aafab7e32a7d (patch)
treebaad312cfa266826fd8443141a94e7d5e942c897 /firmware/target/arm
parent87eea33def283e23e239e716ee67093b0bdde226 (diff)
downloadrockbox-f25f17c5b60ade629b8b7b0449a6aafab7e32a7d.tar.gz
rockbox-f25f17c5b60ade629b8b7b0449a6aafab7e32a7d.zip
sd-as3525v2: Set SD FIFO TX/RX watermarks once in init_controller() and leave them alone after that.
We only use DMA transfers so we should not need to change/reset the FIFO configuration. Also add comment showing what we set as the TX/RX watermarks. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25507 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 7765201d16..5797dea7f5 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -655,8 +655,8 @@ static void init_controller(void)
655 655
656 MCI_DEBNCE = 0xfffff; /* default value */ 656 MCI_DEBNCE = 0xfffff; /* default value */
657 657
658 MCI_FIFOTH &= MCI_FIFOTH_MASK; 658 /* Rx watermark = 63(sd reads) Tx watermark = 128 (sd writes) */
659 MCI_FIFOTH |= 0x503f0080; 659 MCI_FIFOTH = (MCI_FIFOTH & MCI_FIFOTH_MASK) | 0x503f0080;
660 660
661 MCI_MASK = 0xffff & ~(MCI_INT_ACD|MCI_INT_CRDDET|MCI_INT_RXDR|MCI_INT_TXDR); 661 MCI_MASK = 0xffff & ~(MCI_INT_ACD|MCI_INT_CRDDET|MCI_INT_RXDR|MCI_INT_TXDR);
662 662
@@ -820,9 +820,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
820 MCI_MASK |= (MCI_DATA_ERROR | MCI_INT_DTO); 820 MCI_MASK |= (MCI_DATA_ERROR | MCI_INT_DTO);
821 MCI_CTRL |= DMA_ENABLE; 821 MCI_CTRL |= DMA_ENABLE;
822 822
823 MCI_FIFOTH &= MCI_FIFOTH_MASK;
824 MCI_FIFOTH |= 0x503f0080;
825
826 int arg = start; 823 int arg = start;
827 if(!(card_info[drive].ocr & (1<<30))) /* not SDHC */ 824 if(!(card_info[drive].ocr & (1<<30))) /* not SDHC */
828 arg *= SD_BLOCK_SIZE; 825 arg *= SD_BLOCK_SIZE;