summaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch b/target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch
index 793936d376..0e35a7c79a 100644
--- a/target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch
+++ b/target/linux/layerscape/patches-5.4/801-audio-0018-MLK-13574-2-ASoC-fsl_sai-refine-driver-for-ip-upgrad.patch
@@ -76,7 +76,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
static const unsigned int fsl_sai_rates[] = {
8000, 11025, 12000, 16000, 22050,
24000, 32000, 44100, 48000, 64000,
-@@ -505,6 +541,29 @@ static int fsl_sai_hw_params(struct snd_
+@@ -506,6 +542,29 @@ static int fsl_sai_hw_params(struct snd_
}
}
@@ -106,7 +106,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx),
FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK,
val_cr4);
-@@ -563,14 +622,16 @@ static int fsl_sai_trigger(struct snd_pc
+@@ -564,14 +623,16 @@ static int fsl_sai_trigger(struct snd_pc
FSL_SAI_CSR_FRDE, FSL_SAI_CSR_FRDE);
for (i = 0; tx && i < channels; i++)
@@ -126,7 +126,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
FSL_SAI_CSR_xIE_MASK, FSL_SAI_FLAGS);
-@@ -641,8 +702,8 @@ static int fsl_sai_startup(struct snd_pc
+@@ -642,8 +703,8 @@ static int fsl_sai_startup(struct snd_pc
else
sai->is_stream_opened[tx] = true;
@@ -137,7 +137,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints);
-@@ -659,7 +720,7 @@ static void fsl_sai_shutdown(struct snd_
+@@ -660,7 +721,7 @@ static void fsl_sai_shutdown(struct snd_
regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
if (sai->is_stream_opened[tx]) {
@@ -146,7 +146,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
sai->is_stream_opened[tx] = false;
}
}
-@@ -687,7 +748,7 @@ static int fsl_sai_dai_probe(struct snd_
+@@ -688,7 +749,7 @@ static int fsl_sai_dai_probe(struct snd_
regmap_write(sai->regmap, FSL_SAI_RCSR, 0);
regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK,
@@ -155,7 +155,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,
FSL_SAI_MAXBURST_RX - 1);
-@@ -732,7 +793,8 @@ static struct reg_default fsl_sai_reg_de
+@@ -733,7 +794,8 @@ static struct reg_default fsl_sai_reg_de
{FSL_SAI_TCR3, 0},
{FSL_SAI_TCR4, 0},
{FSL_SAI_TCR5, 0},
@@ -165,7 +165,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
{FSL_SAI_TMR, 0},
{FSL_SAI_RCR1, 0},
{FSL_SAI_RCR2, 0},
-@@ -751,7 +813,8 @@ static bool fsl_sai_readable_reg(struct
+@@ -752,7 +814,8 @@ static bool fsl_sai_readable_reg(struct
case FSL_SAI_TCR3:
case FSL_SAI_TCR4:
case FSL_SAI_TCR5:
@@ -175,7 +175,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
case FSL_SAI_TMR:
case FSL_SAI_RCSR:
case FSL_SAI_RCR1:
-@@ -759,8 +822,10 @@ static bool fsl_sai_readable_reg(struct
+@@ -760,8 +823,10 @@ static bool fsl_sai_readable_reg(struct
case FSL_SAI_RCR3:
case FSL_SAI_RCR4:
case FSL_SAI_RCR5:
@@ -188,7 +188,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
case FSL_SAI_RMR:
return true;
default:
-@@ -773,9 +838,12 @@ static bool fsl_sai_volatile_reg(struct
+@@ -774,9 +839,12 @@ static bool fsl_sai_volatile_reg(struct
switch (reg) {
case FSL_SAI_TCSR:
case FSL_SAI_RCSR:
@@ -204,7 +204,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
return true;
default:
return false;
-@@ -791,7 +859,8 @@ static bool fsl_sai_writeable_reg(struct
+@@ -792,7 +860,8 @@ static bool fsl_sai_writeable_reg(struct
case FSL_SAI_TCR3:
case FSL_SAI_TCR4:
case FSL_SAI_TCR5:
@@ -214,7 +214,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
case FSL_SAI_TMR:
case FSL_SAI_RCSR:
case FSL_SAI_RCR1:
-@@ -820,9 +889,19 @@ static const struct regmap_config fsl_sa
+@@ -821,9 +890,19 @@ static const struct regmap_config fsl_sa
.cache_type = REGCACHE_FLAT,
};
@@ -234,7 +234,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
struct fsl_sai *sai;
struct regmap *gpr;
struct resource *res;
-@@ -837,11 +916,12 @@ static int fsl_sai_probe(struct platform
+@@ -838,11 +917,12 @@ static int fsl_sai_probe(struct platform
sai->pdev = pdev;
@@ -250,7 +250,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
-@@ -873,11 +953,25 @@ static int fsl_sai_probe(struct platform
+@@ -874,11 +954,25 @@ static int fsl_sai_probe(struct platform
sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp);
if (IS_ERR(sai->mclk_clk[i])) {
dev_err(&pdev->dev, "failed to get mclk%d clock: %ld\n",
@@ -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);
-@@ -936,8 +1030,8 @@ static int fsl_sai_probe(struct platform
+@@ -937,8 +1031,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;
-@@ -950,7 +1044,7 @@ static int fsl_sai_probe(struct platform
+@@ -951,7 +1045,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;
-@@ -996,6 +1090,9 @@ static int fsl_sai_runtime_suspend(struc
+@@ -997,6 +1091,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);
-@@ -1025,6 +1122,10 @@ static int fsl_sai_runtime_resume(struct
+@@ -1026,6 +1123,10 @@ static int fsl_sai_runtime_resume(struct
goto disable_tx_clk;
}