ASoC: rt5665: increase LDO level
Subsystems (3)
PATCH 1/8 ASoC: rt5665: increase LDO level
Too low LDO level will cause a few functions unstable.
--- sound/soc/codecs/rt5665.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5665.c +1 -1
@@ -4798,7 +4798,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c,/* Enhance performance*/ regmap_update_bits (rt5665->regmap,RT5665_PWR_ANLG_1 ,RT5665_HP_DRIVER_MASK |RT5665_LDO1_DVO_MASK , -RT5665_HP_DRIVER_5X |RT5665_LDO1_DVO_09 ); +RT5665_HP_DRIVER_5X |RT5665_LDO1_DVO_12 );INIT_DELAYED_WORK (&rt5665->jack_detect_work, rt5665_jack_detect_handler);
Signature · 1 line
2.7.4
PATCH 2/8 ASoC: rt5665: enhance jack type detection function
Use manual mode for jack detection function to increase accuracy.
--- sound/soc/codecs/rt5665.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5665.c +5 -2
@@ -1192,10 +1192,13 @@ static int rt5665_headset_detect(struct snd_soc_codec *codec, int jack_insert) }regmap_update_bits (rt5665->regmap,RT5665_EJD_CTRL_1 , -0x180 ,0x180 ); +0x1a0 ,0x120 );regmap_write (rt5665->regmap,RT5665_EJD_CTRL_3 ,0x3424 ); +regmap_write (rt5665->regmap,RT5665_IL_CMD_1 ,0x0048 );regmap_write (rt5665->regmap,RT5665_SAR_IL_CMD_1 ,0xa291 ); +usleep_range (10000 ,15000 ); + rt5665->sar_adc_value =snd_soc_read (rt5665->codec,RT5665_SAR_IL_CMD_4 ) &0x7ff ;
@@ -4779,7 +4782,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c,regmap_write (rt5665->regmap,RT5665_HP_LOGIC_CTRL_2 ,0x0002 );regmap_update_bits (rt5665->regmap,RT5665_EJD_CTRL_1 , -0xf000 |RT5665_VREF_POW_MASK ,0xd000 |RT5665_VREF_POW_REG ); +0xf000 |RT5665_VREF_POW_MASK ,0xe000 |RT5665_VREF_POW_REG );/* Work around for pow_pump */ regmap_update_bits (rt5665->regmap,RT5665_STO1_DAC_SIL_DET ,RT5665_DEB_STO_DAC_MASK ,RT5665_DEB_80_MS );
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5665: enhance jack type detection function" to the asoc tree
The patch
ASoC: rt5665: enhance jack type detection function
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
39841944c651f2e019d6e77aceb349a2695d8e2dMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 8 Mar 2017 19:05:30 +0800
Subject: [PATCH] ASoC: rt5665: enhance jack type detection function
Use manual mode for jack detection function to increase accuracy.
--- sound/soc/codecs/rt5665.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5665.c +5 -2
@@ -1193,10 +1193,13 @@ static int rt5665_headset_detect(struct snd_soc_codec *codec, int jack_insert) }regmap_update_bits (rt5665->regmap,RT5665_EJD_CTRL_1 , -0x180 ,0x180 ); +0x1a0 ,0x120 );regmap_write (rt5665->regmap,RT5665_EJD_CTRL_3 ,0x3424 ); +regmap_write (rt5665->regmap,RT5665_IL_CMD_1 ,0x0048 );regmap_write (rt5665->regmap,RT5665_SAR_IL_CMD_1 ,0xa291 ); +usleep_range (10000 ,15000 ); + rt5665->sar_adc_value =snd_soc_read (rt5665->codec,RT5665_SAR_IL_CMD_4 ) &0x7ff ;
@@ -4788,7 +4791,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c,regmap_write (rt5665->regmap,RT5665_HP_LOGIC_CTRL_2 ,0x0002 );regmap_update_bits (rt5665->regmap,RT5665_EJD_CTRL_1 , -0xf000 |RT5665_VREF_POW_MASK ,0xd000 |RT5665_VREF_POW_REG ); +0xf000 |RT5665_VREF_POW_MASK ,0xe000 |RT5665_VREF_POW_REG );/* Work around for pow_pump */ regmap_update_bits (rt5665->regmap,RT5665_STO1_DAC_SIL_DET ,RT5665_DEB_STO_DAC_MASK ,RT5665_DEB_80_MS );
Signature · 1 line
2.11.0
PATCH 3/8 ASoC: rt5665: Vref3 is necessary for Mono Amp
In reply to Bard LiaoVref3 is necessary for Mono Amp. So add it to dapm routes
--- sound/soc/codecs/rt5665.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5665.c +1 -0
@@ -3915,6 +3915,7 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { {"Mono MIX", "MONOVOL Switch", "MONOVOL"}, {"Mono Amp", NULL, "Mono MIX"}, {"Mono Amp", NULL, "Vref2"}, + {"Mono Amp", NULL, "Vref3"}, {"Mono Amp", NULL, "CLKDET SYS"}, {"Mono Amp", NULL, "CLKDET MONO"}, {"Mono Playback", "Switch", "Mono Amp"},
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5665: Vref3 is necessary for Mono Amp" to the asoc tree
The patch
ASoC: rt5665: Vref3 is necessary for Mono Amp
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
8f365313beb20742b68cb29a7d1ca6b27c036d81Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 8 Mar 2017 19:05:31 +0800
Subject: [PATCH] ASoC: rt5665: Vref3 is necessary for Mono Amp
Vref3 is necessary for Mono Amp. So add it to dapm routes
--- sound/soc/codecs/rt5665.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5665.c +1 -0
@@ -3912,6 +3912,7 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { {"Mono MIX", "MONOVOL Switch", "MONOVOL"}, {"Mono Amp", NULL, "Mono MIX"}, {"Mono Amp", NULL, "Vref2"}, + {"Mono Amp", NULL, "Vref3"}, {"Mono Amp", NULL, "CLKDET SYS"}, {"Mono Amp", NULL, "CLKDET MONO"}, {"Mono Playback", "Switch", "Mono Amp"},
Signature · 1 line
2.11.0
PATCH 4/8 ASoC: rt5665: CLKDET is also a power of ASRC
In reply to Bard LiaoWe need to power on CLKDET to use ASRC function.
--- sound/soc/codecs/rt5665.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/rt5665.c +3 -0
@@ -3181,6 +3181,9 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { {"DAC Mono Right Filter", NULL, "DAC Mono R ASRC", is_using_asrc}, {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc}, {"DAC Stereo2 Filter", NULL, "DAC STO2 ASRC", is_using_asrc}, + {"I2S1 ASRC", NULL, "CLKDET"}, + {"I2S2 ASRC", NULL, "CLKDET"}, + {"I2S3 ASRC", NULL, "CLKDET"},/*Vref*/ {"Mic Det Power", NULL, "Vref2"},
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5665: CLKDET is also a power of ASRC" to the asoc tree
The patch
ASoC: rt5665: CLKDET is also a power of ASRC
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
09b50c3703cc354100fe36202ef5e52ee128b904Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 8 Mar 2017 19:05:32 +0800
Subject: [PATCH] ASoC: rt5665: CLKDET is also a power of ASRC
We need to power on CLKDET to use ASRC function.
--- sound/soc/codecs/rt5665.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/rt5665.c +3 -0
@@ -3178,6 +3178,9 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { {"DAC Mono Right Filter", NULL, "DAC Mono R ASRC", is_using_asrc}, {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc}, {"DAC Stereo2 Filter", NULL, "DAC STO2 ASRC", is_using_asrc}, + {"I2S1 ASRC", NULL, "CLKDET"}, + {"I2S2 ASRC", NULL, "CLKDET"}, + {"I2S3 ASRC", NULL, "CLKDET"},/*Vref*/ {"Mic Det Power", NULL, "Vref2"},
Signature · 1 line
2.11.0
PATCH 5/8 ASoC: rt5665: increase button detection accuracy
In reply to Bard LiaoUse sar adc for button detection to increase accuracy.
--- sound/soc/codecs/rt5665.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/rt5665.c +2 -1
@@ -1139,7 +1139,8 @@ static void rt5665_enable_push_button_irq(struct snd_soc_codec *codec, bool enable) {if (enable) { -snd_soc_write (codec,RT5665_4BTN_IL_CMD_1 ,0x000b ); +snd_soc_write (codec,RT5665_4BTN_IL_CMD_1 ,0x0003 ); +snd_soc_update_bits (codec,RT5665_SAR_IL_CMD_9 ,0x1 ,0x1 );snd_soc_write (codec,RT5665_IL_CMD_1 ,0x0048 ); snd_soc_update_bits(codec, RT5665_4BTN_IL_CMD_2, RT5665_4BTN_IL_MASK | RT5665_4BTN_IL_RST_MASK,
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5665: increase button detection accuracy" to the asoc tree
The patch
ASoC: rt5665: increase button detection accuracy
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
246126b0a4f24f8e88f148c9d0d6d72e6fafe6ccMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 8 Mar 2017 19:05:33 +0800
Subject: [PATCH] ASoC: rt5665: increase button detection accuracy
Use sar adc for button detection to increase accuracy.
--- sound/soc/codecs/rt5665.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/rt5665.c +2 -1
@@ -1139,7 +1139,8 @@ static void rt5665_enable_push_button_irq(struct snd_soc_codec *codec, bool enable) {if (enable) { -snd_soc_write (codec,RT5665_4BTN_IL_CMD_1 ,0x000b ); +snd_soc_write (codec,RT5665_4BTN_IL_CMD_1 ,0x0003 ); +snd_soc_update_bits (codec,RT5665_SAR_IL_CMD_9 ,0x1 ,0x1 );snd_soc_write (codec,RT5665_IL_CMD_1 ,0x0048 ); snd_soc_update_bits(codec, RT5665_4BTN_IL_CMD_2, RT5665_4BTN_IL_MASK | RT5665_4BTN_IL_RST_MASK,
Signature · 1 line
2.11.0
PATCH 6/8 ASoC: rt5665: move set_pll to codec level
In reply to Bard LiaoMove set_pll function to codec level and people can use it at both codec and dai level.
--- sound/soc/codecs/rt5665.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/rt5665.c +5 -5
@@ -4163,10 +4163,10 @@ static int rt5665_set_dai_sysclk(struct snd_soc_dai *dai,return 0 ; } -static int rt5665_set_dai_pll (struct snd_soc_dai *dai,int pll_id,int Source, -unsigned int freq_in,unsigned int freq_out) +static int rt5665_set_codec_pll (struct snd_soc_codec *codec,int pll_id, +int source,unsigned int freq_in, +unsigned int freq_out) { -struct snd_soc_codec *codec = dai->codec;struct rt5665_priv *rt5665 =snd_soc_codec_get_drvdata (codec);struct rl6231_pll_code pll_code;int ret;
@@ -4399,7 +4399,6 @@ static const struct snd_soc_dai_ops rt5665_aif_dai_ops = { .set_fmt = rt5665_set_dai_fmt, .set_sysclk = rt5665_set_dai_sysclk, .set_tdm_slot = rt5665_set_tdm_slot, - .set_pll = rt5665_set_dai_pll, .set_bclk_ratio = rt5665_set_bclk_ratio, };
@@ -4508,7 +4507,8 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5665 = { .num_dapm_widgets = ARRAY_SIZE(rt5665_dapm_widgets), .dapm_routes = rt5665_dapm_routes, .num_dapm_routes = ARRAY_SIZE(rt5665_dapm_routes), - } + }, + .set_pll = rt5665_set_codec_pll, };
Signature · 1 line
2.7.4
A message that is not in the archive (sent off-list or not yet received): ABFD875FF5FB574BA706497D987D48D701C36CAA@RTITEXTEMP.realtek.com.tw
Mark Brown
maintainerRe: [PATCH 6/8] ASoC: rt5665: move set_pll to codec level
Quoted 4 lines · Bard Liao
This patch doesn't use lower case of 's'ource in the function body. Could we apply the first 5 patches if there is no comment?
Or ignore the error and I will send a patch to lower case in the function body?
I'll skip this patch, please send a new version.
PATCH 7/8 ASoC: rt5665: move set_sysclk to codec level
In reply to Bard LiaoMove set_sysclk to codec level and people can use it at both codec and dai level.
--- sound/soc/codecs/rt5665.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
sound/soc/codecs/rt5665.c +3 -4
@@ -4129,10 +4129,9 @@ static int rt5665_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)return 0 ; } -static int rt5665_set_dai_sysclk (struct snd_soc_dai *dai, -int clk_id,unsigned int freq,int dir) +static int rt5665_set_codec_sysclk (struct snd_soc_codec *codec,int clk_id, +int source,unsigned int freq,int dir) { -struct snd_soc_codec *codec = dai->codec;struct rt5665_priv *rt5665 =snd_soc_codec_get_drvdata (codec);unsigned int reg_val =0 ;
@@ -4397,7 +4396,6 @@ static int rt5665_resume(struct snd_soc_codec *codec)static const struct snd_soc_dai_ops rt5665_aif_dai_ops = { .hw_params = rt5665_hw_params, .set_fmt = rt5665_set_dai_fmt, - .set_sysclk = rt5665_set_dai_sysclk, .set_tdm_slot = rt5665_set_tdm_slot, .set_bclk_ratio = rt5665_set_bclk_ratio, };
@@ -4508,6 +4506,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5665 = { .dapm_routes = rt5665_dapm_routes, .num_dapm_routes = ARRAY_SIZE(rt5665_dapm_routes), }, + .set_sysclk = rt5665_set_codec_sysclk, .set_pll = rt5665_set_codec_pll, };
Signature · 1 line
2.7.4
PATCH 8/8 ASoC: rt5665: enable TDM if more than 2 channels
In reply to Bard LiaoTDM is necessary for more than 2 channels. And there is no control bit to specify which slots are using. Machine driver will not need to call snd_soc_dai_set_tdm_slot if we do it in rt5665_hw_params.
--- sound/soc/codecs/rt5665.c | 114 ++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 55 deletions(-)
sound/soc/codecs/rt5665.c +59 -55
@@ -3967,6 +3967,62 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { {"PDMR", NULL, "PDM R Playback"}, }; +static int rt5665_set_tdm_slot (struct snd_soc_dai *dai,unsigned int tx_mask, +unsigned int rx_mask,int slots,int slot_width) +{ +struct snd_soc_codec *codec = dai->codec; +unsigned int val =0 ; + +if (rx_mask || tx_mask) + val |=RT5665_I2S1_MODE_TDM ; + +switch (slots) { +case 4 : + val |=RT5665_TDM_IN_CH_4 ; + val |=RT5665_TDM_OUT_CH_4 ; +break ; +case 6 : + val |=RT5665_TDM_IN_CH_6 ; + val |=RT5665_TDM_OUT_CH_6 ; +break ; +case 8 : + val |=RT5665_TDM_IN_CH_8 ; + val |=RT5665_TDM_OUT_CH_8 ; +break ; +case 2 : +break ; +default : +return -EINVAL ; + } + +switch (slot_width) { +case 20 : + val |=RT5665_TDM_IN_LEN_20 ; + val |=RT5665_TDM_OUT_LEN_20 ; +break ; +case 24 : + val |=RT5665_TDM_IN_LEN_24 ; + val |=RT5665_TDM_OUT_LEN_24 ; +break ; +case 32 : + val |=RT5665_TDM_IN_LEN_32 ; + val |=RT5665_TDM_OUT_LEN_32 ; +break ; +case 16 : +break ; +default : +return -EINVAL ; + } + +snd_soc_update_bits (codec,RT5665_TDM_CTRL_1 , +RT5665_I2S1_MODE_MASK |RT5665_TDM_IN_CH_MASK | +RT5665_TDM_OUT_CH_MASK |RT5665_TDM_IN_LEN_MASK | +RT5665_TDM_OUT_LEN_MASK , val); + +return 0 ; +} + +static int rt5665_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai) {
@@ -4013,6 +4069,9 @@ static int rt5665_hw_params(struct snd_pcm_substream *substream,switch (dai->id) {case RT5665_AIF1_1 :case RT5665_AIF1_2 : +if (params_channels (params) >2 ) +rt5665_set_tdm_slot (dai,0xf ,0xf , +params_channels (params),params_width (params)); mask_clk =RT5665_I2S_PD1_MASK ; val_clk = pre_div <<RT5665_I2S_PD1_SFT ; snd_soc_update_bits(codec, RT5665_I2S1_SDP,
@@ -4229,61 +4288,6 @@ static int rt5665_set_codec_pll(struct snd_soc_codec *codec, int pll_id,return 0 ; } -static int rt5665_set_tdm_slot (struct snd_soc_dai *dai,unsigned int tx_mask, -unsigned int rx_mask,int slots,int slot_width) -{ -struct snd_soc_codec *codec = dai->codec; -unsigned int val =0 ; - -if (rx_mask || tx_mask) - val |=RT5665_I2S1_MODE_TDM ; - -switch (slots) { -case 4 : - val |=RT5665_TDM_IN_CH_4 ; - val |=RT5665_TDM_OUT_CH_4 ; -break ; -case 6 : - val |=RT5665_TDM_IN_CH_6 ; - val |=RT5665_TDM_OUT_CH_6 ; -break ; -case 8 : - val |=RT5665_TDM_IN_CH_8 ; - val |=RT5665_TDM_OUT_CH_8 ; -break ; -case 2 : -break ; -default : -return -EINVAL ; - } - -switch (slot_width) { -case 20 : - val |=RT5665_TDM_IN_LEN_20 ; - val |=RT5665_TDM_OUT_LEN_20 ; -break ; -case 24 : - val |=RT5665_TDM_IN_LEN_24 ; - val |=RT5665_TDM_OUT_LEN_24 ; -break ; -case 32 : - val |=RT5665_TDM_IN_LEN_32 ; - val |=RT5665_TDM_OUT_LEN_32 ; -break ; -case 16 : -break ; -default : -return -EINVAL ; - } - -snd_soc_update_bits (codec,RT5665_TDM_CTRL_1 , -RT5665_I2S1_MODE_MASK |RT5665_TDM_IN_CH_MASK | -RT5665_TDM_OUT_CH_MASK |RT5665_TDM_IN_LEN_MASK | -RT5665_TDM_OUT_LEN_MASK , val); - -return 0 ; -} -static int rt5665_set_bclk_ratio (struct snd_soc_dai *dai,unsigned int ratio) {struct snd_soc_codec *codec = dai->codec;
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5665: enable TDM if more than 2 channels" to the asoc tree
The patch
ASoC: rt5665: enable TDM if more than 2 channels
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
948059ddf93f4dfbb1f2f00885d2172b835a03b1Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 8 Mar 2017 19:05:36 +0800
Subject: [PATCH] ASoC: rt5665: enable TDM if more than 2 channels
TDM is necessary for more than 2 channels. And there is no control bit to specify which slots are using. Machine driver will not need to call snd_soc_dai_set_tdm_slot if we do it in rt5665_hw_params.
--- sound/soc/codecs/rt5665.c | 114 ++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 55 deletions(-)
sound/soc/codecs/rt5665.c +59 -55
@@ -3964,6 +3964,62 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { {"PDMR", NULL, "PDM R Playback"}, }; +static int rt5665_set_tdm_slot (struct snd_soc_dai *dai,unsigned int tx_mask, +unsigned int rx_mask,int slots,int slot_width) +{ +struct snd_soc_codec *codec = dai->codec; +unsigned int val =0 ; + +if (rx_mask || tx_mask) + val |=RT5665_I2S1_MODE_TDM ; + +switch (slots) { +case 4 : + val |=RT5665_TDM_IN_CH_4 ; + val |=RT5665_TDM_OUT_CH_4 ; +break ; +case 6 : + val |=RT5665_TDM_IN_CH_6 ; + val |=RT5665_TDM_OUT_CH_6 ; +break ; +case 8 : + val |=RT5665_TDM_IN_CH_8 ; + val |=RT5665_TDM_OUT_CH_8 ; +break ; +case 2 : +break ; +default : +return -EINVAL ; + } + +switch (slot_width) { +case 20 : + val |=RT5665_TDM_IN_LEN_20 ; + val |=RT5665_TDM_OUT_LEN_20 ; +break ; +case 24 : + val |=RT5665_TDM_IN_LEN_24 ; + val |=RT5665_TDM_OUT_LEN_24 ; +break ; +case 32 : + val |=RT5665_TDM_IN_LEN_32 ; + val |=RT5665_TDM_OUT_LEN_32 ; +break ; +case 16 : +break ; +default : +return -EINVAL ; + } + +snd_soc_update_bits (codec,RT5665_TDM_CTRL_1 , +RT5665_I2S1_MODE_MASK |RT5665_TDM_IN_CH_MASK | +RT5665_TDM_OUT_CH_MASK |RT5665_TDM_IN_LEN_MASK | +RT5665_TDM_OUT_LEN_MASK , val); + +return 0 ; +} + +static int rt5665_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai) {
@@ -4010,6 +4066,9 @@ static int rt5665_hw_params(struct snd_pcm_substream *substream,switch (dai->id) {case RT5665_AIF1_1 :case RT5665_AIF1_2 : +if (params_channels (params) >2 ) +rt5665_set_tdm_slot (dai,0xf ,0xf , +params_channels (params),params_width (params)); mask_clk =RT5665_I2S_PD1_MASK ; val_clk = pre_div <<RT5665_I2S_PD1_SFT ; snd_soc_update_bits(codec, RT5665_I2S1_SDP,
@@ -4227,61 +4286,6 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source,return 0 ; } -static int rt5665_set_tdm_slot (struct snd_soc_dai *dai,unsigned int tx_mask, -unsigned int rx_mask,int slots,int slot_width) -{ -struct snd_soc_codec *codec = dai->codec; -unsigned int val =0 ; - -if (rx_mask || tx_mask) - val |=RT5665_I2S1_MODE_TDM ; - -switch (slots) { -case 4 : - val |=RT5665_TDM_IN_CH_4 ; - val |=RT5665_TDM_OUT_CH_4 ; -break ; -case 6 : - val |=RT5665_TDM_IN_CH_6 ; - val |=RT5665_TDM_OUT_CH_6 ; -break ; -case 8 : - val |=RT5665_TDM_IN_CH_8 ; - val |=RT5665_TDM_OUT_CH_8 ; -break ; -case 2 : -break ; -default : -return -EINVAL ; - } - -switch (slot_width) { -case 20 : - val |=RT5665_TDM_IN_LEN_20 ; - val |=RT5665_TDM_OUT_LEN_20 ; -break ; -case 24 : - val |=RT5665_TDM_IN_LEN_24 ; - val |=RT5665_TDM_OUT_LEN_24 ; -break ; -case 32 : - val |=RT5665_TDM_IN_LEN_32 ; - val |=RT5665_TDM_OUT_LEN_32 ; -break ; -case 16 : -break ; -default : -return -EINVAL ; - } - -snd_soc_update_bits (codec,RT5665_TDM_CTRL_1 , -RT5665_I2S1_MODE_MASK |RT5665_TDM_IN_CH_MASK | -RT5665_TDM_OUT_CH_MASK |RT5665_TDM_IN_LEN_MASK | -RT5665_TDM_OUT_LEN_MASK , val); - -return 0 ; -} -static int rt5665_set_bclk_ratio (struct snd_soc_dai *dai,unsigned int ratio) {struct snd_soc_codec *codec = dai->codec;
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: rt5665: increase LDO level" to the asoc tree
In reply to Bard LiaoThe patch
ASoC: rt5665: increase LDO level
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
593dd5d9fb66c0345cef5fc8caf4199bb6d4e093Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 8 Mar 2017 19:05:29 +0800
Subject: [PATCH] ASoC: rt5665: increase LDO level
Too low LDO level will cause a few functions unstable.
--- sound/soc/codecs/rt5665.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5665.c +1 -1
@@ -4798,7 +4798,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c,/* Enhance performance*/ regmap_update_bits (rt5665->regmap,RT5665_PWR_ANLG_1 ,RT5665_HP_DRIVER_MASK |RT5665_LDO1_DVO_MASK , -RT5665_HP_DRIVER_5X |RT5665_LDO1_DVO_09 ); +RT5665_HP_DRIVER_5X |RT5665_LDO1_DVO_12 );INIT_DELAYED_WORK (&rt5665->jack_detect_work, rt5665_jack_detect_handler);
Signature · 1 line
2.11.0