All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
@ 2011-09-05 11:49 Lars-Peter Clausen
  2011-09-06  0:41 ` Girdwood, Liam
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Lars-Peter Clausen @ 2011-09-05 11:49 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood
  Cc: uclinux-dist-devel, alsa-devel, Lars-Peter Clausen, stable,
	device-drivers-devel

Fix the codec_name field of the dai_link to match the actual device name
of the codec. Otherwise the card won't be instantiated.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: stable@kernel.org
---
 sound/soc/blackfin/bf5xx-ad193x.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
index a118a0f..5956584 100644
--- a/sound/soc/blackfin/bf5xx-ad193x.c
+++ b/sound/soc/blackfin/bf5xx-ad193x.c
@@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
 		.cpu_dai_name = "bfin-tdm.0",
 		.codec_dai_name ="ad193x-hifi",
 		.platform_name = "bfin-tdm-pcm-audio",
-		.codec_name = "ad193x.5",
+		.codec_name = "spi0.5",
 		.ops = &bf5xx_ad193x_ops,
 	},
 	{
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
 		.cpu_dai_name = "bfin-tdm.1",
 		.codec_dai_name ="ad193x-hifi",
 		.platform_name = "bfin-tdm-pcm-audio",
-		.codec_name = "ad193x.5",
+		.codec_name = "spi0.5",
 		.ops = &bf5xx_ad193x_ops,
 	},
 };
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
  2011-09-05 11:49 [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name Lars-Peter Clausen
@ 2011-09-06  0:41 ` Girdwood, Liam
  2011-09-06  1:11 ` Mark Brown
  2011-09-06  2:35 ` Scott Jiang
  2 siblings, 0 replies; 5+ messages in thread
From: Girdwood, Liam @ 2011-09-06  0:41 UTC (permalink / raw)
  To: Lars-Peter Clausen
  Cc: uclinux-dist-devel, alsa-devel, Mark Brown, stable,
	device-drivers-devel

On 5 September 2011 12:49, Lars-Peter Clausen <lars@metafoo.de> wrote:

