Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bc610e7 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: Fix clock handling in S3C24XX_UDA134X card 



There is no "pclk" alias in the s3c2440 clk driver for "soc-audio"
device so related clk_get() fails, which prevents any operation
of the S3C24XX_UDA134X sound card.
Instead we get the clock on behalf of the I2S device, i.e. we use
the I2S block gate clock which has PCLK is its parent clock.

Without this patch there is an error like:

s3c24xx_uda134x_startup cannot get pclk
ASoC: UDA134X startup failed: -2

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e7ca8fcd

sound/soc/samsung/s3c24xx_uda134x.c

+4 −3
Original line number Diff line number Diff line
@@ -58,10 +58,12 @@ static struct platform_device *s3c24xx_uda134x_snd_device; 


static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)

{

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

#ifdef ENFORCE_RATES

	struct snd_pcm_runtime *runtime = substream->runtime;

#endif

	int ret = 0;



	mutex_lock(&clk_lock);

	pr_debug("%s %d\n", __func__, clk_users);
@@ -71,8 +73,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) 
			printk(KERN_ERR "%s cannot get xtal\n", __func__);

			ret = PTR_ERR(xtal);

		} else {

			pclk = clk_get(&s3c24xx_uda134x_snd_device->dev,

				       "pclk");

			pclk = clk_get(cpu_dai->dev, "iis");

			if (IS_ERR(pclk)) {

				printk(KERN_ERR "%s cannot get pclk\n",

				       __func__);