The two DAIs of the kirkwood controller have a unique PCM format.

The simple-card sets the audio hardware definitions of all CPU DAIs. The PCM format is defined only when it is present in the DT.

This patch prevents the controller to raise an error when the DT audio card definition by the simple card contains the PCM format of one CPU DAI only.

Signed-off-by: Jean-Francois Moine moinejf@free.fr --- sound/soc/kirkwood/kirkwood-i2s.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 0704cd6..26d5f85 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -45,6 +45,8 @@ static int kirkwood_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned long value;

switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case 0: + return 0; /* already done (simple-card) */ case SND_SOC_DAIFMT_RIGHT_J: mask = KIRKWOOD_I2S_CTL_RJ; break;