[alsa-devel] ASoC fixes for 2.6.30-rc for s3c24xx
These are fixes for the S3C24XX ASOC build, and in my view should be pushed to linus as soon as possible as I am updating the defconfigs that will cause these to be built.
They are available at:
git://aeryn.fluff.org.uk/bjdooks/linux.git v2630-rc2-asoc
this is based on kernel 2.6.30-rc2.
Fix build errors in sound/soc/s3c24xx/jive_wm8750.c from changes to ASoC.
Signed-off-by: Ben Dooks ben-linux@fluff.org --- sound/soc/s3c24xx/jive_wm8750.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 3206379..93e6c87 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c @@ -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, };
Fix accidental change of <mach/regs-gpio.h> to <plat/regs-gpio.h> in s3c2412-i2s.c
Signed-off-by: Ben Dooks ben-linux@fluff.org --- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index 1ca3cda..b7e0b3f 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -33,8 +33,8 @@
#include <plat/regs-s3c2412-iis.h>
-#include <plat/regs-gpio.h> #include <plat/audio.h> +#include <mach/regs-gpio.h> #include <mach/dma.h>
#include "s3c24xx-pcm.h"
Fix the build error in s3c-i2s-v2.c caused by a change to the snd_soc_dai ops field.
Signed-off-by: Ben Dooks ben-linux@fluff.org --- sound/soc/s3c24xx/s3c-i2s-v2.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 295a4c9..b983ad7 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -624,10 +624,12 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai)
int s3c_i2sv2_register_dai(struct snd_soc_dai *dai) { - dai->ops.trigger = s3c2412_i2s_trigger; - dai->ops.hw_params = s3c2412_i2s_hw_params; - dai->ops.set_fmt = s3c2412_i2s_set_fmt; - dai->ops.set_clkdiv = s3c2412_i2s_set_clkdiv; + struct snd_soc_dai_ops *ops = dai->ops; + + ops->trigger = s3c2412_i2s_trigger; + ops->hw_params = s3c2412_i2s_hw_params; + ops->set_fmt = s3c2412_i2s_set_fmt; + ops->set_clkdiv = s3c2412_i2s_set_clkdiv;
dai->suspend = s3c2412_i2s_suspend; dai->resume = s3c2412_i2s_resume;
The definition of s3c_i2sv2_iis_calc_rate was never renamed from s3c2412_iis_calc_rate, so rename this to allow the build to work.
Signed-off-by: Ben Dooks ben-linux@fluff.org --- sound/soc/s3c24xx/s3c-i2s-v2.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index b983ad7..689ffcd 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -473,9 +473,9 @@ static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai, /* default table of all avaialable root fs divisors */ static unsigned int iis_fs_tab[] = { 256, 512, 384, 768 };
-int s3c2412_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, - unsigned int *fstab, - unsigned int rate, struct clk *clk) +int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info, + unsigned int *fstab, + unsigned int rate, struct clk *clk) { unsigned long clkrate = clk_get_rate(clk); unsigned int div; @@ -531,7 +531,7 @@ int s3c2412_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,
return 0; } -EXPORT_SYMBOL_GPL(s3c2412_iis_calc_rate); +EXPORT_SYMBOL_GPL(s3c_i2sv2_iis_calc_rate);
int s3c_i2sv2_probe(struct platform_device *pdev, struct snd_soc_dai *dai,
On Thu, Apr 16, 2009 at 10:32:23AM +0100, Ben Dooks wrote:
The definition of s3c_i2sv2_iis_calc_rate was never renamed from s3c2412_iis_calc_rate, so rename this to allow the build to work.
Signed-off-by: Ben Dooks ben-linux@fluff.org
Applied, thanks.
On Thu, Apr 16, 2009 at 10:32:22AM +0100, Ben Dooks wrote:
Fix the build error in s3c-i2s-v2.c caused by a change to the snd_soc_dai ops field.
Signed-off-by: Ben Dooks ben-linux@fluff.org
Applied, thanks.
On Thu, Apr 16, 2009 at 10:32:21AM +0100, Ben Dooks wrote:
Fix accidental change of <mach/regs-gpio.h> to <plat/regs-gpio.h> in s3c2412-i2s.c
Signed-off-by: Ben Dooks ben-linux@fluff.org
Applied, thanks.
On Thu, Apr 16, 2009 at 10:32:20AM +0100, Ben Dooks wrote:
Fix build errors in sound/soc/s3c24xx/jive_wm8750.c from changes to ASoC.
Signed-off-by: Ben Dooks ben-linux@fluff.org
Applied, thanks.
participants (2)
-
Ben Dooks -
Mark Brown