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.
PATCH 1/1 ASoC: Fix jive_wm8750.c build problems
Fix build errors in sound/soc/s3c24xx/jive_wm8750.c from changes to ASoC.
--- sound/soc/s3c24xx/jive_wm8750.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/s3c24xx/jive_wm8750.c +6 -6
@@ -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, };
Signature · 1 line
1.5.6.5
PATCH 1/1 ASoC: Fix include build error in s3c2412-i2s.c
Fix accidental change of <mach/regs-gpio.h> to
<plat/regs-gpio.h> in s3c2412-i2s.c
--- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/s3c24xx/s3c2412-i2s.c +1 -1
@@ -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"
Signature · 1 line
1.5.6.5
PATCH 1/1 ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
Fix the build error in s3c-i2s-v2.c caused by
a change to the snd_soc_dai ops field.
--- sound/soc/s3c24xx/s3c-i2s-v2.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
sound/soc/s3c24xx/s3c-i2s-v2.c +6 -4
@@ -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;
Signature · 1 line
1.5.6.5
PATCH 1/1 ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
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.
--- sound/soc/s3c24xx/s3c-i2s-v2.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/s3c24xx/s3c-i2s-v2.c +4 -4
@@ -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,
Signature · 1 line
1.5.6.5
Mark Brown
AppliedRe: [PATCH] ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
Quoted 5 lines · Ben Dooks
The definition of
s3c_i2sv2_iis_calc_ratewas never renamed froms3c2412_iis_calc_rate, so rename this to allow the build to work.Signed-off-by Ben Dooks <[email protected]>
Applied, thanks.
Mark Brown
AppliedRe: [PATCH] ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
In reply to Ben DooksQuoted 4 lines · Ben Dooks
Fix the build error in
s3c-i2s-v2.ccaused by
a change to thesnd_soc_daiops field.Signed-off-by Ben Dooks <[email protected]>
Applied, thanks.
Mark Brown
AppliedRe: [PATCH] ASoC: Fix include build error in s3c2412-i2s.c
In reply to Ben DooksQuoted 4 lines · Ben Dooks
Fix accidental change of <
mach/regs-gpio.h> to
<plat/regs-gpio.h> ins3c2412-i2s.cSigned-off-by Ben Dooks <[email protected]>
Applied, thanks.
Mark Brown
AppliedRe: [PATCH] ASoC: Fix jive_wm8750.c build problems
In reply to Ben DooksQuoted 4 lines · Ben Dooks
Fix build errors in
sound/soc/s3c24xx/jive_wm8750.cfrom changes to ASoC.Signed-off-by Ben Dooks <[email protected]>
Applied, thanks.