Skip to content

Commit d4481e2

Browse files
committed
Revert "ASoC: bcm2835: setup clock only if CPU is clock master"
This reverts commit 60507fe.
1 parent b3b4815 commit d4481e2

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

sound/soc/bcm/bcm2835-i2s.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -276,15 +276,8 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
276276
/* otherwise calculate a fitting block ratio */
277277
bclk_ratio = 2 * data_length;
278278

279-
/* Clock should only be set up here if CPU is clock master */
280-
switch (dev->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
281-
case SND_SOC_DAIFMT_CBS_CFS:
282-
case SND_SOC_DAIFMT_CBS_CFM:
283-
clk_set_rate(dev->clk, sampling_rate * bclk_ratio);
284-
break;
285-
default:
286-
break;
287-
}
279+
/* set target clock rate*/
280+
clk_set_rate(dev->clk, sampling_rate * bclk_ratio);
288281

289282
/* Setup the frame format */
290283
format = BCM2835_I2S_CHEN;

0 commit comments

Comments
 (0)