aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/meson
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2021-06-14 09:58:05 +0900
committerMark Brown <broonie@kernel.org>2021-06-21 13:05:20 +0100
commit0c4c7a9667daf52c88cfc7fe44201ff653eab8f9 (patch)
treebacb7fd7fdf40442d4d8a3833d97e403ca20d531 /sound/soc/meson
parentASoC: fsl: switch to use snd_soc_daifmt_parse_format/clock_provider() (diff)
downloadwireguard-linux-0c4c7a9667daf52c88cfc7fe44201ff653eab8f9.tar.xz
wireguard-linux-0c4c7a9667daf52c88cfc7fe44201ff653eab8f9.zip
ASoC: meson: switch to use snd_soc_daifmt_parse_format/clock_provider()
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>
Diffstat (limited to 'sound/soc/meson')
-rw-r--r--sound/soc/meson/meson-card-utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c
index 300ac8be46ef..415cc0046e4b 100644
--- a/sound/soc/meson/meson-card-utils.c
+++ b/sound/soc/meson/meson-card-utils.c
@@ -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) {