Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 230395
b: refs/heads/master
c: 1bb5ec6
h: refs/heads/master
i:
  230393: 9e03e61
  230391: 054f4ed
v: v3
  • Loading branch information
Peter Ujfalusi authored and Liam Girdwood committed Nov 30, 2010
1 parent 9d3da6d commit 9b3cfac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8cc14e13d15ec558c880ce6eaaddf99c08f85ab6
refs/heads/master: 1bb5ec6a6a0e094c84cc4fa2ba4a6d7cf8e9e8c6
7 changes: 7 additions & 0 deletions trunk/sound/soc/codecs/tpa6130a2.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,20 +354,27 @@ static const struct snd_soc_dapm_widget tpa6130a2_dapm_widgets[] = {
SND_SOC_DAPM_PGA_E("TPA6130A2 Right", SND_SOC_NOPM,
TPA6130A2_HP_EN_R, 0, NULL, 0, tpa6130a2_pga_event,
SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_PGA_E("TPA6130A2 Stereo", SND_SOC_NOPM,
TPA6130A2_HP_EN_L | TPA6130A2_HP_EN_R, 0, NULL, 0,
tpa6130a2_pga_event,
SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_SUPPLY("TPA6130A2 Enable", SND_SOC_NOPM,
0, 0, tpa6130a2_supply_event,
SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
/* Outputs */
SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Left"),
SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Right"),
SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Stereo"),
};

static const struct snd_soc_dapm_route audio_map[] = {
{"TPA6130A2 Headphone Left", NULL, "TPA6130A2 Left"},
{"TPA6130A2 Headphone Right", NULL, "TPA6130A2 Right"},
{"TPA6130A2 Headphone Stereo", NULL, "TPA6130A2 Stereo"},

{"TPA6130A2 Headphone Left", NULL, "TPA6130A2 Enable"},
{"TPA6130A2 Headphone Right", NULL, "TPA6130A2 Enable"},
{"TPA6130A2 Headphone Stereo", NULL, "TPA6130A2 Enable"},
};

int tpa6130a2_add_controls(struct snd_soc_codec *codec)
Expand Down

0 comments on commit 9b3cfac

Please sign in to comment.