f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
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"},
|