summaryrefslogtreecommitdiff
path: root/firmware/target/arm/s5l8700
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/s5l8700')
-rw-r--r--firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c8
-rw-r--r--firmware/target/arm/s5l8700/pcm-s5l8700.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
index 9261e5b3a0..1698dc2b9b 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
@@ -230,7 +230,7 @@ static void nand_transfer_data_start(uint32_t bank, uint32_t direction,
230 DMACOM3 = DMACOM_CLEARBOTHDONE; 230 DMACOM3 = DMACOM_CLEARBOTHDONE;
231 DMABASE3 = (uint32_t)buffer; 231 DMABASE3 = (uint32_t)buffer;
232 DMATCNT3 = (size >> 4) - 1; 232 DMATCNT3 = (size >> 4) - 1;
233 clean_dcache(); 233 commit_dcache();
234 DMACOM3 = 4; 234 DMACOM3 = 4;
235} 235}
236 236
@@ -239,7 +239,7 @@ static uint32_t nand_transfer_data_collect(uint32_t direction)
239 long timeout = current_tick + HZ / 50; 239 long timeout = current_tick + HZ / 50;
240 while ((DMAALLST & DMAALLST_DMABUSY3)) 240 while ((DMAALLST & DMAALLST_DMABUSY3))
241 if (nand_timeout(timeout)) return 1; 241 if (nand_timeout(timeout)) return 1;
242 if (!direction) invalidate_dcache(); 242 if (!direction) commit_discard_dcache();
243 if (nand_wait_addrdone()) return 1; 243 if (nand_wait_addrdone()) return 1;
244 if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO; 244 if (!direction) FMCTRL1 = FMCTRL1_CLEARRFIFO | FMCTRL1_CLEARWFIFO;
245 else FMCTRL1 = FMCTRL1_CLEARRFIFO; 245 else FMCTRL1 = FMCTRL1_CLEARRFIFO;
@@ -263,7 +263,7 @@ static void ecc_start(uint32_t size, void* databuffer, void* sparebuffer,
263 ECC_UNK1 = size; 263 ECC_UNK1 = size;
264 ECC_DATA_PTR = (uint32_t)databuffer; 264 ECC_DATA_PTR = (uint32_t)databuffer;
265 ECC_SPARE_PTR = (uint32_t)sparebuffer; 265 ECC_SPARE_PTR = (uint32_t)sparebuffer;
266 clean_dcache(); 266 commit_dcache();
267 ECC_CTRL = type; 267 ECC_CTRL = type;
268} 268}
269 269
@@ -272,7 +272,7 @@ static uint32_t ecc_collect(void)
272 long timeout = current_tick + HZ / 50; 272 long timeout = current_tick + HZ / 50;
273 while (!(SRCPND & INTMSK_ECC)) 273 while (!(SRCPND & INTMSK_ECC))
274 if (nand_timeout(timeout)) return ecc_unlock(1); 274 if (nand_timeout(timeout)) return ecc_unlock(1);
275 invalidate_dcache(); 275 commit_discard_dcache();
276 ECC_INT_CLR = 1; 276 ECC_INT_CLR = 1;
277 SRCPND = INTMSK_ECC; 277 SRCPND = INTMSK_ECC;
278 return ecc_unlock(ECC_RESULT); 278 return ecc_unlock(ECC_RESULT);
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index 6d733e0ff1..7b4258fa68 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -127,7 +127,7 @@ void INT_DMA(void)
127 DMATCNT0 = nextsize / 2 - 1; 127 DMATCNT0 = nextsize / 2 - 1;
128 nextsize = 0; 128 nextsize = 0;
129 } 129 }
130 clean_dcache(); 130 commit_dcache();
131 DMACOM0 = 4; 131 DMACOM0 = 4;
132 DMACOM0 = 7; 132 DMACOM0 = 7;
133 133