You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.2 KiB
35 lines
1.2 KiB
6 years ago
|
From 2c85d648b750a406eee62a2647173e2b99915ab7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matt Flax <flatmax@flatmax.org>
|
||
|
|
Date: Fri, 28 Sep 2018 15:13:28 +1000
|
||
|
|
Subject: [PATCH 423/454] ASoC: cs4265: Add a MIC pre. route (#2696)
|
||
|
|
|
||
|
|
Commit b0ef5011b981ece1fde8063243a56d3038b87adb upstream.
|
||
|
|
|
||
|
|
The cs4265 driver is missing a microphone preamp enable.
|
||
|
|
This patch enables/disables the microphone preamp when mic
|
||
|
|
selection is made using the kcontrol.
|
||
|
|
|
||
|
|
Signed-off-by: Matt Flax <flatmax@flatmax.org>
|
||
|
|
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
|
||
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||
|
|
---
|
||
|
|
sound/soc/codecs/cs4265.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/sound/soc/codecs/cs4265.c
|
||
|
|
+++ b/sound/soc/codecs/cs4265.c
|
||
|
|
@@ -222,10 +222,11 @@ static const struct snd_soc_dapm_route c
|
||
|
|
{"LINEOUTR", NULL, "DAC"},
|
||
|
|
{"SPDIFOUT", NULL, "SPDIF"},
|
||
|
|
|
||
|
|
+ {"Pre-amp MIC", NULL, "MICL"},
|
||
|
|
+ {"Pre-amp MIC", NULL, "MICR"},
|
||
|
|
+ {"ADC Mux", "MIC", "Pre-amp MIC"},
|
||
|
|
{"ADC Mux", "LINEIN", "LINEINL"},
|
||
|
|
{"ADC Mux", "LINEIN", "LINEINR"},
|
||
|
|
- {"ADC Mux", "MIC", "MICL"},
|
||
|
|
- {"ADC Mux", "MIC", "MICR"},
|
||
|
|
{"ADC", NULL, "ADC Mux"},
|
||
|
|
{"DOUT", NULL, "ADC"},
|
||
|
|
{"DAI1 Capture", NULL, "DOUT"},
|