summaryrefslogtreecommitdiff
path: root/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c')
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
index c219922607..14fbcd5cfe 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
@@ -77,14 +77,14 @@ void pcm_apply_settings(void)
77void pcm_play_lock(void) 77void pcm_play_lock(void)
78{ 78{
79 if (++dma_play_lock.locked == 1) 79 if (++dma_play_lock.locked == 1)
80 s3c_regset(&INTMSK, DMA2_MASK); 80 s3c_regset32(&INTMSK, DMA2_MASK);
81} 81}
82 82
83/* Unmask the DMA interrupt if enabled */ 83/* Unmask the DMA interrupt if enabled */
84void pcm_play_unlock(void) 84void pcm_play_unlock(void)
85{ 85{
86 if (--dma_play_lock.locked == 0) 86 if (--dma_play_lock.locked == 0)
87 s3c_regclr(&INTMSK, dma_play_lock.state); 87 s3c_regclr32(&INTMSK, dma_play_lock.state);
88} 88}
89 89
90void pcm_play_dma_init(void) 90void pcm_play_dma_init(void)
@@ -94,7 +94,7 @@ void pcm_play_dma_init(void)
94 /* There seem to be problems when changing the IIS interface configuration 94 /* There seem to be problems when changing the IIS interface configuration
95 * when a clock is not present. 95 * when a clock is not present.
96 */ 96 */
97 s3c_regset(&CLKCON, 1<<17); 97 s3c_regset32(&CLKCON, 1<<17);
98 /* slave, transmit mode, 16 bit samples - MCLK 384fs - use 16.9344Mhz - 98 /* slave, transmit mode, 16 bit samples - MCLK 384fs - use 16.9344Mhz -
99 BCLK 32fs */ 99 BCLK 32fs */
100 IISMOD = (1<<9) | (1<<8) | (2<<6) | (1<<3) | (1<<2) | (1<<0); 100 IISMOD = (1<<9) | (1<<8) | (2<<6) | (1<<3) | (1<<2) | (1<<0);
@@ -102,7 +102,7 @@ void pcm_play_dma_init(void)
102 /* RX,TX off,on */ 102 /* RX,TX off,on */
103 IISCON |= (1<<3) | (1<<2); 103 IISCON |= (1<<3) | (1<<2);
104 104
105 s3c_regclr(&CLKCON, 1<<17); 105 s3c_regclr32(&CLKCON, 1<<17);
106 106
107 audiohw_init(); 107 audiohw_init();
108 108
@@ -115,11 +115,11 @@ void pcm_play_dma_init(void)
115 /* Do not service DMA requests, yet */ 115 /* Do not service DMA requests, yet */
116 116
117 /* clear any pending int and mask it */ 117 /* clear any pending int and mask it */
118 s3c_regset(&INTMSK, DMA2_MASK); 118 s3c_regset32(&INTMSK, DMA2_MASK);
119 SRCPND = DMA2_MASK; 119 SRCPND = DMA2_MASK;
120 120
121 /* connect to FIQ */ 121 /* connect to FIQ */
122 s3c_regset(&INTMOD, DMA2_MASK); 122 s3c_regset32(&INTMOD, DMA2_MASK);
123} 123}
124 124
125void pcm_postinit(void) 125void pcm_postinit(void)
@@ -159,7 +159,7 @@ static void play_start_pcm(void)
159static void play_stop_pcm(void) 159static void play_stop_pcm(void)
160{ 160{
161 /* Mask DMA interrupt */ 161 /* Mask DMA interrupt */
162 s3c_regset(&INTMSK, DMA2_MASK); 162 s3c_regset32(&INTMSK, DMA2_MASK);
163 163
164 /* De-Activate the DMA channel */ 164 /* De-Activate the DMA channel */
165 DMASKTRIG2 = 0x4; 165 DMASKTRIG2 = 0x4;
@@ -187,7 +187,7 @@ static void play_stop_pcm(void)
187void pcm_play_dma_start(const void *addr, size_t size) 187void pcm_play_dma_start(const void *addr, size_t size)
188{ 188{
189 /* Enable the IIS clock */ 189 /* Enable the IIS clock */
190 s3c_regset(&CLKCON, 1<<17); 190 s3c_regset32(&CLKCON, 1<<17);
191 191
192 /* stop any DMA in progress - idle IIS */ 192 /* stop any DMA in progress - idle IIS */
193 play_stop_pcm(); 193 play_stop_pcm();
@@ -218,7 +218,7 @@ void pcm_play_dma_stop(void)
218 play_stop_pcm(); 218 play_stop_pcm();
219 219
220 /* Disconnect the IIS clock */ 220 /* Disconnect the IIS clock */
221 s3c_regclr(&CLKCON, 1<<17); 221 s3c_regclr32(&CLKCON, 1<<17);
222} 222}
223 223
224void pcm_play_dma_pause(bool pause) 224void pcm_play_dma_pause(bool pause)