Re: [PATCH v2] ASoC: simple-card: overwrite cpu_dai->fmt with codec_dai->fmt

From: Jyri Sarha
Date: Wed Mar 12 2014 - 05:31:12 EST


On 03/12/2014 05:02 AM, Nicolin Chen wrote:
The current simple-card driver separates the daimft for cpu_dai and codec_dai.
So we might get different values for them (0x4003 and 0x1003 for example):

asoc-simple-card sound-cs42888.12: cpu : 2024000.esai / 4003 / 132000000
asoc-simple-card sound-cs42888.12: codec : cs42888 / 1003 / 24576000
asoc-simple-card sound-cs42888.12: cs42888 <-> 2024000.esai mapping ok

This is not allowed at all as we need to keep the DAIFMT settings identical
for both the ends of the link.

Thus this patch fixes it by overwriting the cpu_dai->fmt with codec_dai->fmt
since we defined the DAIFMT_MASTER basing on CODEC at the first place while
the other bits are same.

Signed-off-by: Nicolin Chen <Guangyu.Chen@xxxxxxxxxxxxx>
---
Hi Nicolin,
This patch is an improvement, but in my opinion the binding is still a bit confusing.

How about changing 'frame-master' and 'bitclock-master' to 'codec-frame-master' and 'codec-bitclock-master'. We could possibly keep the old names as aliases until all the .dts files out there have been fixed.

At the same go we could add SND_SOC_DAIFMT_MASTER_MASK here:

> /* get CPU/CODEC common format via simple-audio-card,format */
> priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
> (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);

or leave the masking out all together. Can't see why SND_SOC_DAIFMT_CONT/GATED could not be defined at dai-link level too.

This way the norm would be defining the daifmt at link level. We could still keep the possibility to overwrite the setting at dai level if there is need for that.

Best regards,
Jyri
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/