Kevin, Chaithrika,

Is Audio supposed to work from the master branch?

I do not see this patch on the master, but it is there on the temp/asoc branch.

The i2c device information is currently there in both the places - DaVinci ASoC 
driver and board setup file.

Thanks
Sneha

> -----Original Message-----
> From: [email protected]
> [mailto:[email protected]] On Behalf
> Of Kevin Hilman
> Sent: Wednesday, August 26, 2009 3:28 AM
> To: Subrahmanya, Chaithrika
> Cc: [email protected];
> [email protected]
> Subject: Re: [PATCH] ARM: DaVinci: ASoC: Define AIC3x setup info
> 
> Chaithrika U S <[email protected]> writes:
> 
> > The codec setup data structure has to be defined for
> > successful probe.
> >
> > Signed-off-by: Chaithrika U S <[email protected]>
> > ---
> > Applies to temp/asoc branch of DaVinci GIT tree.
> 
> Thanks Chaithrika,
> 
> OK, I pushed a new 'temp/asoc' branch with Chaithrika's changes folded
> into mine, changing the author to Chaithrika.
> 
> Now there's one patch for DaVinci git and the other for ASoC.
> 
> I'll pull the one into DaVinci git master today and add it to my
> for-next.  Mark can merge the other and then we should be back to
> building/working audio in linux-next.
> 
> Kevin
> 
> 
> >  sound/soc/davinci/davinci-evm.c |    6 ++++++
> >  1 files changed, 6 insertions(+), 0 deletions(-)
> >
> > diff --git a/sound/soc/davinci/davinci-evm.c
> b/sound/soc/davinci/davinci-evm.c
> > index 81628ac..67414f6 100644
> > --- a/sound/soc/davinci/davinci-evm.c
> > +++ b/sound/soc/davinci/davinci-evm.c
> > @@ -206,27 +206,33 @@ static struct snd_soc_card da850_snd_soc_card = {
> >     .num_links = 1,
> >  };
> >
> > +static struct aic3x_setup_data aic3x_setup;
> > +
> >  /* evm audio subsystem */
> >  static struct snd_soc_device evm_snd_devdata = {
> >     .card = &snd_soc_card_evm,
> >     .codec_dev = &soc_codec_dev_aic3x,
> > +   .codec_data = &aic3x_setup,
> >  };
> >
> >  /* evm audio subsystem */
> >  static struct snd_soc_device dm6467_evm_snd_devdata = {
> >     .card = &dm6467_snd_soc_card_evm,
> >     .codec_dev = &soc_codec_dev_aic3x,
> > +   .codec_data = &aic3x_setup,
> >  };
> >
> >  /* evm audio subsystem */
> >  static struct snd_soc_device da830_evm_snd_devdata = {
> >     .card = &da830_snd_soc_card,
> >     .codec_dev = &soc_codec_dev_aic3x,
> > +   .codec_data = &aic3x_setup,
> >  };
> >
> >  static struct snd_soc_device da850_evm_snd_devdata = {
> >     .card           = &da850_snd_soc_card,
> >     .codec_dev      = &soc_codec_dev_aic3x,
> > +   .codec_data     = &aic3x_setup,
> >  };
> >
> >  static struct platform_device *evm_snd_device;
> > --
> > 1.5.6
> 
> _______________________________________________
> Davinci-linux-open-source mailing list
> [email protected]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to