]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rcar: src: skip disabled-SRC nodes
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Wed, 11 May 2016 22:36:40 +0000 (01:36 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 12 May 2016 14:30:29 +0000 (15:30 +0100)
The current device tree representation of the R-Car Sample Rate Converters
(SRC) assumes that they are numbered consecutively, starting from 0. Alas,
this  is not  the case with the R8A7794 SoC where SRC0 isn't present.  In
order to keep the existing  device trees working, I'm suggesting to use a
disabled node for SRC0.  Teach the SRC probe  to just skip disabled nodes.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/src.c

index 15d6ffe8be74da83b61e4cbe28f10bcc669cd845..e39f916d0f2fa811b1faece1d212b0f8fe1fc5d8 100644 (file)
@@ -572,6 +572,9 @@ int rsnd_src_probe(struct rsnd_priv *priv)
 
        i = 0;
        for_each_child_of_node(node, np) {
+               if (!of_device_is_available(np))
+                       goto skip;
+
                src = rsnd_src_get(priv, i);
 
                snprintf(name, RSND_SRC_NAME_SIZE, "%s.%d",
@@ -595,6 +598,7 @@ int rsnd_src_probe(struct rsnd_priv *priv)
                if (ret)
                        goto rsnd_src_probe_done;
 
+skip:
                i++;
        }