diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-01-20 20:35:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-21 19:48:00 +0100 |
| commit | ae1f8ce1925645b047394a59d4108e27fad9a9d8 (patch) | |
| tree | 44e0c508e43c217602da7efd207d3482a55ff25d /sound | |
| parent | Merge tag 'asoc-v3.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| download | linux-ae1f8ce1925645b047394a59d4108e27fad9a9d8.tar.xz linux-ae1f8ce1925645b047394a59d4108e27fad9a9d8.zip | |
ASoC: fsl_ssi: We do support master mode now
Since commit aafa85e71a (ASoC: fsl_ssi: Add DAI master mode support for SSI on
i.MX series) master mode is supported, so update the comments and code to
reflect that.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index f9090b167ad7..c5205690791e 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1262,18 +1262,13 @@ static int fsl_ssi_probe(struct platform_device *pdev) return -EINVAL; hw_type = (enum fsl_ssi_type) of_id->data; - /* We only support the SSI in "I2S Slave" mode */ sprop = of_get_property(np, "fsl,mode", NULL); if (!sprop) { dev_err(&pdev->dev, "fsl,mode property is necessary\n"); return -EINVAL; } - if (!strcmp(sprop, "ac97-slave")) { + if (!strcmp(sprop, "ac97-slave")) ac97 = true; - } else if (strcmp(sprop, "i2s-slave")) { - dev_notice(&pdev->dev, "mode %s is unsupported\n", sprop); - return -ENODEV; - } /* The DAI name is the last part of the full name of the node. */ p = strrchr(np->full_name, '/') + 1; |