]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: meson: meson-card-utils: use inclusive language for SND_SOC_DAIFMT_CBx_CFx
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 26 Feb 2025 01:37:02 +0000 (01:37 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 3 Mar 2025 12:58:54 +0000 (12:58 +0000)
In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87y0xta3lt.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/meson/meson-card-utils.c

index 1a4ef124e4e259502085f217d06e580afd3febbb..cfc7f6e41ab5c462d58ccafe40b043e2029911c7 100644 (file)
@@ -119,10 +119,10 @@ unsigned int meson_card_parse_daifmt(struct device_node *node,
        /* If no master is provided, default to cpu master */
        if (!bitclkmaster || bitclkmaster == cpu_node) {
                daifmt |= (!framemaster || framemaster == cpu_node) ?
-                       SND_SOC_DAIFMT_CBS_CFS : SND_SOC_DAIFMT_CBS_CFM;
+                       SND_SOC_DAIFMT_CBC_CFC : SND_SOC_DAIFMT_CBC_CFP;
        } else {
                daifmt |= (!framemaster || framemaster == cpu_node) ?
-                       SND_SOC_DAIFMT_CBM_CFS : SND_SOC_DAIFMT_CBM_CFM;
+                       SND_SOC_DAIFMT_CBP_CFC : SND_SOC_DAIFMT_CBP_CFP;
        }
 
        of_node_put(bitclkmaster);