ASoC: rt1019: Fix the TDM settings
Subsystems (3)
PATCH 1/1 ASoC: rt1019: Fix the TDM settings
From: Derek Fang <[email protected]>
Complete the missing and correct the TDM settings.
--- sound/soc/codecs/rt1019.c | 20 +++++++++++--------- sound/soc/codecs/rt1019.h | 6 ++++++ 2 files changed, 17 insertions(+), 9 deletions(-)
sound/soc/codecs/rt1019.c +11 -9
@@ -391,18 +391,18 @@ static int rt1019_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { struct snd_soc_component *component = dai->component; -unsigned int val =0 , rx_slotnum; +unsigned int cn =0 , cl =0 , rx_slotnum;int ret =0 , first_bit;switch (slots) {case 4 : - val |=RT1019_I2S_TX_4CH ; + cn =RT1019_I2S_TX_4CH ;break ;case 6 : - val |=RT1019_I2S_TX_6CH ; + cn =RT1019_I2S_TX_6CH ;break ;case 8 : - val |=RT1019_I2S_TX_8CH ; + cn =RT1019_I2S_TX_8CH ;break ;case 2 :break ;
@@ -412,16 +412,16 @@ static int rt1019_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,switch (slot_width) {case 20 : - val |=RT1019_I2S_DL_20 ; + cl =RT1019_TDM_CL_20 ;break ;case 24 : - val |=RT1019_I2S_DL_24 ; + cl =RT1019_TDM_CL_24 ;break ;case 32 : - val |=RT1019_I2S_DL_32 ; + cl =RT1019_TDM_CL_32 ;break ;case 8 : - val |=RT1019_I2S_DL_8 ; + cl =RT1019_TDM_CL_8 ;break ;case 16 :break ;
@@ -470,8 +470,10 @@ static int rt1019_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, goto _set_tdm_err_; } +snd_soc_component_update_bits (component,RT1019_TDM_1 , +RT1019_TDM_CL_MASK , cl);snd_soc_component_update_bits (component,RT1019_TDM_2 , -RT1019_I2S_CH_TX_MASK |RT1019_I2S_DF_MASK , val); +RT1019_I2S_CH_TX_MASK , cn); _set_tdm_err_:return ret;
sound/soc/codecs/rt1019.h +6 -0
@@ -95,6 +95,12 @@#define RT1019_TDM_BCLK_MASK (0x1 << 6)#define RT1019_TDM_BCLK_NORM (0x0 << 6)#define RT1019_TDM_BCLK_INV (0x1 << 6) +#define RT1019_TDM_CL_MASK (0x7) +#define RT1019_TDM_CL_8 (0x4) +#define RT1019_TDM_CL_32 (0x3) +#define RT1019_TDM_CL_24 (0x2) +#define RT1019_TDM_CL_20 (0x1) +#define RT1019_TDM_CL_16 (0x0)/* 0x0401 TDM Control-2 */ #define RT1019_I2S_CH_TX_MASK (0x3 << 6)
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 5 lines · On Wed, 12 Oct 2022 11:01:02 +0800, [email protected] wrote:
From: Derek Fang <[email protected]>
Complete the missing and correct the TDM settings.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: rt1019: Fix the TDM settings
commit: f2635d45a750182c6d5de15e2d6b059e0c302d7e
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