[PATCH] ASoC: twl6040: Add back support for legacy mode

[PATCH] ASoC: twl6040: Add back support for legacy mode

[Peter Ujfalusi]

The legacy mode has been accidentaly removed by commit:
ASoC: twl6040: add all ABE DAIs

Add back the twl6040-hifi dai.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---

Hi Tony, Mark, Liam,

this patch fixes the accidental removal of the twl6040-hifi
dai from the codec driver.
The series, which this patch depends on not yet pulled
(I have the branch ready), since I'm still waiting for few
acks for it.
The MFD series is mostly OK, but the threaded interrupt
related followup waits for acks, and also the PLL
restructuring series is in waiting state.

Is it OK, if I queue up this patch as well for the same pull
request, and goes with the rest through l-o (since it
is on top of those changes)?

I could try to squash it down, if you prefer to the offending
commit - I hope it is not breaking the rebase too much...

Thank you,
Peter

 sound/soc/codecs/twl6040.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index d4b944c..443032b 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1464,6 +1464,24 @@ static struct snd_soc_dai_ops twl6040_dai_ops = {
 
 static struct snd_soc_dai_driver twl6040_dai[] = {
 {
+	.name = "twl6040-hifi",
+	.playback = {
+		.stream_name = "Playback",
+		.channels_min = 1,
+		.channels_max = 2,
+		.rates = TWL6040_RATES,
+		.formats = TWL6040_FORMATS,
+	},
+	.capture = {
+		.stream_name = "Capture",
+		.channels_min = 1,
+		.channels_max = 2,
+		.rates = TWL6040_RATES,
+		.formats = TWL6040_FORMATS,
+	},
+	.ops = &twl6040_dai_ops,
+},
+{
 	.name = "twl6040-ul",
 	.capture = {
 		.stream_name = "Capture",
-- 
1.7.6

Re: [PATCH] ASoC: twl6040: Add back support for legacy mode

[Mark Brown]

On Wed, Jul 06, 2011 at 09:01:16PM +0300, Peter Ujfalusi wrote:
> The legacy mode has been accidentaly removed by commit:
> ASoC: twl6040: add all ABE DAIs
> 
> Add back the twl6040-hifi dai.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>