diff mbox series

ASoC: fsl_sai: Revert "ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode"

Message ID 20230706221827.1938990-1-festevam@gmail.com
State New
Headers show
Series ASoC: fsl_sai: Revert "ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode" | expand

Commit Message

Fabio Estevam July 6, 2023, 10:18 p.m. UTC 
From: Fabio Estevam <festevam@denx.de>

This reverts commit ff87d619ac180444db297f043962a5c325ded47b.

Andreas reports that on an i.MX8MP-based system where MCLK needs to be
used as an input, the MCLK pin is actually an output, despite not having
the 'fsl,sai-mclk-direction-output' property present in the devicetree.

This is caused by commit ff87d619ac18 ("ASoC: fsl_sai: Enable
MCTL_MCLK_EN bit for master mode") that sets FSL_SAI_MCTL_MCLK_EN
unconditionally for imx8mm/8mn/8mp/93, causing the MCLK to always
be configured as output.

FSL_SAI_MCTL_MCLK_EN corresponds to the MOE (MCLK Output Enable) bit
of register MCR and the drivers sets it when the
'fsl,sai-mclk-direction-output' devicetree property is present.

Revert the commit to allow SAI to use MCLK as input as well.

Cc: stable@vger.kernel.org
Fixes: ff87d619ac18 ("ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode")
Reported-by: Andreas Henriksson <andreas@fatal.se>
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 sound/soc/fsl/fsl_sai.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Shengjiu Wang July 7, 2023, 2:32 a.m. UTC | #1 
On Fri, Jul 7, 2023 at 6:18 AM Fabio Estevam <festevam@gmail.com> wrote:

> From: Fabio Estevam <festevam@denx.de>
>
> This reverts commit ff87d619ac180444db297f043962a5c325ded47b.
>
> Andreas reports that on an i.MX8MP-based system where MCLK needs to be
> used as an input, the MCLK pin is actually an output, despite not having
> the 'fsl,sai-mclk-direction-output' property present in the devicetree.
>
> This is caused by commit ff87d619ac18 ("ASoC: fsl_sai: Enable
> MCTL_MCLK_EN bit for master mode") that sets FSL_SAI_MCTL_MCLK_EN
> unconditionally for imx8mm/8mn/8mp/93, causing the MCLK to always
> be configured as output.
>
> FSL_SAI_MCTL_MCLK_EN corresponds to the MOE (MCLK Output Enable) bit
> of register MCR and the drivers sets it when the
> 'fsl,sai-mclk-direction-output' devicetree property is present.
>
> Revert the commit to allow SAI to use MCLK as input as well.
>
> Cc: stable@vger.kernel.org
> Fixes: ff87d619ac18 ("ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master
> mode")
> Reported-by: Andreas Henriksson <andreas@fatal.se>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
>

Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>

Best regards
Wang Shengjiu

> ---
>  sound/soc/fsl/fsl_sai.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index 5e09f634c61b..54b4bf3744c6 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -507,12 +507,6 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai,
> bool tx, u32 freq)
>                                    savediv / 2 - 1);
>         }
>
> -       if (sai->soc_data->max_register >= FSL_SAI_MCTL) {
> -               /* SAI is in master mode at this point, so enable MCLK */
> -               regmap_update_bits(sai->regmap, FSL_SAI_MCTL,
> -                                  FSL_SAI_MCTL_MCLK_EN,
> FSL_SAI_MCTL_MCLK_EN);
> -       }
> -
>         return 0;
>  }
>
> --
> 2.34.1
>
>
Mark Brown July 11, 2023, 9:21 p.m. UTC | #2 
On Thu, 06 Jul 2023 19:18:27 -0300, Fabio Estevam wrote:
> This reverts commit ff87d619ac180444db297f043962a5c325ded47b.
> 
> Andreas reports that on an i.MX8MP-based system where MCLK needs to be
> used as an input, the MCLK pin is actually an output, despite not having
> the 'fsl,sai-mclk-direction-output' property present in the devicetree.
> 
> This is caused by commit ff87d619ac18 ("ASoC: fsl_sai: Enable
> MCTL_MCLK_EN bit for master mode") that sets FSL_SAI_MCTL_MCLK_EN
> unconditionally for imx8mm/8mn/8mp/93, causing the MCLK to always
> be configured as output.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: fsl_sai: Revert "ASoC: fsl_sai: Enable MCTL_MCLK_EN bit for master mode"
      commit: 86867aca7330e4fbcfa2a117e20b48bbb6c758a9

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 5e09f634c61b..54b4bf3744c6 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -507,12 +507,6 @@  static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
 				   savediv / 2 - 1);
 	}
 
-	if (sai->soc_data->max_register >= FSL_SAI_MCTL) {
-		/* SAI is in master mode at this point, so enable MCLK */
-		regmap_update_bits(sai->regmap, FSL_SAI_MCTL,
-				   FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN);
-	}
-
 	return 0;
 }