diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-05-12 01:36:40 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-12 15:30:29 +0100 |
| commit | de1965159a34951a86267d13db4f2a67234139d3 (patch) | |
| tree | 762b42fba6fee43d210f83817d3dcbdb45802d4a /sound | |
| parent | ee057d2ee73259f455cfbb7a4db808fc6b6405dd (diff) | |
| download | linux-de1965159a34951a86267d13db4f2a67234139d3.tar.bz2 | |
rcar: src: skip disabled-SRC nodes
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/src.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 15d6ffe8be74..e39f916d0f2f 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -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++; } |