aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/samsung/i2s.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 048ead967199..6e61db75ec4e 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -724,9 +724,6 @@ static int i2s_startup(struct snd_pcm_substream *substream,
724 else 724 else
725 i2s->mode |= DAI_MANAGER; 725 i2s->mode |= DAI_MANAGER;
726 726
727 /* Enforce set_sysclk in Master mode */
728 i2s->rclk_srcrate = 0;
729
730 if (!any_active(i2s) && (i2s->quirks & QUIRK_NEED_RSTCLR)) 727 if (!any_active(i2s) && (i2s->quirks & QUIRK_NEED_RSTCLR))
731 writel(CON_RSTCLR, i2s->addr + I2SCON); 728 writel(CON_RSTCLR, i2s->addr + I2SCON);
732 729
@@ -984,6 +981,7 @@ probe_exit:
984 /* Reset any constraint on RFS and BFS */ 981 /* Reset any constraint on RFS and BFS */
985 i2s->rfs = 0; 982 i2s->rfs = 0;
986 i2s->bfs = 0; 983 i2s->bfs = 0;
984 i2s->rclk_srcrate = 0;
987 i2s_txctrl(i2s, 0); 985 i2s_txctrl(i2s, 0);
988 i2s_rxctrl(i2s, 0); 986 i2s_rxctrl(i2s, 0);
989 i2s_fifo(i2s, FIC_TXFLUSH); 987 i2s_fifo(i2s, FIC_TXFLUSH);