* [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name
@ 2011-03-09 19:11 Mark Brown
2011-03-09 19:11 ` [PATCH 2/2] ASoC: Ensure WM8958 gets all WM8994 late revision widgets Mark Brown
2011-03-09 20:24 ` [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name Liam Girdwood
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2011-03-09 19:11 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Without this fix the driver won't instantiate properly on relevant
devices.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8994.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 4afbe3b..d926733 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1418,7 +1418,7 @@ SND_SOC_DAPM_DAC_E("DAC1R", NULL, SND_SOC_NOPM, 0, 0,
static const struct snd_soc_dapm_widget wm8994_dac_widgets[] = {
SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0),
-SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),
+SND_SOC_DAPM_DAC("DAC2R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),
SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0),
SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
};
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] ASoC: Ensure WM8958 gets all WM8994 late revision widgets
2011-03-09 19:11 [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name Mark Brown
@ 2011-03-09 19:11 ` Mark Brown
2011-03-09 20:24 ` [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name Liam Girdwood
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-03-09 19:11 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Without this fix the driver won't instantiate properly on relevant
devices.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8994.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index d926733..c6c958e 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3325,6 +3325,12 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
case WM8958:
snd_soc_add_controls(codec, wm8958_snd_controls,
ARRAY_SIZE(wm8958_snd_controls));
+ snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets,
+ ARRAY_SIZE(wm8994_lateclk_widgets));
+ snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets,
+ ARRAY_SIZE(wm8994_adc_widgets));
+ snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets,
+ ARRAY_SIZE(wm8994_dac_widgets));
snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets,
ARRAY_SIZE(wm8958_dapm_widgets));
break;
@@ -3350,6 +3356,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
}
break;
case WM8958:
+ snd_soc_dapm_add_routes(dapm, wm8994_lateclk_intercon,
+ ARRAY_SIZE(wm8994_lateclk_intercon));
snd_soc_dapm_add_routes(dapm, wm8958_intercon,
ARRAY_SIZE(wm8958_intercon));
break;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name
2011-03-09 19:11 [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name Mark Brown
2011-03-09 19:11 ` [PATCH 2/2] ASoC: Ensure WM8958 gets all WM8994 late revision widgets Mark Brown
@ 2011-03-09 20:24 ` Liam Girdwood
1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2011-03-09 20:24 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, patches
On Wed, 2011-03-09 at 19:11 +0000, Mark Brown wrote:
> Without this fix the driver won't instantiate properly on relevant
> devices.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Both
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-09 20:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-09 19:11 [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name Mark Brown
2011-03-09 19:11 ` [PATCH 2/2] ASoC: Ensure WM8958 gets all WM8994 late revision widgets Mark Brown
2011-03-09 20:24 ` [PATCH 1/2] ASoC: Fix typo in late revision WM8994 DAC2R name Liam Girdwood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).