]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: meson: switch to use snd_soc_daifmt_parse_format/clock_provider()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 14 Jun 2021 00:58:05 +0000 (09:58 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 21 Jun 2021 12:05:20 +0000 (13:05 +0100)
This patch switch to use snd_soc_daifmt_parse_format/clock_provider() from
snd_soc_of_parse_daifmt().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/8735tlw9cy.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/meson/meson-card-utils.c

index 300ac8be46ef8c62cee0fb5bd51627de6383949f..415cc0046e4b42f4e95fcf818bfb9f1d8a25477c 100644 (file)
@@ -119,9 +119,9 @@ unsigned int meson_card_parse_daifmt(struct device_node *node,
        struct device_node *framemaster = NULL;
        unsigned int daifmt;
 
-       daifmt = snd_soc_of_parse_daifmt(node, "",
-                                        &bitclkmaster, &framemaster);
-       daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
+       daifmt = snd_soc_daifmt_parse_format(node, NULL);
+
+       snd_soc_daifmt_parse_clock_provider_as_phandle(node, NULL, &bitclkmaster, &framemaster);
 
        /* If no master is provided, default to cpu master */
        if (!bitclkmaster || bitclkmaster == cpu_node) {