diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index b32aeb38e3a6..277862e480e2 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -55,7 +55,7 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { | |||
55 | 0x0c, /* REG_ATXR1PGA (0xB) */ | 55 | 0x0c, /* REG_ATXR1PGA (0xB) */ |
56 | 0x00, /* REG_AVTXL2PGA (0xC) */ | 56 | 0x00, /* REG_AVTXL2PGA (0xC) */ |
57 | 0x00, /* REG_AVTXR2PGA (0xD) */ | 57 | 0x00, /* REG_AVTXR2PGA (0xD) */ |
58 | 0x01, /* REG_AUDIO_IF (0xE) */ | 58 | 0x00, /* REG_AUDIO_IF (0xE) */ |
59 | 0x00, /* REG_VOICE_IF (0xF) */ | 59 | 0x00, /* REG_VOICE_IF (0xF) */ |
60 | 0x00, /* REG_ARXR1PGA (0x10) */ | 60 | 0x00, /* REG_ARXR1PGA (0x10) */ |
61 | 0x00, /* REG_ARXL1PGA (0x11) */ | 61 | 0x00, /* REG_ARXL1PGA (0x11) */ |
@@ -1203,6 +1203,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
1203 | SND_SOC_DAPM_SUPPLY("APLL Enable", SND_SOC_NOPM, 0, 0, apll_event, | 1203 | SND_SOC_DAPM_SUPPLY("APLL Enable", SND_SOC_NOPM, 0, 0, apll_event, |
1204 | SND_SOC_DAPM_PRE_PMU|SND_SOC_DAPM_POST_PMD), | 1204 | SND_SOC_DAPM_PRE_PMU|SND_SOC_DAPM_POST_PMD), |
1205 | 1205 | ||
1206 | SND_SOC_DAPM_SUPPLY("AIF Enable", TWL4030_REG_AUDIO_IF, 0, 0, NULL, 0), | ||
1207 | |||
1206 | /* Output MIXER controls */ | 1208 | /* Output MIXER controls */ |
1207 | /* Earpiece */ | 1209 | /* Earpiece */ |
1208 | SND_SOC_DAPM_MIXER("Earpiece Mixer", SND_SOC_NOPM, 0, 0, | 1210 | SND_SOC_DAPM_MIXER("Earpiece Mixer", SND_SOC_NOPM, 0, 0, |
@@ -1337,6 +1339,11 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
1337 | {"Digital L2 Playback Mixer", NULL, "APLL Enable"}, | 1339 | {"Digital L2 Playback Mixer", NULL, "APLL Enable"}, |
1338 | {"Digital Voice Playback Mixer", NULL, "APLL Enable"}, | 1340 | {"Digital Voice Playback Mixer", NULL, "APLL Enable"}, |
1339 | 1341 | ||
1342 | {"Digital R1 Playback Mixer", NULL, "AIF Enable"}, | ||
1343 | {"Digital L1 Playback Mixer", NULL, "AIF Enable"}, | ||
1344 | {"Digital R2 Playback Mixer", NULL, "AIF Enable"}, | ||
1345 | {"Digital L2 Playback Mixer", NULL, "AIF Enable"}, | ||
1346 | |||
1340 | {"Analog L1 Playback Mixer", NULL, "Digital L1 Playback Mixer"}, | 1347 | {"Analog L1 Playback Mixer", NULL, "Digital L1 Playback Mixer"}, |
1341 | {"Analog R1 Playback Mixer", NULL, "Digital R1 Playback Mixer"}, | 1348 | {"Analog R1 Playback Mixer", NULL, "Digital R1 Playback Mixer"}, |
1342 | {"Analog L2 Playback Mixer", NULL, "Digital L2 Playback Mixer"}, | 1349 | {"Analog L2 Playback Mixer", NULL, "Digital L2 Playback Mixer"}, |
@@ -1455,6 +1462,11 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
1455 | {"ADC Virtual Left2", NULL, "APLL Enable"}, | 1462 | {"ADC Virtual Left2", NULL, "APLL Enable"}, |
1456 | {"ADC Virtual Right2", NULL, "APLL Enable"}, | 1463 | {"ADC Virtual Right2", NULL, "APLL Enable"}, |
1457 | 1464 | ||
1465 | {"ADC Virtual Left1", NULL, "AIF Enable"}, | ||
1466 | {"ADC Virtual Right1", NULL, "AIF Enable"}, | ||
1467 | {"ADC Virtual Left2", NULL, "AIF Enable"}, | ||
1468 | {"ADC Virtual Right2", NULL, "AIF Enable"}, | ||
1469 | |||
1458 | /* Analog bypass routes */ | 1470 | /* Analog bypass routes */ |
1459 | {"Right1 Analog Loopback", "Switch", "Analog Right"}, | 1471 | {"Right1 Analog Loopback", "Switch", "Analog Right"}, |
1460 | {"Left1 Analog Loopback", "Switch", "Analog Left"}, | 1472 | {"Left1 Analog Loopback", "Switch", "Analog Left"}, |