ASoC: audio-graph-card: tidyup convert_rate/channel method

Current audio-graph-card is handling "convert_rate/channel"
by many ways. But, it is not useful and readable.
We want to do is that allow having it everywere.
This patch support it.
It will be overwrote if lower node has it.

sound {
	convert-channels = <xxx>; // initial
};

codec {
	audio-graph-card,convert-channels = <xxx>; // overwrite
	ports {
		convert_channels = <xxx>; // overwrite
		port {
			convert_channels = <xxx>; // overwrite
			endpoint {
				convert_channels = <xxx>; // overwrite
			};
		};
	};
};

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 7e32380e7a6fe29a5eb6373f66512787741e86b7..368b8ae463af458c9406cacdc75821c4a2828025 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -35,7 +35,6 @@ struct graph_card_data {
        struct asoc_simple_jack mic_jack;
        struct snd_soc_dai_link *dai_link;
        struct asoc_simple_dai *dais;
-       struct asoc_simple_card_data adata;
        struct snd_soc_codec_conf *codec_conf;
        struct gpio_desc *pa_gpio;
 };
@@ -167,9 +166,6 @@ static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
 
        asoc_simple_card_convert_fixup(&dai_props->adata, params);
 
-       /* overwrite by top level adata if exist */
-       asoc_simple_card_convert_fixup(&priv->adata, params);
-
        return 0;
 }
 
@@ -197,6 +193,13 @@ static int asoc_graph_card_dai_link_of_dpcm(struct device_node *top,
        of_property_read_u32(ports, "mclk-fs", &dai_props->mclk_fs);
        of_property_read_u32(port,  "mclk-fs", &dai_props->mclk_fs);
        of_property_read_u32(ep,    "mclk-fs", &dai_props->mclk_fs);
+
+       asoc_simple_card_parse_convert(dev, top,   NULL,   &dai_props->adata);
+       asoc_simple_card_parse_convert(dev, node,  PREFIX, &dai_props->adata);
+       asoc_simple_card_parse_convert(dev, ports, NULL,   &dai_props->adata);
+       asoc_simple_card_parse_convert(dev, port,  NULL,   &dai_props->adata);
+       asoc_simple_card_parse_convert(dev, ep,    NULL,   &dai_props->adata);
+
        of_node_put(ports);
        of_node_put(port);
 
@@ -276,8 +279,6 @@ static int asoc_graph_card_dai_link_of_dpcm(struct device_node *top,
                                                     PREFIX "prefix");
        }
 
-       asoc_simple_card_parse_convert(dev, node, PREFIX, &dai_props->adata);
-
        ret = asoc_simple_card_of_parse_tdm(ep, dai);
        if (ret)
                return ret;
@@ -409,8 +410,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
        if (ret < 0)
                return ret;
 
-       asoc_simple_card_parse_convert(dev, node, NULL, &priv->adata);
-
        link_idx        = 0;
        dai_idx         = 0;
        conf_idx        = 0;