Revert "ASoC: bcm2835: setup clock only if CPU is clock master"

This reverts commit 60507fe.
DigitalDreamtimeLtd · Aug 23, 2016 · d4481e2 · d4481e2
1 parent b3b4815
commit d4481e2
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
@@ -276,15 +276,8 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
 		/* otherwise calculate a fitting block ratio */
 		bclk_ratio = 2 * data_length;
 
-	/* Clock should only be set up here if CPU is clock master */
-	switch (dev->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-	case SND_SOC_DAIFMT_CBS_CFS:
-	case SND_SOC_DAIFMT_CBS_CFM:
-		clk_set_rate(dev->clk, sampling_rate * bclk_ratio);
-		break;
-	default:
-		break;
-	}
+	/* set target clock rate*/
+	clk_set_rate(dev->clk, sampling_rate * bclk_ratio);
 
 	/* Setup the frame format */
 	format = BCM2835_I2S_CHEN;