Merged upstream: apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch Similar patch merged upstream: bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch Manually adapted: layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch Compile-tested: armvirt/64 Run-tested: armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			26 lines
		
	
	
		
			787 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			26 lines
		
	
	
		
			787 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From a9d4adcadc82cfbeea0fc32dbadd2e7792c7b7b5 Mon Sep 17 00:00:00 2001
 | 
						|
From: Phil Elwell <phil@raspberrypi.org>
 | 
						|
Date: Thu, 23 Mar 2017 10:06:56 +0000
 | 
						|
Subject: [PATCH] ASoC: Add prompt for ICS43432 codec
 | 
						|
 | 
						|
Without a prompt string, a config setting can't be included in a
 | 
						|
defconfig. Give CONFIG_SND_SOC_ICS43432 a prompt so that Pi soundcards
 | 
						|
can use the driver.
 | 
						|
 | 
						|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 | 
						|
---
 | 
						|
 sound/soc/codecs/Kconfig | 2 +-
 | 
						|
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
						|
 | 
						|
--- a/sound/soc/codecs/Kconfig
 | 
						|
+++ b/sound/soc/codecs/Kconfig
 | 
						|
@@ -715,7 +715,7 @@ config SND_SOC_HDAC_HDA
 | 
						|
 	select SND_HDA
 | 
						|
 
 | 
						|
 config SND_SOC_ICS43432
 | 
						|
-	tristate
 | 
						|
+	tristate "InvenSense ICS43432 I2S microphone codec"
 | 
						|
 
 | 
						|
 config SND_SOC_INNO_RK3036
 | 
						|
 	tristate "Inno codec driver for RK3036 SoC"
 |