OSDN Git Service

ASoC: audio-graph-scu-card: remove endpoint bidirectional check
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 6 Nov 2018 04:36:41 +0000 (04:36 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 6 Nov 2018 17:37:34 +0000 (17:37 +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-scu-card.c

index b83bb31..ba7b0cf 100644 (file)
@@ -186,7 +186,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
        struct device_node *cpu_port;
        struct device_node *cpu_ep;
        struct device_node *codec_ep;
-       struct device_node *rcpu_ep;
        struct device_node *codec_port;
        struct device_node *codec_port_old;
        unsigned int daifmt = 0;
@@ -217,22 +216,13 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
                cpu_port = it.node;
                cpu_ep   = of_get_next_child(cpu_port, NULL);
                codec_ep = of_graph_get_remote_endpoint(cpu_ep);
-               rcpu_ep  = of_graph_get_remote_endpoint(codec_ep);
 
                of_node_put(cpu_ep);
                of_node_put(codec_ep);
-               of_node_put(rcpu_ep);
 
                if (!codec_ep)
                        continue;
 
-               if (rcpu_ep != cpu_ep) {
-                       dev_err(dev, "remote-endpoint missmatch (%s/%s/%s)\n",
-                               cpu_ep->name, codec_ep->name, rcpu_ep->name);
-                       ret = -EINVAL;
-                       goto parse_of_err;
-               }
-
                ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep,
                                                            NULL, &daifmt);
                if (ret < 0) {