Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: rockchip: rockchip_max98090: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

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/878qpt8owv.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
edca7ad5 8410a099

+4 -4
+4 -4
sound/soc/rockchip/rockchip_max98090.c
··· 247 247 .ops = &rk_aif1_ops, 248 248 /* set max98090 as slave */ 249 249 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 250 - SND_SOC_DAIFMT_CBS_CFS, 250 + SND_SOC_DAIFMT_CBC_CFC, 251 251 SND_SOC_DAILINK_REG(analog), 252 252 }, 253 253 }; ··· 260 260 .init = rk_hdmi_init, 261 261 .ops = &rk_aif1_ops, 262 262 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 263 - SND_SOC_DAIFMT_CBS_CFS, 263 + SND_SOC_DAIFMT_CBC_CFC, 264 264 SND_SOC_DAILINK_REG(hdmi), 265 265 } 266 266 }; ··· 274 274 .ops = &rk_aif1_ops, 275 275 /* set max98090 as slave */ 276 276 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 277 - SND_SOC_DAIFMT_CBS_CFS, 277 + SND_SOC_DAIFMT_CBC_CFC, 278 278 SND_SOC_DAILINK_REG(analog), 279 279 }, 280 280 [DAILINK_HDMI] = { ··· 283 283 .init = rk_hdmi_init, 284 284 .ops = &rk_aif1_ops, 285 285 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 286 - SND_SOC_DAIFMT_CBS_CFS, 286 + SND_SOC_DAIFMT_CBC_CFC, 287 287 SND_SOC_DAILINK_REG(hdmi), 288 288 } 289 289 };