[PATCH] ASoC: don't flip master of DT-instantiated DAI links

[PATCH] ASoC: don't flip master of DT-instantiated DAI links

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Commit 4924082 "ASoC: core: Flip master for CODECs in the CPU slot of a
CODEC<->CODEC link" added code that was conditional on there being no
PCM/DMA driver for the link. However, it failed to cover the case where
the link was instantiated from device tree, and hence was specified by
DT node rather than name.

This prevents the following error on Toshiba AC100:
aplay: pcm_write:1603: write error: Input/output error

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
I tested this fix on AC100 (ALC5632), Harmony (WM8903), and TrimSlice
(TLV320AIC23). I'm not sure why the issue only affected AC100. Perhaps
the other codecs support being the I2S master but the ALC5632 driver
doesn't?
---
 sound/soc/soc-core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2783d2b..b37ee80 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1612,7 +1612,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
 		}
 
 		/* If this is a regular CPU link there will be a platform */
-		if (dai_fmt && dai_link->platform_name) {
+		if (dai_fmt &&
+		    (dai_link->platform_name || dai_link->platform_of_node)) {
 			ret = snd_soc_dai_set_fmt(card->rtd[i].cpu_dai,
 						  dai_fmt);
 			if (ret != 0 && ret != -ENOTSUPP)
-- 
1.7.0.4

Re: [PATCH] ASoC: don't flip master of DT-instantiated DAI links

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

On Mon, May 14, 2012 at 02:47:22PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Commit 4924082 "ASoC: core: Flip master for CODECs in the CPU slot of a
> CODEC<->CODEC link" added code that was conditional on there being no
> PCM/DMA driver for the link. However, it failed to cover the case where
> the link was instantiated from device tree, and hence was specified by
> DT node rather than name.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]