|
@@ -979,19 +979,18 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
|
|
|
if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */
|
|
|
samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback,
|
|
|
NULL);
|
|
|
- goto probe_exit;
|
|
|
- }
|
|
|
-
|
|
|
- samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);
|
|
|
+ } else {
|
|
|
+ samsung_asoc_init_dma_data(dai, &i2s->dma_playback,
|
|
|
+ &i2s->dma_capture);
|
|
|
|
|
|
- if (i2s->quirks & QUIRK_NEED_RSTCLR)
|
|
|
- writel(CON_RSTCLR, i2s->addr + I2SCON);
|
|
|
+ if (i2s->quirks & QUIRK_NEED_RSTCLR)
|
|
|
+ writel(CON_RSTCLR, i2s->addr + I2SCON);
|
|
|
|
|
|
- if (i2s->quirks & QUIRK_SUPPORTS_IDMA)
|
|
|
- idma_reg_addr_init(i2s->addr,
|
|
|
+ if (i2s->quirks & QUIRK_SUPPORTS_IDMA)
|
|
|
+ idma_reg_addr_init(i2s->addr,
|
|
|
i2s->sec_dai->idma_playback.dma_addr);
|
|
|
+ }
|
|
|
|
|
|
-probe_exit:
|
|
|
/* Reset any constraint on RFS and BFS */
|
|
|
i2s->rfs = 0;
|
|
|
i2s->bfs = 0;
|