]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: simple-card-utils: remove strict limitation of bit/frame master
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 25 May 2017 01:51:31 +0000 (01:51 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 May 2017 11:40:53 +0000 (12:40 +0100)
Current asoc_simple_card_parse_daifmt is keeping backward compatibility
for bitmaster/framemaster which didn't use phandle.
The keep compatibility, it is checking prefix length, but it is
too strict. let's loosen it. Otherwise, OF-graph base sound card
which doesn't have prefix can't detect daifmt.

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

index fe726e83d0bd8144d5bfb8101a24d762ee65a1bf..9c7f5b91b90acb4fa6aaa7c7104f57dae4c20824 100644 (file)
@@ -21,14 +21,13 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
 {
        struct device_node *bitclkmaster = NULL;
        struct device_node *framemaster = NULL;
-       int prefix_len = prefix ? strlen(prefix) : 0;
        unsigned int daifmt;
 
        daifmt = snd_soc_of_parse_daifmt(node, prefix,
                                         &bitclkmaster, &framemaster);
        daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
 
-       if (prefix_len && !bitclkmaster && !framemaster) {
+       if (!bitclkmaster && !framemaster) {
                /*
                 * No dai-link level and master setting was not found from
                 * sound node level, revert back to legacy DT parsing and