ASoC: Fix CODEC device name for Corgi
Subsystems (6)
PATCH 1/4 ASoC: Fix CODEC device name for Corgi
Got typoed in the multi-component changes.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/pxa/corgi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/pxa/corgi.c +1 -1
@@ -310,7 +310,7 @@ static struct snd_soc_dai_link corgi_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8731-codec-0.001b", + .codec_name = "wm8731-codec.0-001b", .init = corgi_wm8731_init, .ops = &corgi_ops, };
Signature · 1 line
1.7.4.1
PATCH 2/4 ASoC: Convert WM8903 to table based DAPM setup
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8903.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)
sound/soc/codecs/wm8903.c +5 -13
@@ -931,7 +931,7 @@ SND_SOC_DAPM_SUPPLY("CLK_DSP", WM8903_CLOCK_RATES_2, 1, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("CLK_SYS", WM8903_CLOCK_RATES_2, 2, 0, NULL, 0), }; -static const struct snd_soc_dapm_route intercon[] = { +static const struct snd_soc_dapm_route wm8903_intercon[] = { {"CLK_DSP" ,NULL ,"CLK_SYS" }, {"Mic Bias" ,NULL ,"CLK_SYS" },
@@ -1084,17 +1084,6 @@ static const struct snd_soc_dapm_route intercon[] = { { "Right Line Output PGA", NULL, "Charge Pump" }, }; -static int wm8903_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; - -snd_soc_dapm_new_controls (dapm, wm8903_dapm_widgets, -ARRAY_SIZE (wm8903_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon)); - -return 0 ; -} -static int wm8903_set_bias_level (struct snd_soc_codec *codec,enum snd_soc_bias_level level) {
@@ -2222,7 +2211,6 @@ static int wm8903_probe(struct snd_soc_codec *codec)snd_soc_add_controls (codec, wm8903_snd_controls,ARRAY_SIZE (wm8903_snd_controls)); -wm8903_add_widgets (codec);wm8903_init_gpio (codec);
@@ -2248,6 +2236,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = { .reg_cache_default = wm8903_reg_defaults, .volatile_register = wm8903_volatile_register, .seq_notifier = wm8903_seq_notifier, + .dapm_widgets = wm8903_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8903_dapm_widgets), + .dapm_routes = wm8903_intercon, + .num_dapm_routes = ARRAY_SIZE(wm8903_intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
Signature · 1 line
1.7.4.1
PATCH 3/4 ASoC: Convert WM8731 to table based DAPM setup
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8731.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)
sound/soc/codecs/wm8731.c +5 -13
@@ -201,7 +201,7 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source,return wm8731->sysclk_type ==WM8731_SYSCLK_MCLK ; } -static const struct snd_soc_dapm_route intercon[] = { +static const struct snd_soc_dapm_route wm8731_intercon[] = { {"DAC" ,NULL ,"OSC" , wm8731_check_osc}, {"ADC" ,NULL ,"OSC" , wm8731_check_osc},
@@ -227,17 +227,6 @@ static const struct snd_soc_dapm_route intercon[] = { {"Mic Bias", NULL, "MICIN"}, }; -static int wm8731_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; - -snd_soc_dapm_new_controls (dapm, wm8731_dapm_widgets, -ARRAY_SIZE (wm8731_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon)); - -return 0 ; -} - struct _coeff_div { u32 mclk; u32 rate;
@@ -599,7 +588,6 @@ static int wm8731_probe(struct snd_soc_codec *codec)snd_soc_add_controls (codec, wm8731_snd_controls,ARRAY_SIZE (wm8731_snd_controls)); -wm8731_add_widgets (codec);/* Regulators will have been enabled by bias management */ regulator_bulk_disable (ARRAY_SIZE (wm8731->supplies), wm8731->supplies);
@@ -636,6 +624,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { .reg_cache_size = ARRAY_SIZE(wm8731_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8731_reg, + .dapm_widgets = wm8731_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), + .dapm_routes = wm8731_intercon, + .num_dapm_routes = ARRAY_SIZE(wm8731_intercon), };#if defined(CONFIG_SPI_MASTER )
Signature · 1 line
1.7.4.1
PATCH 4/4 ASoC: Remove -codec from WM8731 driver name
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/au1x/db1200.c | 2 +- sound/soc/codecs/wm8731.c | 4 ++-- sound/soc/pxa/corgi.c | 2 +- sound/soc/pxa/poodle.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/atmel/sam9g20_wm8731.c +1 -1
@@ -184,7 +184,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { .codec_dai_name = "wm8731-hifi", .init = at91sam9g20ek_wm8731_init, .platform_name = "atmel-pcm-audio", - .codec_name = "wm8731-codec.0-001b", + .codec_name = "wm8731.0-001b", .ops = &at91sam9g20ek_ops, };
sound/soc/au1x/db1200.c +1 -1
@@ -77,7 +77,7 @@ static struct snd_soc_dai_link db1200_i2s_dai = { .codec_dai_name = "wm8731-hifi", .cpu_dai_name = "au1xpsc_i2s.1", .platform_name = "au1xpsc-pcm.1", - .codec_name = "wm8731-codec.0-001b", + .codec_name = "wm8731.0-001b", .ops = &db1200_i2s_wm8731_ops, };
sound/soc/codecs/wm8731.c +2 -2
@@ -659,7 +659,7 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi)static struct spi_driver wm8731_spi_driver = { .driver = { - .name ="wm8731-codec" , + .name ="wm8731" , .owner =THIS_MODULE , }, .probe = wm8731_spi_probe,
@@ -703,7 +703,7 @@ MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);static struct i2c_driver wm8731_i2c_driver = { .driver = { - .name ="wm8731-codec" , + .name ="wm8731" , .owner =THIS_MODULE , }, .probe = wm8731_i2c_probe,
sound/soc/pxa/corgi.c +1 -1
@@ -310,7 +310,7 @@ static struct snd_soc_dai_link corgi_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8731-codec.0-001b", + .codec_name = "wm8731.0-001b", .init = corgi_wm8731_init, .ops = &corgi_ops, };
sound/soc/pxa/poodle.c +1 -1
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8731-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8731-codec.0-001b", + .codec_name = "wm8731.0-001b", .init = poodle_wm8731_init, .ops = &poodle_ops, };
Signature · 1 line
1.7.4.1
Quoted 3 lines · Mark Brown
Got typoed in the multi-component changes.
Signed-off-by Mark Brown <[email protected]>
All
Acked-by Liam Girdwood <[email protected]>