summaryrefslogtreecommitdiff
path: root/firmware/target/arm/s5l8700/pcm-s5l8700.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/s5l8700/pcm-s5l8700.c')
-rw-r--r--firmware/target/arm/s5l8700/pcm-s5l8700.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/firmware/target/arm/s5l8700/pcm-s5l8700.c b/firmware/target/arm/s5l8700/pcm-s5l8700.c
index fd41da1432..219f682e2d 100644
--- a/firmware/target/arm/s5l8700/pcm-s5l8700.c
+++ b/firmware/target/arm/s5l8700/pcm-s5l8700.c
@@ -105,7 +105,7 @@ static void play_next(void *addr, size_t size)
105 dma_callback); 105 dma_callback);
106 106
107 /* DMA channel on */ 107 /* DMA channel on */
108 clean_dcache(); 108// clean_dcache();
109 dma_enable_channel(DMA_IISOUT_CHANNEL); 109 dma_enable_channel(DMA_IISOUT_CHANNEL);
110} 110}
111 111
@@ -139,7 +139,8 @@ void pcm_play_dma_start(const void *addr, size_t size)
139 PCON5 = (PCON5 & ~(0xFFFF0000)) | 0x77720000; 139 PCON5 = (PCON5 & ~(0xFFFF0000)) | 0x77720000;
140 PCON6 = (PCON6 & ~(0x0F000000)) | 0x02000000; 140 PCON6 = (PCON6 & ~(0x0F000000)) | 0x02000000;
141 141
142 I2STXCON = (0x10 << 16) | /* burst length */ 142 I2STXCON = (1 << 20) | /* undocumented */
143 (DMA_IISOUT_BLEN << 16) | /* burst length */
143 (0 << 15) | /* 0 = falling edge */ 144 (0 << 15) | /* 0 = falling edge */
144 (0 << 13) | /* 0 = basic I2S format */ 145 (0 << 13) | /* 0 = basic I2S format */
145 (0 << 12) | /* 0 = MSB first */ 146 (0 << 12) | /* 0 = MSB first */
@@ -162,7 +163,7 @@ void pcm_play_dma_start(const void *addr, size_t size)
162#endif 163#endif
163 164
164 /* S3: DMA channel 0 on */ 165 /* S3: DMA channel 0 on */
165 clean_dcache(); 166// clean_dcache();
166 dma_enable_channel(DMA_IISOUT_CHANNEL); 167 dma_enable_channel(DMA_IISOUT_CHANNEL);
167 168
168 /* S4: IIS Tx clock on */ 169 /* S4: IIS Tx clock on */
@@ -190,14 +191,14 @@ void pcm_play_dma_stop(void)
190 (0 << 0); /* 0 = LRCK on */ 191 (0 << 0); /* 0 = LRCK on */
191} 192}
192 193
193/* pause playback by disabling further DMA requests */ 194/* pause playback by disabling the I2S interface */
194void pcm_play_dma_pause(bool pause) 195void pcm_play_dma_pause(bool pause)
195{ 196{
196 if (pause) { 197 if (pause) {
197 I2STXCOM &= ~(1 << 1); /* DMA request enable */ 198 I2STXCOM |= (1 << 0); /* LRCK off */
198 } 199 }
199 else { 200 else {
200 I2STXCOM |= (1 << 1); /* DMA request enable */ 201 I2STXCOM &= ~(1 << 0); /* LRCK on */
201 } 202 }
202} 203}
203 204
@@ -267,7 +268,7 @@ const void * pcm_play_dma_get_peak_buffer(int *count)
267void * pcm_dma_addr(void *addr) 268void * pcm_dma_addr(void *addr)
268{ 269{
269 if (addr != NULL) 270 if (addr != NULL)
270 addr = UNCACHED_ADDR(addr); 271 addr = (void*)((uintptr_t)addr | 0x40000000);
271 return addr; 272 return addr;
272} 273}
273#endif 274#endif