ASoC: rt5682: Update calibration function
Subsystems (3)
PATCH 1/2 ASoC: rt5682: Update calibration function
From: Shuming Fan <[email protected]>
New calibration sequence allows rt5682 do calibration without MCLK.
--- sound/soc/codecs/rt5682.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
sound/soc/codecs/rt5682.c +5 -17
@@ -2454,27 +2454,15 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)regmap_write (rt5682->regmap,RT5682_PWR_ANLG_1 ,0xa2bf );usleep_range (15000 ,20000 );regmap_write (rt5682->regmap,RT5682_PWR_ANLG_1 ,0xf2bf ); -regmap_write (rt5682->regmap,RT5682_MICBIAS_2 ,0x0380 ); -regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x8001 ); -regmap_write (rt5682->regmap,RT5682_TEST_MODE_CTRL_1 ,0x0000 ); -regmap_write (rt5682->regmap,RT5682_STO1_DAC_MIXER ,0x2080 ); -regmap_write (rt5682->regmap,RT5682_STO1_ADC_MIXER ,0x4040 ); -regmap_write (rt5682->regmap,RT5682_DEPOP_1 ,0x0069 ); +regmap_write (rt5682->regmap,RT5682_MICBIAS_2 ,0x0300 ); +regmap_write (rt5682->regmap,RT5682_GLB_CLK ,0x8000 ); +regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x0100 );regmap_write (rt5682->regmap,RT5682_CHOP_DAC ,0x3000 ); -regmap_write (rt5682->regmap,RT5682_HP_CTRL_2 ,0x6000 ); -regmap_write (rt5682->regmap,RT5682_HP_CHARGE_PUMP_1 ,0x0f26 ); -regmap_write (rt5682->regmap,RT5682_CALIB_ADC_CTRL ,0x7f05 ); -regmap_write (rt5682->regmap,RT5682_STO1_ADC_MIXER ,0x686c ); -regmap_write (rt5682->regmap,RT5682_CAL_REC ,0x0d0d ); -regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_9 ,0x000f ); -regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x8d01 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_2 ,0x0321 );regmap_write (rt5682->regmap,RT5682_HP_LOGIC_CTRL_2 ,0x0004 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_1 ,0x7c00 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_3 ,0x06a1 ); -regmap_write (rt5682->regmap,RT5682_A_DAC1_MUX ,0x0311 ); -regmap_write (rt5682->regmap,RT5682_RESET_HPF_CTRL ,0x0000 ); -regmap_write (rt5682->regmap,RT5682_ADC_STO1_HP_CTRL_1 ,0x3320 ); +regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_1 ,0x7c00 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_1 ,0xfc00 );
@@ -2490,7 +2478,7 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)pr_err ("HP Calibration Failure\n" );/* restore settings */ -regmap_write (rt5682->regmap,RT5682_STO1_ADC_MIXER ,0xc0c4 ); +regmap_write (rt5682->regmap,RT5682_GLB_CLK ,0x0000 );regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x0000 );mutex_unlock (&rt5682->calibrate_mutex);
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5682: Update calibration function" to the asoc tree
The patch
ASoC: rt5682: Update calibration function
has been applied to the asoc tree at
https://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
513792c2554bdece11d82568ea25501a555abd34Mon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Fri, 24 Aug 2018 10:51:51 +0800
Subject: [PATCH] ASoC: rt5682: Update calibration function
New calibration sequence allows rt5682 do calibration without MCLK.
--- sound/soc/codecs/rt5682.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
sound/soc/codecs/rt5682.c +5 -17
@@ -2454,27 +2454,15 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)regmap_write (rt5682->regmap,RT5682_PWR_ANLG_1 ,0xa2bf );usleep_range (15000 ,20000 );regmap_write (rt5682->regmap,RT5682_PWR_ANLG_1 ,0xf2bf ); -regmap_write (rt5682->regmap,RT5682_MICBIAS_2 ,0x0380 ); -regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x8001 ); -regmap_write (rt5682->regmap,RT5682_TEST_MODE_CTRL_1 ,0x0000 ); -regmap_write (rt5682->regmap,RT5682_STO1_DAC_MIXER ,0x2080 ); -regmap_write (rt5682->regmap,RT5682_STO1_ADC_MIXER ,0x4040 ); -regmap_write (rt5682->regmap,RT5682_DEPOP_1 ,0x0069 ); +regmap_write (rt5682->regmap,RT5682_MICBIAS_2 ,0x0300 ); +regmap_write (rt5682->regmap,RT5682_GLB_CLK ,0x8000 ); +regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x0100 );regmap_write (rt5682->regmap,RT5682_CHOP_DAC ,0x3000 ); -regmap_write (rt5682->regmap,RT5682_HP_CTRL_2 ,0x6000 ); -regmap_write (rt5682->regmap,RT5682_HP_CHARGE_PUMP_1 ,0x0f26 ); -regmap_write (rt5682->regmap,RT5682_CALIB_ADC_CTRL ,0x7f05 ); -regmap_write (rt5682->regmap,RT5682_STO1_ADC_MIXER ,0x686c ); -regmap_write (rt5682->regmap,RT5682_CAL_REC ,0x0d0d ); -regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_9 ,0x000f ); -regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x8d01 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_2 ,0x0321 );regmap_write (rt5682->regmap,RT5682_HP_LOGIC_CTRL_2 ,0x0004 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_1 ,0x7c00 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_3 ,0x06a1 ); -regmap_write (rt5682->regmap,RT5682_A_DAC1_MUX ,0x0311 ); -regmap_write (rt5682->regmap,RT5682_RESET_HPF_CTRL ,0x0000 ); -regmap_write (rt5682->regmap,RT5682_ADC_STO1_HP_CTRL_1 ,0x3320 ); +regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_1 ,0x7c00 );regmap_write (rt5682->regmap,RT5682_HP_CALIB_CTRL_1 ,0xfc00 );
@@ -2490,7 +2478,7 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)pr_err ("HP Calibration Failure\n" );/* restore settings */ -regmap_write (rt5682->regmap,RT5682_STO1_ADC_MIXER ,0xc0c4 ); +regmap_write (rt5682->regmap,RT5682_GLB_CLK ,0x0000 );regmap_write (rt5682->regmap,RT5682_PWR_DIG_1 ,0x0000 );mutex_unlock (&rt5682->calibrate_mutex);
Signature · 1 line
2.18.0