Unverified Commit 8fcfd349 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: fsl-asoc-card: Update to modern clocking terminology 



As part of moving to remove the old style defines for the bus clocks update
the fsl-asoc-card 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-2-broonie@kernel.org


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

sound/soc/fsl/fsl-asoc-card.c

+27 −27
Original line number Diff line number Diff line
@@ -356,8 +356,8 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, 
	 * If only 4 wires are needed, just set SSI into

	 * synchronous mode and enable 4 PADs in IOMUX.

	 */

	switch (priv->dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	switch (priv->dai_fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

		int_ptcr = IMX_AUDMUX_V2_PTCR_RFSEL(8 | ext_port) |

			   IMX_AUDMUX_V2_PTCR_RCSEL(8 | ext_port) |

			   IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |
@@ -367,7 +367,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, 
			   IMX_AUDMUX_V2_PTCR_TFSDIR |

			   IMX_AUDMUX_V2_PTCR_TCLKDIR;

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

	case SND_SOC_DAIFMT_CBP_CFC:

		int_ptcr = IMX_AUDMUX_V2_PTCR_RCSEL(8 | ext_port) |

			   IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) |

			   IMX_AUDMUX_V2_PTCR_RCLKDIR |
@@ -377,7 +377,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, 
			   IMX_AUDMUX_V2_PTCR_RFSDIR |

			   IMX_AUDMUX_V2_PTCR_TFSDIR;

		break;

	case SND_SOC_DAIFMT_CBS_CFM:

	case SND_SOC_DAIFMT_CBC_CFP:

		int_ptcr = IMX_AUDMUX_V2_PTCR_RFSEL(8 | ext_port) |

			   IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |

			   IMX_AUDMUX_V2_PTCR_RFSDIR |
@@ -387,7 +387,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, 
			   IMX_AUDMUX_V2_PTCR_RCLKDIR |

			   IMX_AUDMUX_V2_PTCR_TCLKDIR;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		ext_ptcr = IMX_AUDMUX_V2_PTCR_RFSEL(8 | int_port) |

			   IMX_AUDMUX_V2_PTCR_RCSEL(8 | int_port) |

			   IMX_AUDMUX_V2_PTCR_TFSEL(int_port) |
@@ -533,8 +533,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	struct device_node *cpu_np, *codec_np, *asrc_np;

	struct device_node *np = pdev->dev.of_node;

	struct platform_device *asrc_pdev = NULL;

	struct device_node *bitclkmaster = NULL;

	struct device_node *framemaster = NULL;

	struct device_node *bitclkprovider = NULL;

	struct device_node *frameprovider = NULL;

	struct platform_device *cpu_pdev;

	struct fsl_asoc_card_priv *priv;

	struct device *codec_dev = NULL;
@@ -617,29 +617,29 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT;

		priv->cpu_priv.sysclk_dir[RX] = SND_SOC_CLOCK_OUT;

		priv->cpu_priv.slot_width = 32;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-cs427x")) {

		codec_dai_name = "cs4271-hifi";

		priv->codec_priv.mclk_id = CS427x_SYSCLK_MCLK;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-sgtl5000")) {

		codec_dai_name = "sgtl5000";

		priv->codec_priv.mclk_id = SGTL5000_SYSCLK;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic32x4")) {

		codec_dai_name = "tlv320aic32x4-hifi";

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8962")) {

		codec_dai_name = "wm8962";

		priv->codec_priv.mclk_id = WM8962_SYSCLK_MCLK;

		priv->codec_priv.fll_id = WM8962_SYSCLK_FLL;

		priv->codec_priv.pll_id = WM8962_FLL;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8960")) {

		codec_dai_name = "wm8960-hifi";

		priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO;

		priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-ac97")) {

		codec_dai_name = "ac97-hifi";

		priv->dai_fmt = SND_SOC_DAIFMT_AC97;
@@ -648,7 +648,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	} else if (of_device_is_compatible(np, "fsl,imx-audio-mqs")) {

		codec_dai_name = "fsl-mqs-dai";

		priv->dai_fmt = SND_SOC_DAIFMT_LEFT_J |

				SND_SOC_DAIFMT_CBS_CFS |

				SND_SOC_DAIFMT_CBC_CFC |

				SND_SOC_DAIFMT_NB_NF;

		priv->dai_link[1].dpcm_capture = 0;

		priv->dai_link[2].dpcm_capture = 0;
@@ -656,7 +656,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8524")) {

		codec_dai_name = "wm8524-hifi";

		priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;

		priv->dai_link[1].dpcm_capture = 0;

		priv->dai_link[2].dpcm_capture = 0;

		priv->cpu_priv.slot_width = 32;
@@ -664,12 +664,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);

	} else if (of_device_is_compatible(np, "fsl,imx-audio-si476x")) {

		codec_dai_name = "si476x-codec";

		priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;

		priv->card.dapm_routes = audio_map_rx;

		priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_rx);

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8958")) {

		codec_dai_name = "wm8994-aif1";

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

		priv->codec_priv.mclk_id = WM8994_FLL_SRC_MCLK1;

		priv->codec_priv.fll_id = WM8994_SYSCLK_FLL1;

		priv->codec_priv.pll_id = WM8994_FLL1;
@@ -683,29 +683,29 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	}



	/* Format info from DT is optional. */

	snd_soc_daifmt_parse_clock_provider_as_phandle(np, NULL, &bitclkmaster, &framemaster);

	if (bitclkmaster || framemaster) {

	snd_soc_daifmt_parse_clock_provider_as_phandle(np, NULL, &bitclkprovider, &frameprovider);

	if (bitclkprovider || frameprovider) {

		unsigned int daifmt = snd_soc_daifmt_parse_format(np, NULL);



		if (codec_np == bitclkmaster)

			daifmt |= (codec_np == framemaster) ?

				SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS;

		if (codec_np == bitclkprovider)

			daifmt |= (codec_np == frameprovider) ?

				SND_SOC_DAIFMT_CBP_CFP : SND_SOC_DAIFMT_CBP_CFC;

		else

			daifmt |= (codec_np == framemaster) ?

				SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS;

			daifmt |= (codec_np == frameprovider) ?

				SND_SOC_DAIFMT_CBC_CFP : SND_SOC_DAIFMT_CBC_CFC;



		/* Override dai_fmt with value from DT */

		priv->dai_fmt = daifmt;

	}



	/* Change direction according to format */

	if (priv->dai_fmt & SND_SOC_DAIFMT_CBM_CFM) {

	if (priv->dai_fmt & SND_SOC_DAIFMT_CBP_CFP) {

		priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_IN;

		priv->cpu_priv.sysclk_dir[RX] = SND_SOC_CLOCK_IN;

	}



	of_node_put(bitclkmaster);

	of_node_put(framemaster);

	of_node_put(bitclkprovider);

	of_node_put(frameprovider);



	if (!fsl_asoc_card_is_ac97(priv) && !codec_dev) {

		dev_dbg(&pdev->dev, "failed to find codec device\n");