[alsa-devel] [PATCH] ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
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, }, };
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
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.
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
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
participants (4)
-
Girdwood, Liam -
Lars-Peter Clausen -
Mark Brown -
Scott Jiang