Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1661959
| From | Danny Milosavljevic <dannym@scratchpost.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v11 12/12] sun4i-codec: Add routes for playback switches, Mic2, Capture Select. |
| Date | 2017-06-09 08:30 +0200 |
| Message-ID | <tQlAJ-6ri-3@gated-at.bofh.it> (permalink) |
| References | <tQlAJ-6ri-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
sound/soc/sunxi/sun4i-codec.c | 51 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 48 insertions(+), 3 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index a9e10dce..315d79a3 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -905,12 +905,20 @@ 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", "Right Mixer Left DAC Playback Switch", "Left DAC" },
+ { "Right Mixer", "DAC Playback Switch", "Right DAC" },
+ { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
+ { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
+ { "Right Mixer", "Line Playback Switch", "Line Right" },
+ { "Right Mixer", "FM Playback Switch", "FM Right" },
/* Left Mixer Routes */
{ "Left Mixer", NULL, "Mixer Enable" },
- { "Left Mixer", "Left DAC Playback Switch", "Left DAC" },
+ { "Left Mixer", "DAC Playback Switch", "Left DAC" },
+ { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
+ { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
+ { "Left Mixer", "Line Playback Switch", "Line Left" },
+ { "Left Mixer", "FM Playback Switch", "FM Left" },
/* Power Amplifier Routes */
{ "Power Amplifier", "Mixer Playback Switch", "Left Mixer" },
@@ -928,11 +936,48 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
{ "Right ADC", NULL, "MIC1 Pre-Amplifier" },
{ "MIC1 Pre-Amplifier", NULL, "Mic1"},
{ "Mic1", NULL, "VMIC" },
+ /* see also Left Mixer Routes, Right Mixer Routes */
+
+ /* Mic2 Routes */
+ { "Left ADC", NULL, "MIC2 Pre-Amplifier" },
+ { "Right ADC", NULL, "MIC2 Pre-Amplifier" },
+ { "MIC2 Pre-Amplifier", NULL, "Mic2"},
+ { "Mic2", NULL, "VMIC" },
+ /* see also Left Mixer Routes, Right Mixer Routes */
+
+ /* Line, FM Routes */
+ /* see also Left Mixer Routes, Right Mixer Routes */
/* LNRDF Routes */
{ "Differential Line Capture Switch", "Differential", "Line Left" },
{ "Differential Line Capture Switch", "Differential", "Line Right" },
+ /* Right ADC Input Routes */
+ { "Right Capture Select", "Line", "Line Right" },
+ { "Right Capture Select", "Line", "Differential Line Capture Switch" },
+ { "Right Capture Select", "FM", "FM Right" },
+ { "Right Capture Select", "Mic1", "MIC1 Pre-Amplifier" },
+ { "Right Capture Select", "Mic2", "MIC2 Pre-Amplifier" },
+ { "Right Capture Select", "Mic1,Mic2", "MIC2 Pre-Amplifier" },
+ { "Right Capture Select", "Mic1+Mic2", "MIC2 Pre-Amplifier" },
+ { "Right Capture Select", "Mic1+Mic2", "MIC1 Pre-Amplifier" },
+ { "Right Capture Select", "Output Mixer", "Right Mixer" },
+ { "Right Capture Select", "Line,Mic1", "MIC1 Pre-Amplifier" },
+ { "Right ADC", NULL, "Right Capture Select" },
+
+ /* Left ADC Input Routes */
+ { "Left Capture Select", "Line", "Line Left" },
+ { "Left Capture Select", "Line", "Differential Line Capture Switch" },
+ { "Left Capture Select", "FM", "FM Left" },
+ { "Left Capture Select", "Mic1", "MIC1 Pre-Amplifier" },
+ { "Left Capture Select", "Mic2", "MIC2 Pre-Amplifier" },
+ { "Left Capture Select", "Mic1,Mic2", "MIC1 Pre-Amplifier" },
+ { "Left Capture Select", "Mic1+Mic2", "MIC1 Pre-Amplifier" },
+ { "Left Capture Select", "Mic1+Mic2", "MIC2 Pre-Amplifier" },
+ { "Left Capture Select", "Output Mixer", "Left Mixer" },
+ { "Left Capture Select", "Line,Mic1", "Line Left" },
+ { "Left Capture Select", "Line,Mic1", "Differential Line Capture Switch" },
+ { "Left ADC", NULL, "Left Capture Select" },
};
struct sun4i_codec_quirks {
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH v11 12/12] sun4i-codec: Add routes for playback switches, Mic2, Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH v11 07/12] sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
Re: [PATCH v11 07/12] sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
[PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
Re: [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:40 +0200
[PATCH v11 11/12] sun4i-codec: Add MIC2 Pre-Amplifier. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH v11 03/12] sun4i-codec: Add Line Playback Volume, FM Playback Volume, Mic Playback Volume, Capture Volume, Line Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
Re: [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
[PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2 Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
Re: [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2 Capture Volume. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
[PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
Re: [PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
[PATCH v11 01/12] sun4i-codec: Add inputs: Mic2, Line Right, Line Left, FM Right, FM Left. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
[PATCH v11 08/12] 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 08:30 +0200
Re: [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:20 +0200
csiph-web