Skip to content

Commit

Permalink
ASoC: RX1950: Fix hw_params function
Browse files Browse the repository at this point in the history
Unfortunatelly, I misunderstood datasheet, and on s3c244x-iis
when MPLLin source for master clock is selected, prescaler has
no effect. Remove dividor calculation for 44100 rate; remove 88200
rate at all, rx1950 can't do it.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Vasily Khoruzhick authored and Mark Brown committed Nov 15, 2010
1 parent bbde781 commit ccb3b84
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions sound/soc/s3c24xx/rx1950_uda1380.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ static unsigned int rates[] = {
16000,
44100,
48000,
88200,
};

static struct snd_pcm_hw_constraint_list hw_rates = {
Expand Down Expand Up @@ -130,7 +129,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
};

static struct platform_device *s3c24xx_snd_device;
static struct clk *xtal;

static int rx1950_startup(struct snd_pcm_substream *substream)
{
Expand Down Expand Up @@ -179,10 +177,8 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
case 44100:
case 88200:
clk_source = S3C24XX_CLKSRC_MPLL;
fs_mode = S3C2410_IISMOD_256FS;
div = clk_get_rate(xtal) / (256 * rate);
if (clk_get_rate(xtal) % (256 * rate) > (128 * rate))
div++;
fs_mode = S3C2410_IISMOD_384FS;
div = 1;
break;
default:
printk(KERN_ERR "%s: rate %d is not supported\n",
Expand Down Expand Up @@ -210,7 +206,7 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,

/* set MCLK division for sample rate */
ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK,
S3C2410_IISMOD_384FS);
fs_mode);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -295,17 +291,8 @@ static int __init rx1950_init(void)
goto err_plat_add;
}

xtal = clk_get(&s3c24xx_snd_device->dev, "xtal");

if (IS_ERR(xtal)) {
ret = PTR_ERR(xtal);
platform_device_unregister(s3c24xx_snd_device);
goto err_clk;
}

return 0;

err_clk:
err_plat_add:
err_plat_alloc:
err_gpio_conf:
Expand All @@ -320,7 +307,6 @@ static void __exit rx1950_exit(void)
platform_device_unregister(s3c24xx_snd_device);
snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
hp_jack_gpios);
clk_put(xtal);
gpio_free(S3C2410_GPA(1));
}

Expand Down

0 comments on commit ccb3b84

Please sign in to comment.