Commit 79810624a1702a07e382d306ac09966d03c34b20
1 parent
98f4a2932f
Exists in
master
and in
2 other branches
= Codec Power Management 로 인해 Button.wav 재생시 볼륨 순간적으로 낮게 재생되는 문제 수정
Showing
1 changed file
with
9 additions
and
4 deletions
Show diff stats
kernel/linux-imx6_3.14.28/sound/soc/codecs/sgtl5000.c
| @@ -259,7 +259,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { | @@ -259,7 +259,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { | ||
| 259 | mic_bias_event, | 259 | mic_bias_event, |
| 260 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), | 260 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), |
| 261 | 261 | ||
| 262 | - SND_SOC_DAPM_PGA("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0), | 262 | + // fix larche@falinux.com 2017-06-13 |
| 263 | +// SND_SOC_DAPM_PGA("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0), | ||
| 264 | + SND_SOC_DAPM_PGA("HP", SND_SOC_NOPM, 0, 0, NULL, 0), | ||
| 263 | SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0), | 265 | SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0), |
| 264 | 266 | ||
| 265 | SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux), | 267 | SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux), |
| @@ -278,8 +280,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { | @@ -278,8 +280,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { | ||
| 278 | SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0), | 280 | SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0), |
| 279 | SND_SOC_DAPM_DAC("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0), | 281 | SND_SOC_DAPM_DAC("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0), |
| 280 | 282 | ||
| 281 | - SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), | ||
| 282 | - SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), | 283 | + // del larche@falinux.com 2017-06-13 |
| 284 | +// SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), | ||
| 285 | +// SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), | ||
| 283 | }; | 286 | }; |
| 284 | 287 | ||
| 285 | /* routes for sgtl5000 */ | 288 | /* routes for sgtl5000 */ |
| @@ -1179,7 +1182,9 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) | @@ -1179,7 +1182,9 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) | ||
| 1179 | ana_pwr = snd_soc_read(codec, SGTL5000_CHIP_ANA_POWER); | 1182 | ana_pwr = snd_soc_read(codec, SGTL5000_CHIP_ANA_POWER); |
| 1180 | ana_pwr |= SGTL5000_DAC_STEREO | | 1183 | ana_pwr |= SGTL5000_DAC_STEREO | |
| 1181 | SGTL5000_ADC_STEREO | | 1184 | SGTL5000_ADC_STEREO | |
| 1182 | - SGTL5000_REFTOP_POWERUP; | 1185 | + SGTL5000_REFTOP_POWERUP | |
| 1186 | + SGTL5000_HP_POWERUP | | ||
| 1187 | + SGTL5000_VAG_POWERUP; // add larche@falinux.com (SGTL5000_HP_POWERUP|SGTL5000_VAG_POWERUP) 2017-06-13 | ||
| 1183 | lreg_ctrl = snd_soc_read(codec, SGTL5000_CHIP_LINREG_CTRL); | 1188 | lreg_ctrl = snd_soc_read(codec, SGTL5000_CHIP_LINREG_CTRL); |
| 1184 | 1189 | ||
| 1185 | if (vddio < 3100 && vdda < 3100) { | 1190 | if (vddio < 3100 && vdda < 3100) { |