]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ASoC: audio-graph-card: remove endpoint bidirectional check
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 6 Nov 2018 04:36:27 +0000 (04:36 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 6 Nov 2018 17:35:19 +0000 (17:35 +0000)
DTC commit df536831d02c ("checks: add graph binding checks")
is checking endpoint bidirectional, and it is upstreamed to linux by
commit 50aafd60898a ("scripts/dtc: Update to upstream version
v1.4.6-21-g84e414b0b5bc").
Let's remove own bidirectional check

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/audio-graph-card.c

index 25c819e402e1853c003efe4fde40cfa59ac34074..26eb6ff9b9f37b18dbc3deeb87215aa8b9de4479 100644 (file)
@@ -167,16 +167,8 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port,
        struct asoc_simple_dai *codec_dai = &dai_props->codec_dai;
        struct device_node *cpu_ep    = of_get_next_child(cpu_port, NULL);
        struct device_node *codec_ep = of_graph_get_remote_endpoint(cpu_ep);
-       struct device_node *rcpu_ep = of_graph_get_remote_endpoint(codec_ep);
        int ret;
 
-       if (rcpu_ep != cpu_ep) {
-               dev_err(dev, "remote-endpoint mismatch (%s/%s/%s)\n",
-                       cpu_ep->name, codec_ep->name, rcpu_ep->name);
-               ret = -EINVAL;
-               goto dai_link_of_err;
-       }
-
        ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep,
                                            NULL, &dai_link->dai_fmt);
        if (ret < 0)
@@ -228,7 +220,6 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port,
 
 dai_link_of_err:
        of_node_put(cpu_ep);
-       of_node_put(rcpu_ep);
        of_node_put(codec_ep);
 
        return ret;