summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-08-05 00:51:08 +0200
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-08-12 15:00:17 +0200
commitff71334a46844d0ae6ff0055c549790bcd27bb10 (patch)
tree08c04a7d44c17737bd19a3b29571fd3e99946dda /sound/soc/fsl
parentasoc/multi-component: fsl: fix exit and error paths in DMA and SSI drivers (diff)
downloadlinux-ff71334a46844d0ae6ff0055c549790bcd27bb10.tar.xz
linux-ff71334a46844d0ae6ff0055c549790bcd27bb10.zip
asoc/multi-component: fsl: add support for disabled SSI nodes
Add support for adding "status = disabled" to an SSI node to incidate that it is not wired on the board. This replaces the not-so-intuitive previous method of omitting a codec-handle property. Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/fsl_ssi.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 00e3e625b52a..7939c337ed9d 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -625,12 +625,19 @@ static int __devinit fsl_ssi_probe(struct of_device *of_dev,
struct resource res;
char name[64];
- /* We are only interested in SSIs with a codec phandle in them, so let's
- * make sure this SSI has one.
+ /* SSIs that are not connected on the board should have a
+ * status = "disabled"
+ * property in their device tree nodes.
*/
- if (!of_get_property(np, "codec-handle", NULL))
+ if (!of_device_is_available(np))
return -ENODEV;
+ /* Check for a codec-handle property. */
+ if (!of_get_property(np, "codec-handle", NULL)) {
+ dev_err(&of_dev->dev, "missing codec-handle property\n");
+ return -ENODEV;
+ }
+
/* We only support the SSI in "I2S Slave" mode */
sprop = of_get_property(np, "fsl,mode", NULL);
if (!sprop || strcmp(sprop, "i2s-slave")) {