kernel: bump 5.4 to 5.4.73
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch
index 2d770d0e4e876cdbbfc5af3e8c08255d99a98f79..793936d376d1c8fd631714d66505a4f029354020 100644 (file)
@@ -277,7 +277,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
                dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
-@@ -933,8 +1027,8 @@ static int fsl_sai_probe(struct platform
+@@ -936,8 +1030,8 @@ static int fsl_sai_probe(struct platform
                                   MCLK_DIR(index));
        }
  
@@ -288,7 +288,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
        sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;
  
-@@ -947,7 +1041,7 @@ static int fsl_sai_probe(struct platform
+@@ -950,7 +1044,7 @@ static int fsl_sai_probe(struct platform
        if (ret)
                goto err_pm_disable;
  
@@ -297,7 +297,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);
                if (ret)
                        goto err_pm_disable;
-@@ -993,6 +1087,9 @@ static int fsl_sai_runtime_suspend(struc
+@@ -996,6 +1090,9 @@ static int fsl_sai_runtime_suspend(struc
  
        clk_disable_unprepare(sai->bus_clk);
  
@@ -307,7 +307,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        regcache_cache_only(sai->regmap, true);
        regcache_mark_dirty(sai->regmap);
  
-@@ -1022,6 +1119,10 @@ static int fsl_sai_runtime_resume(struct
+@@ -1025,6 +1122,10 @@ static int fsl_sai_runtime_resume(struct
                        goto disable_tx_clk;
        }
  
@@ -412,8 +412,8 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
        unsigned int mclk_id[2];
        unsigned int mclk_streams;
-@@ -146,6 +173,8 @@ struct fsl_sai {
+@@ -147,6 +174,8 @@ struct fsl_sai {
+       struct snd_soc_dai_driver cpu_dai_drv;
        struct snd_dmaengine_dai_dma_data dma_params_rx;
        struct snd_dmaengine_dai_dma_data dma_params_tx;
 +      const struct fsl_sai_soc_data *soc;