diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch | 118 |
1 files changed, 118 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch b/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch new file mode 100644 index 0000000000..2fb5789ef3 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch @@ -0,0 +1,118 @@ +From 06d8069b308a1655e0c248b6bd556e63d9b38099 Mon Sep 17 00:00:00 2001 +From: Viorel Suman <viorel.suman@nxp.com> +Date: Wed, 3 May 2017 10:16:02 +0300 +Subject: [PATCH] ASoC: fsl_sai: handle slave mode per TX/RX direction + +The SAI interface can be a clock supplier or consummer +as function of stream direction, ie when interacting +with I2S XTOR. Removed FSL_SAI_RFR define as it is now +referred as FSL_SAI_RFR0. + +Signed-off-by: Viorel Suman <viorel.suman@nxp.com> +--- + sound/soc/fsl/fsl_sai.c | 18 +++++++++--------- + sound/soc/fsl/fsl_sai.h | 3 +-- + 2 files changed, 10 insertions(+), 11 deletions(-) + +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -300,7 +300,7 @@ static int fsl_sai_set_dai_fmt_tr(struct + return -EINVAL; + } + +- sai->is_slave_mode = false; ++ sai->slave_mode[tx] = false; + + /* DAI clock master masks */ + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { +@@ -310,7 +310,7 @@ static int fsl_sai_set_dai_fmt_tr(struct + sai->is_slave_mode = false; + break; + case SND_SOC_DAIFMT_CBM_CFM: +- sai->is_slave_mode = true; ++ sai->slave_mode[tx] = true; + break; + case SND_SOC_DAIFMT_CBS_CFM: + val_cr2 |= FSL_SAI_CR2_BCD_MSTR; +@@ -318,7 +318,7 @@ static int fsl_sai_set_dai_fmt_tr(struct + break; + case SND_SOC_DAIFMT_CBM_CFS: + val_cr4 |= FSL_SAI_CR4_FSD_MSTR; +- sai->is_slave_mode = true; ++ sai->slave_mode[tx] = true; + break; + default: + return -EINVAL; +@@ -359,7 +359,7 @@ static int fsl_sai_set_bclk(struct snd_s + int ret = 0; + + /* Don't apply to slave mode */ +- if (sai->is_slave_mode) ++ if (sai->slave_mode[tx]) + return 0; + + for (id = 0; id < FSL_SAI_MCLK_MAX; id++) { +@@ -454,7 +454,7 @@ static int fsl_sai_hw_params(struct snd_ + if (sai->slot_width) + slot_width = sai->slot_width; + +- if (!sai->is_slave_mode) { ++ if (!sai->slave_mode[tx]) { + ret = fsl_sai_set_bclk(cpu_dai, tx, + slots * slot_width * params_rate(params)); + if (ret) +@@ -490,7 +490,7 @@ static int fsl_sai_hw_params(struct snd_ + * error. + */ + +- if (!sai->is_slave_mode) { ++ if (!sai->slave_mode[tx]) { + if (!sai->synchronous[TX] && sai->synchronous[RX] && !tx) { + regmap_update_bits(sai->regmap, FSL_SAI_TCR4, + FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK, +@@ -519,7 +519,7 @@ static int fsl_sai_hw_params(struct snd_ + * error. + */ + +- if (!sai->is_slave_mode) { ++ if (!sai->slave_mode[tx]) { + if (!sai->synchronous[TX] && sai->synchronous[RX] && !tx) { + regmap_update_bits(sai->regmap, FSL_SAI_TCR4, + FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK, +@@ -577,7 +577,7 @@ static int fsl_sai_hw_free(struct snd_pc + struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + +- if (!sai->is_slave_mode && ++ if (!sai->slave_mode[tx] && + sai->mclk_streams & BIT(substream->stream)) { + clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[tx]]); + sai->mclk_streams &= ~BIT(substream->stream); +@@ -672,7 +672,7 @@ static int fsl_sai_trigger(struct snd_pc + * This is a hardware bug, and will be fix in the + * next sai version. + */ +- if (!sai->is_slave_mode) { ++ if (!sai->slave_mode[tx]) { + /* Software Reset for both Tx and Rx */ + regmap_write(sai->regmap, + FSL_SAI_TCSR, FSL_SAI_CSR_SR); +--- a/sound/soc/fsl/fsl_sai.h ++++ b/sound/soc/fsl/fsl_sai.h +@@ -37,7 +37,6 @@ + #define FSL_SAI_RDR1 0xa4 /* SAI Receive Data */ + #define FSL_SAI_RFR0 0xc0 /* SAI Receive FIFO */ + #define FSL_SAI_RFR1 0xc4 /* SAI Receive FIFO */ +-#define FSL_SAI_RFR 0xc0 /* SAI Receive FIFO */ + #define FSL_SAI_RMR 0xe0 /* SAI Receive Mask */ + + #define FSL_SAI_xCSR(tx) (tx ? FSL_SAI_TCSR : FSL_SAI_RCSR) +@@ -158,7 +157,7 @@ struct fsl_sai { + struct clk *bus_clk; + struct clk *mclk_clk[FSL_SAI_MCLK_MAX]; + +- bool is_slave_mode; ++ bool slave_mode[2]; + bool is_lsb_first; + bool is_dsp_mode; + bool sai_on_imx; |