ASoC: fsl_sai: MCLK bind with TX/RX enable bit

[ Upstream commit 3e4a826129980fed0e3e746a7822f2f204dfc24a ]

On i.MX8MP, the sai MCLK is bound with TX/RX enable bit,
which means the TX/RE enable bit need to be enabled then
MCLK can be output on PAD.

Some codec (for example: WM8962) needs the MCLK output
earlier, otherwise there will be issue for codec
configuration.

Add new soc data "mclk_with_tere" for this platform and
enable the MCLK output in startup stage.

As "mclk_with_tere" only applied to i.MX8MP, currently
The soc data is shared with i.MX8MN, so need to add
an i.MX8MN own soc data with "mclk_with_tere" disabled.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com
Link: https://lore.kernel.org/r/1683273322-2525-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org
Stable-dep-of: 197c53c8ecb3 ("ASoC: fsl_sai: Don't disable bitclock for i.MX8MP")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 2c17d16f842ea18a6974d138894dda03e273cf15..08a33832f6b3f7ed5fab41c458d18de4e368c0c5 100644 (file)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1401,7 +1401,9 @@ static int fsl_sai_probe(struct platform_device *pdev)
                sai->cpu_dai_drv.symmetric_sample_bits = 0;
        }
 
-       if (of_property_read_bool(np, "fsl,sai-mclk-direction-output") &&
+       sai->mclk_direction_output = of_property_read_bool(np, "fsl,sai-mclk-direction-output");
+
+       if (sai->mclk_direction_output &&
            of_device_is_compatible(np, "fsl,imx6ul-sai")) {
                gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
                if (IS_ERR(gpr)) {
@@ -1442,7 +1444,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
                dev_warn(dev, "Error reading SAI version: %d\n", ret);
 
        /* Select MCLK direction */
-       if (of_property_read_bool(np, "fsl,sai-mclk-direction-output") &&
+       if (sai->mclk_direction_output &&
            sai->soc_data->max_register >= FSL_SAI_MCTL) {
                regmap_update_bits(sai->regmap, FSL_SAI_MCTL,
                                   FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN);
@@ -1560,6 +1562,17 @@ static const struct fsl_sai_soc_data fsl_sai_imx8mm_data = {
        .max_register = FSL_SAI_MCTL,
 };
 
+static const struct fsl_sai_soc_data fsl_sai_imx8mn_data = {
+       .use_imx_pcm = true,
+       .use_edma = false,
+       .fifo_depth = 128,
+       .reg_offset = 8,
+       .mclk0_is_mclk1 = false,
+       .pins = 8,
+       .flags = 0,
+       .max_register = FSL_SAI_MDIV,
+};
+
 static const struct fsl_sai_soc_data fsl_sai_imx8mp_data = {
        .use_imx_pcm = true,
        .use_edma = false,
@@ -1569,6 +1582,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx8mp_data = {
        .pins = 8,
        .flags = 0,
        .max_register = FSL_SAI_MDIV,
+       .mclk_with_tere = true,
 };
 
 static const struct fsl_sai_soc_data fsl_sai_imx8ulp_data = {
@@ -1592,7 +1606,7 @@ static const struct of_device_id fsl_sai_ids[] = {
        { .compatible = "fsl,imx8mm-sai", .data = &fsl_sai_imx8mm_data },
        { .compatible = "fsl,imx8mp-sai", .data = &fsl_sai_imx8mp_data },
        { .compatible = "fsl,imx8ulp-sai", .data = &fsl_sai_imx8ulp_data },
-       { .compatible = "fsl,imx8mn-sai", .data = &fsl_sai_imx8mp_data },
+       { .compatible = "fsl,imx8mn-sai", .data = &fsl_sai_imx8mn_data },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, fsl_sai_ids);
@@ -1656,6 +1670,10 @@ static int fsl_sai_runtime_resume(struct device *dev)
        if (ret)
                goto disable_rx_clk;
 
+       if (sai->soc_data->mclk_with_tere && sai->mclk_direction_output)
+               regmap_update_bits(sai->regmap, FSL_SAI_TCSR(ofs),
+                                  FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE);
+
        return 0;
 
 disable_rx_clk:

diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index caad5b0ac4ff47e120f769798195dd59f97e4212..b4d616a44023cb98f94fd1780d2a3bd879ab20f2 100644 (file)
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -232,6 +232,7 @@ struct fsl_sai_soc_data {
        bool use_imx_pcm;
        bool use_edma;
        bool mclk0_is_mclk1;
+       bool mclk_with_tere;
        unsigned int fifo_depth;
        unsigned int pins;
        unsigned int reg_offset;
@@ -288,6 +289,7 @@ struct fsl_sai {
        bool synchronous[2];
        struct fsl_sai_dl_cfg *dl_cfg;
        unsigned int dl_cfg_cnt;
+       bool mclk_direction_output;
 
        unsigned int mclk_id[2];
        unsigned int mclk_streams;