diff options
| author | Jon Medhurst <tixy@linaro.org> | 2017-02-20 15:58:19 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2017-02-20 15:58:19 +0000 |
| commit | a90cfd84335a0a551f75c48f752b8ed91c35bc97 (patch) | |
| tree | fb129ac3483a6997a02fd49d1b6911c44093c9f5 /sound | |
| parent | f51941943991f69ebb3cdc807dfd83ec7ad630c4 (diff) | |
| parent | 5e318e00349e98c87eae4c1b978ba4825edaa82f (diff) | |
Merge branch '4.4-armlt-tda998x' into 4.4-armlt
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/dwc/designware_i2s.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 6e6a70c5c2bd..60cdc91447f5 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -141,22 +141,13 @@ static inline void i2s_clear_irqs(struct dw_i2s_dev *dev, u32 stream) static void i2s_start(struct dw_i2s_dev *dev, struct snd_pcm_substream *substream) { - u32 i, irq; + i2s_write_reg(dev->i2s_base, IER, 1); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - for (i = 0; i < 4; i++) { - irq = i2s_read_reg(dev->i2s_base, IMR(i)); - i2s_write_reg(dev->i2s_base, IMR(i), irq & ~0x30); - } + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) i2s_write_reg(dev->i2s_base, ITER, 1); - } else { - for (i = 0; i < 4; i++) { - irq = i2s_read_reg(dev->i2s_base, IMR(i)); - i2s_write_reg(dev->i2s_base, IMR(i), irq & ~0x03); - } + else i2s_write_reg(dev->i2s_base, IRER, 1); - } i2s_write_reg(dev->i2s_base, CER, 1); } |