Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662743

[PATCH v12 05/14] sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls.

From Danny Milosavljevic <dannym@scratchpost.org>
Newsgroups linux.kernel
Subject [PATCH v12 05/14] sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls.
Date 2017-06-09 23:00 +0200
Message-ID <tQzaF-6hr-11@gated-at.bofh.it> (permalink)
References <tQzaF-6hr-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Since it's now possible to have a DAPM mixer control with multiple channels,
use it to cut down the total number of controls.
---
 sound/soc/sunxi/sun4i-codec.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index c69b55c..3718137 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -685,15 +685,12 @@ static const struct snd_kcontrol_new sun7i_codec_extra_controls[] = {
 		       sun7i_codec_micin_preamp_gain_scale),
 };
 
-static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = {
-	SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
-			SUN4I_CODEC_DAC_ACTL_LDACLMIXS, 1, 0),
-};
-
-static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = {
-	SOC_DAPM_SINGLE("Right DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
+static const struct snd_kcontrol_new sun4i_codec_mixer_controls[] = {
+	SOC_DAPM_DOUBLE("DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
+			SUN4I_CODEC_DAC_ACTL_LDACLMIXS,
 			SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 1, 0),
-	SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
+	SOC_DAPM_SINGLE("Right Mixer Left DAC Playback Switch",
+			SUN4I_CODEC_DAC_ACTL,
 			SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0),
 };
 
@@ -729,11 +726,11 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
 
 	/* Mixers */
 	SND_SOC_DAPM_MIXER("Left Mixer", SND_SOC_NOPM, 0, 0,
-			   sun4i_codec_left_mixer_controls,
-			   ARRAY_SIZE(sun4i_codec_left_mixer_controls)),
+			   sun4i_codec_mixer_controls,
+			   ARRAY_SIZE(sun4i_codec_mixer_controls)),
 	SND_SOC_DAPM_MIXER("Right Mixer", SND_SOC_NOPM, 0, 0,
-			   sun4i_codec_right_mixer_controls,
-			   ARRAY_SIZE(sun4i_codec_right_mixer_controls)),
+			   sun4i_codec_mixer_controls,
+			   ARRAY_SIZE(sun4i_codec_mixer_controls)),
 
 	/* Global Mixer Enable */
 	SND_SOC_DAPM_SUPPLY("Mixer Enable", SUN4I_CODEC_DAC_ACTL,
@@ -775,12 +772,12 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
 
 	/* Right Mixer Routes */
 	{ "Right Mixer", NULL, "Mixer Enable" },
-	{ "Right Mixer", "Left DAC Playback Switch", "Left DAC" },
-	{ "Right Mixer", "Right DAC Playback Switch", "Right DAC" },
+	{ "Right Mixer", "DAC Playback Switch", "Left DAC" },
+	{ "Right Mixer", "Right Mixer Left DAC Playback Switch", "Left DAC" },
 
 	/* Left Mixer Routes */
 	{ "Left Mixer", NULL, "Mixer Enable" },
-	{ "Left Mixer", "Left DAC Playback Switch", "Left DAC" },
+	{ "Left Mixer", "DAC Playback Switch", "Left DAC" },
 
 	/* Power Amplifier Routes */
 	{ "Power Amplifier", "Mixer Playback Switch", "Left Mixer" },
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v12 00/14] sun4i-codec: Add Line-In, FM-In, Mic 2,  Capture Source, Differential Line-In Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 07/14] sun4i-codec: Add FM Playback Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 05/14] sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 11/14] sun4i-codec: Add Line Right, Line Left, Line Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 14/14] sun4i-codec: Add Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 12/14] sun4i-codec: Add Differential Line Source. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 03/14] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 09/14] sun4i-codec: Add Line Playback Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 13/14] sun4i-codec: Add Left Capture Select, Right Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 06/14] sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 02/14] sun4i-codec: Add Mic Playback Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 01/14] sun4i-codec: Add MIC2 Pre-Amplifier, Mic2. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 08/14] sun4i-codec: Add FM Left, FM Right, FM Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 04/14] sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200

csiph-web