ASoC: rt5645: Remove the repeated definitions
Subsystems (3)
Oder Chiou
maintainerPATCH 1/4 ASoC: rt5645: Remove the repeated definitions
--- sound/soc/codecs/rt5645.h | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/rt5645.h +0 -2
@@ -777,8 +777,6 @@#define RT5645_PWR_CLS_D_R_BIT 9#define RT5645_PWR_CLS_D_L (0x1 << 8)#define RT5645_PWR_CLS_D_L_BIT 8 -#define RT5645_PWR_ADC_R (0x1 << 1) -#define RT5645_PWR_ADC_R_BIT 1#define RT5645_PWR_DAC_L2 (0x1 << 7)#define RT5645_PWR_DAC_L2_BIT 7#define RT5645_PWR_DAC_R2 (0x1 << 6)
Signature · 1 line
1.8.1.1.439.g50a6b54
Oder Chiou
maintainerPATCH 2/4 ASoC: rt5645: Use the type SOC_DAPM_SINGLE_AUTODISABLE to prevent the weird sound in runtime of power up
--- sound/soc/codecs/rt5645.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5645.c +2 -2
@@ -732,14 +732,14 @@ static const struct snd_kcontrol_new rt5645_mono_adc_r_mix[] = {static const struct snd_kcontrol_new rt5645_dac_l_mix[] = {SOC_DAPM_SINGLE ("Stereo ADC Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_ADCMIX_L_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER , +SOC_DAPM_SINGLE_AUTODISABLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_DAC1_L_SFT ,1 ,1 ), };static const struct snd_kcontrol_new rt5645_dac_r_mix[] = {SOC_DAPM_SINGLE ("Stereo ADC Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_ADCMIX_R_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER , +SOC_DAPM_SINGLE_AUTODISABLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_DAC1_R_SFT ,1 ,1 ), };
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt5645: Use the type SOC_DAPM_SINGLE_AUTODISABLE to prevent the weird sound in runtime of power up" to the asoc tree
The patch
ASoC: rt5645: Use the type SOC_DAPM_SINGLE_AUTODISABLE to prevent the weird sound in runtime of power up
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
21cb13e72b02dbbb5a02477d4dd46bc2bc1cfd08Mon Sep 17 00:00:00 2001
From: Oder Chiou <[email protected]>
Date: Wed, 23 Sep 2015 14:35:28 +0800
Subject: [PATCH] ASoC: rt5645: Use the type SOC_DAPM_SINGLE_AUTODISABLE to
prevent the weird sound in runtime of power up
--- sound/soc/codecs/rt5645.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5645.c +2 -2
@@ -732,14 +732,14 @@ static const struct snd_kcontrol_new rt5645_mono_adc_r_mix[] = {static const struct snd_kcontrol_new rt5645_dac_l_mix[] = {SOC_DAPM_SINGLE ("Stereo ADC Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_ADCMIX_L_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER , +SOC_DAPM_SINGLE_AUTODISABLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_DAC1_L_SFT ,1 ,1 ), };static const struct snd_kcontrol_new rt5645_dac_r_mix[] = {SOC_DAPM_SINGLE ("Stereo ADC Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_ADCMIX_R_SFT ,1 ,1 ), -SOC_DAPM_SINGLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER , +SOC_DAPM_SINGLE_AUTODISABLE ("DAC1 Switch" ,RT5645_AD_DA_MIXER ,RT5645_M_DAC1_R_SFT ,1 ,1 ), };
Signature · 1 line
2.5.0
Oder Chiou
maintainerPATCH 3/4 ASoC: rt5645: Increase the delay time to remove the pop sound
In reply to Oder Chiou--- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5645.c +1 -1
@@ -1381,7 +1381,7 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)regmap_write (rt5645->regmap,RT5645_PR_BASE +RT5645_MAMP_INT_REG2 ,0xfc00 );snd_soc_write (codec,RT5645_DEPOP_M2 ,0x1140 ); -mdelay (5 ); +msleep (40 ); rt5645->hp_on = true; }else {/* depop parameters */
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt5645: Increase the delay time to remove the pop sound" to the asoc tree
The patch
ASoC: rt5645: Increase the delay time to remove the pop sound
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
4f4794124e0421b080a0f1f5f1207636ba55eb85Mon Sep 17 00:00:00 2001
From: Oder Chiou <[email protected]>
Date: Wed, 23 Sep 2015 14:35:29 +0800
Subject: [PATCH] ASoC: rt5645: Increase the delay time to remove the pop sound
--- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5645.c +1 -1
@@ -1381,7 +1381,7 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)regmap_write (rt5645->regmap,RT5645_PR_BASE +RT5645_MAMP_INT_REG2 ,0xfc00 );snd_soc_write (codec,RT5645_DEPOP_M2 ,0x1140 ); -mdelay (5 ); +msleep (40 ); rt5645->hp_on = true; }else {/* depop parameters */
Signature · 1 line
2.5.0
Oder Chiou
maintainerPATCH 4/4 ASoC: rt5645: Prevent the pop sound in case of playback and the jack is plugging
In reply to Oder Chiou--- sound/soc/codecs/rt5645.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/rt5645.c +3 -0
@@ -2835,6 +2835,9 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) }else {/* jack out */ rt5645->jack_type =0 ; +regmap_update_bits (rt5645->regmap,RT5645_HP_VOL , +RT5645_L_MUTE |RT5645_R_MUTE , +RT5645_L_MUTE |RT5645_R_MUTE );regmap_update_bits (rt5645->regmap,RT5645_IN1_CTRL2 ,RT5645_CBJ_MN_JD ,RT5645_CBJ_MN_JD ); regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1,
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt5645: Prevent the pop sound in case of playback and the jack is plugging" to the asoc tree
The patch
ASoC: rt5645: Prevent the pop sound in case of playback and the jack is plugging
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
fce97b4d70ad632dd9c6058622492501377bbaaaMon Sep 17 00:00:00 2001
From: Oder Chiou <[email protected]>
Date: Wed, 23 Sep 2015 14:35:30 +0800
Subject: [PATCH] ASoC: rt5645: Prevent the pop sound in case of playback and
the jack is plugging
--- sound/soc/codecs/rt5645.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/rt5645.c +3 -0
@@ -2832,6 +2832,9 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) }else {/* jack out */ rt5645->jack_type =0 ; +regmap_update_bits (rt5645->regmap,RT5645_HP_VOL , +RT5645_L_MUTE |RT5645_R_MUTE , +RT5645_L_MUTE |RT5645_R_MUTE );regmap_update_bits (rt5645->regmap,RT5645_IN1_CTRL2 ,RT5645_CBJ_MN_JD ,RT5645_CBJ_MN_JD ); regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1,
Signature · 1 line
2.5.0
Mark Brown
maintainerApplied "ASoC: rt5645: Remove the repeated definitions" to the asoc tree
In reply to Oder ChiouThe patch
ASoC: rt5645: Remove the repeated definitions
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
de3f8fdf7393e4259b68ae8cea806c39d602769eMon Sep 17 00:00:00 2001
From: Oder Chiou <[email protected]>
Date: Wed, 23 Sep 2015 14:35:27 +0800
Subject: [PATCH] ASoC: rt5645: Remove the repeated definitions
--- sound/soc/codecs/rt5645.h | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/rt5645.h +0 -2
@@ -777,8 +777,6 @@#define RT5645_PWR_CLS_D_R_BIT 9#define RT5645_PWR_CLS_D_L (0x1 << 8)#define RT5645_PWR_CLS_D_L_BIT 8 -#define RT5645_PWR_ADC_R (0x1 << 1) -#define RT5645_PWR_ADC_R_BIT 1#define RT5645_PWR_DAC_L2 (0x1 << 7)#define RT5645_PWR_DAC_L2_BIT 7#define RT5645_PWR_DAC_R2 (0x1 << 6)
Signature · 1 line
2.5.0