ASoC: Fix jive_wm8750.c build problems
authorBen Dooks <ben-linux@fluff.org>
Thu, 16 Apr 2009 09:32:20 +0000 (10:32 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 16 Apr 2009 12:37:25 +0000 (13:37 +0100)
Fix build errors in sound/soc/s3c24xx/jive_wm8750.c
from changes to ASoC.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/s3c24xx/jive_wm8750.c

index 32063790d95b444709a2ae0a2dcf2e906909049e..93e6c87b7399085722169857e6756eed4fbe7ff1 100644 (file)
@@ -69,8 +69,8 @@ static int jive_hw_params(struct snd_pcm_substream *substream,
                break;
        }
 
-       s3c_i2sv2_calc_rate(&div, NULL, params_rate(params),
-                           s3c2412_get_iisclk());
+       s3c_i2sv2_iis_calc_rate(&div, NULL, params_rate(params),
+                               s3c2412_get_iisclk());
 
        /* set codec DAI configuration */
        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
@@ -145,8 +145,9 @@ static struct snd_soc_dai_link jive_dai = {
 };
 
 /* jive audio machine driver */
-static struct snd_soc_machine snd_soc_machine_jive = {
+static struct snd_soc_card snd_soc_machine_jive = {
        .name           = "Jive",
+       .platform       = &s3c24xx_soc_platform,
        .dai_link       = &jive_dai,
        .num_links      = 1,
 };
@@ -157,9 +158,8 @@ static struct wm8750_setup_data jive_wm8750_setup = {
 
 /* jive audio subsystem */
 static struct snd_soc_device jive_snd_devdata = {
-       .machine        = &snd_soc_machine_jive,
-       .platform       = &s3c24xx_soc_platform,
-       .codec_dev      = &soc_codec_dev_wm8750_spi,
+       .card           = &snd_soc_machine_jive,
+       .codec_dev      = &soc_codec_dev_wm8750,
        .codec_data     = &jive_wm8750_setup,
 };