summaryrefslogtreecommitdiffstats
path: root/sound/soc/generic/simple-card-utils.c
diff options
context:
space:
mode:
authorKuninori Morimoto2018-11-21 03:10:51 +0100
committerMark Brown2018-11-21 14:28:34 +0100
commita48bf02b35d9325eedb56ab531038511695a2734 (patch)
treee85508ba96a97f73af18bd0ec05ed8dd791c7e83 /sound/soc/generic/simple-card-utils.c
parentASoC: simple-card-utils: accept NULL parameter on asoc_simple_card_xxx() (diff)
downloadkernel-qcow2-linux-a48bf02b35d9325eedb56ab531038511695a2734.tar.gz
kernel-qcow2-linux-a48bf02b35d9325eedb56ab531038511695a2734.tar.xz
kernel-qcow2-linux-a48bf02b35d9325eedb56ab531038511695a2734.zip
ASoC: simple-card-utils: tidyup asoc_simple_card_parse_convert()
Current simple-card-utils has asoc_simple_card_parse_convert() to parse convert channel/rate for be_hw_params_fixup. But, it is parsing from top of node. If sound card had multi subnode, we need to parse it from each sub node. This patch tidyup asoc_simple_card_parse_convert() to allow parsing settings from each node. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic/simple-card-utils.c')
-rw-r--r--sound/soc/generic/simple-card-utils.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index f3183a4718b3..a16373193b56 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -32,10 +32,11 @@ void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data,
}
EXPORT_SYMBOL_GPL(asoc_simple_card_convert_fixup);
-void asoc_simple_card_parse_convert(struct device *dev, char *prefix,
+void asoc_simple_card_parse_convert(struct device *dev,
+ struct device_node *np,
+ char *prefix,
struct asoc_simple_card_data *data)
{
- struct device_node *np = dev->of_node;
char prop[128];
if (!prefix)