aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMylène Josserand <mylene.josserand@free-electrons.com>2017-02-10 04:41:30 -0500
committerMark Brown <broonie@kernel.org>2017-03-08 08:17:44 -0500
commit4aa8146c89f336230de7f449805bd0edfc878fd4 (patch)
treed6d25b29594130d6984ab3e88cd694b3f18abebb
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
ASoC: sun8i-codec: Remove analog "HP" widget
The "HP" widget is already present and take part to the analog part (sun8i-codec-analog). Remove it from the digital part as it is unnecessary. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sunxi/sun8i-codec.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index b92bdc8361af..d60f6fbd36a2 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -321,8 +321,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
321 SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), 321 SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0),
322 SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, 322 SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL,
323 SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), 323 SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0),
324
325 SND_SOC_DAPM_OUTPUT("HP"),
326}; 324};
327 325
328static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { 326static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
@@ -344,10 +342,6 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
344 /* DAC Mixer Routes */ 342 /* DAC Mixer Routes */
345 { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, 343 { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"},
346 { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, 344 { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"},
347
348 /* End of route : HP out */
349 { "HP", NULL, "Left DAC Mixer" },
350 { "HP", NULL, "Right DAC Mixer" },
351}; 345};
352 346
353static struct snd_soc_dai_ops sun8i_codec_dai_ops = { 347static struct snd_soc_dai_ops sun8i_codec_dai_ops = {