Unverified Commit fcd444bf authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: pl1022_ds: Update to modern clocking terminology 



As part of moving to remove the old style defines for the bus clocks update
the pl1022_ds driver to use more modern terminology for clocking.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20210921213542.31688-15-broonie@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8a7f299b

sound/soc/fsl/p1022_ds.c

+8 −8
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int p1022_ds_probe(struct platform_device *pdev) 


	if (strcasecmp(sprop, "i2s-slave") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM;

			SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBP_CFP;

		mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;
@@ -293,37 +293,37 @@ static int p1022_ds_probe(struct platform_device *pdev) 
		mdata->clk_frequency = be32_to_cpup(iprop);

	} else if (strcasecmp(sprop, "i2s-master") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS;

			SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC;

		mdata->codec_clk_direction = SND_SOC_CLOCK_IN;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;

	} else if (strcasecmp(sprop, "lj-slave") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM;

			SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBP_CFP;

		mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;

	} else if (strcasecmp(sprop, "lj-master") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBS_CFS;

			SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBC_CFC;

		mdata->codec_clk_direction = SND_SOC_CLOCK_IN;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;

	} else if (strcasecmp(sprop, "rj-slave") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBM_CFM;

			SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBP_CFP;

		mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;

	} else if (strcasecmp(sprop, "rj-master") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBS_CFS;

			SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBC_CFC;

		mdata->codec_clk_direction = SND_SOC_CLOCK_IN;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;

	} else if (strcasecmp(sprop, "ac97-slave") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBM_CFM;

			SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBP_CFP;

		mdata->codec_clk_direction = SND_SOC_CLOCK_OUT;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_IN;

	} else if (strcasecmp(sprop, "ac97-master") == 0) {

		mdata->dai_format = SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBS_CFS;

			SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBC_CFC;

		mdata->codec_clk_direction = SND_SOC_CLOCK_IN;

		mdata->cpu_clk_direction = SND_SOC_CLOCK_OUT;

	} else {