> Fix the codec_name field of the dai_link to match the actual device name
> of the codec. Otherwise the card won't be instantiated.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> Cc: stable@kernel.org
> ---
>  sound/soc/blackfin/bf5xx-ad193x.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/blackfin/bf5xx-ad193x.c
> b/sound/soc/blackfin/bf5xx-ad193x.c
> index a118a0f..5956584 100644
> --- a/sound/soc/blackfin/bf5xx-ad193x.c
> +++ b/sound/soc/blackfin/bf5xx-ad193x.c
> @@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
>                .cpu_dai_name = "bfin-tdm.0",
>                .codec_dai_name ="ad193x-hifi",
>                .platform_name = "bfin-tdm-pcm-audio",
> -               .codec_name = "ad193x.5",
> +               .codec_name = "spi0.5",
>                .ops = &bf5xx_ad193x_ops,
>        },
>        {
> @@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
>                .cpu_dai_name = "bfin-tdm.1",
>                .codec_dai_name ="ad193x-hifi",
>                .platform_name = "bfin-tdm-pcm-audio",
> -               .codec_name = "ad193x.5",
> +               .codec_name = "spi0.5",
>                .ops = &bf5xx_ad193x_ops,
>        },
>  };
> --
> 1.7.2.5
>
> Acked-by: Liam Girdwood <lrg@ti.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
  2011-09-05 11:49 [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name Lars-Peter Clausen
  2011-09-06  0:41 ` Girdwood, Liam
@ 2011-09-06  1:11 ` Mark Brown
  2011-09-06  2:35 ` Scott Jiang
  2 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-09-06  1:11 UTC (permalink / raw)
  To: Lars-Peter Clausen
  Cc: uclinux-dist-devel, alsa-devel, Liam Girdwood,
	device-drivers-devel, stable

On Mon, Sep 05, 2011 at 01:49:57PM +0200, Lars-Peter Clausen wrote:
> Fix the codec_name field of the dai_link to match the actual device name
> of the codec. Otherwise the card won't be instantiated.

Applied, thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
  2011-09-05 11:49 [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name Lars-Peter Clausen
  2011-09-06  0:41 ` Girdwood, Liam
  2011-09-06  1:11 ` Mark Brown
@ 2011-09-06  2:35 ` Scott Jiang
  2011-09-06  8:16   ` Lars-Peter Clausen
  2 siblings, 1 reply; 5+ messages in thread
From: Scott Jiang @ 2011-09-06  2:35 UTC (permalink / raw)
  To: Lars-Peter Clausen
  Cc: alsa-devel, Mark Brown, stable, device-drivers-devel,
	uclinux-dist-devel, Liam Girdwood

2011/9/5 Lars-Peter Clausen <lars@metafoo.de>:
> Fix the codec_name field of the dai_link to match the actual device name
> of the codec. Otherwise the card won't be instantiated.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> Cc: stable@kernel.org
> ---
>  sound/soc/blackfin/bf5xx-ad193x.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
> index a118a0f..5956584 100644
> --- a/sound/soc/blackfin/bf5xx-ad193x.c
> +++ b/sound/soc/blackfin/bf5xx-ad193x.c
> @@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
>                .cpu_dai_name = "bfin-tdm.0",
>                .codec_dai_name ="ad193x-hifi",
>                .platform_name = "bfin-tdm-pcm-audio",
> -               .codec_name = "ad193x.5",
> +               .codec_name = "spi0.5",
>                .ops = &bf5xx_ad193x_ops,
>        },
>        {
> @@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
>                .cpu_dai_name = "bfin-tdm.1",
>                .codec_dai_name ="ad193x-hifi",
>                .platform_name = "bfin-tdm-pcm-audio",
> -               .codec_name = "ad193x.5",
> +               .codec_name = "spi0.5",
>                .ops = &bf5xx_ad193x_ops,
>        },
>  };
> --
> 1.7.2.5

Lars, I have to tell you ad193x supports i2c and spi.

#if defined(CONFIG_SND_SOC_AD193X_SPI)
                .codec_name = "spi0.5",
#elif defined(CONFIG_SND_SOC_AD193X_I2C)
                .codec_name = "ad193x.0-0004",
#endif

It is better to modify machine driver to platform driver and pass in
control type.

Scott

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
  2011-09-06  2:35 ` Scott Jiang
@ 2011-09-06  8:16   ` Lars-Peter Clausen
  0 siblings, 0 replies; 5+ messages in thread
From: Lars-Peter Clausen @ 2011-09-06  8:16 UTC (permalink / raw)
  To: Scott Jiang
  Cc: alsa-devel, Mark Brown, stable, device-drivers-devel,
	uclinux-dist-devel, Liam Girdwood

On 09/06/2011 04:35 AM, Scott Jiang wrote:
> 2011/9/5 Lars-Peter Clausen <lars@metafoo.de>:
>> Fix the codec_name field of the dai_link to match the actual device name
>> of the codec. Otherwise the card won't be instantiated.
>>
>> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
>> Cc: stable@kernel.org
>> ---
>>  sound/soc/blackfin/bf5xx-ad193x.c |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
>> index a118a0f..5956584 100644
>> --- a/sound/soc/blackfin/bf5xx-ad193x.c
>> +++ b/sound/soc/blackfin/bf5xx-ad193x.c
>> @@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
>>                .cpu_dai_name = "bfin-tdm.0",
>>                .codec_dai_name ="ad193x-hifi",
>>                .platform_name = "bfin-tdm-pcm-audio",
>> -               .codec_name = "ad193x.5",
>> +               .codec_name = "spi0.5",
>>                .ops = &bf5xx_ad193x_ops,
>>        },
>>        {
>> @@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
>>                .cpu_dai_name = "bfin-tdm.1",
>>                .codec_dai_name ="ad193x-hifi",
>>                .platform_name = "bfin-tdm-pcm-audio",
>> -               .codec_name = "ad193x.5",
>> +               .codec_name = "spi0.5",
>>                .ops = &bf5xx_ad193x_ops,
>>        },
>>  };
>> --
>> 1.7.2.5
> 
> Lars, I have to tell you ad193x supports i2c and spi.
> 
> #if defined(CONFIG_SND_SOC_AD193X_SPI)
>                 .codec_name = "spi0.5",
> #elif defined(CONFIG_SND_SOC_AD193X_I2C)
>                 .codec_name = "ad193x.0-0004",
> #endif
> 
> It is better to modify machine driver to platform driver and pass in
> control type.
> 
> Scott

Yes, though I would prefer using platform_device_id for this since whether it
is I2C or SPI depends on the codec model.

- Lars

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-09-06  8:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-05 11:49 [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name Lars-Peter Clausen
2011-09-06  0:41 ` Girdwood, Liam
2011-09-06  1:11 ` Mark Brown
2011-09-06  2:35 ` Scott Jiang
2011-09-06  8:16   ` Lars-Peter Clausen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.