[alsa-devel] [PATCH] davinci: da8xx/omap-l1xx: match codec_name with i2c ids

[Liam Girdwood]

On Mon, 2011-01-24 at 15:09 -0800, Kevin Hilman wrote:
> Kevin Hilman <khilman at ti.com> writes:
> 
> > Liam Girdwood <lrg at slimlogic.co.uk> writes:
> >
> >> On Fri, 2011-01-21 at 19:54 +0530, Rajashekhara, Sudhakar wrote:
> >>> The codec_name entry for da8xx evm in sound/soc/davinci/davinci-evm.c
> >>> is not matching with the i2c ids in the board file. Without this fix the
> >>> soundcard does not get detected on da850/omap-l138/am18x evm.
> >>> 
> >>> Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj at ti.com>
> >>> Tested-by: Dan Sharon <dansharon at nanometrics.ca>
> >>> ---
> >>> This patch applies to Linus's kernel tree.
> >>> 
> >>>  sound/soc/davinci/davinci-evm.c |    2 +-
> >>>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>> 
> >>> diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
> >>> index 0c2d6ba..b36f0b3 100644
> >>> --- a/sound/soc/davinci/davinci-evm.c
> >>> +++ b/sound/soc/davinci/davinci-evm.c
> >>> @@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
> >>>  	.stream_name = "AIC3X",
> >>>  	.cpu_dai_name= "davinci-mcasp.0",
> >>>  	.codec_dai_name = "tlv320aic3x-hifi",
> >>> -	.codec_name = "tlv320aic3x-codec.0-001a",
> >>> +	.codec_name = "tlv320aic3x-codec.1-0018",
> >>>  	.platform_name = "davinci-pcm-audio",
> >>>  	.init = evm_aic3x_init,
> >>>  	.ops = &evm_ops,
> >>
> >> Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
> >
> > Liam,
> >
> > I'm assuming you'll merge this one via the ASoC tree?
> >
> 
> On second thought, these should probably merge for .38-rc3.
> 
> If you're OK with it, I can merge this and the platform fix together for
> .38-rc3.

Yes please :)

Thanks !

Liam
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk