Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 950c6672 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836',... 

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic/adau1977', 'asoc/topic/ak4104', 'asoc/topic/ak4641', 'asoc/topic/ak4671' and 'asoc/topic/alc5623' into asoc-next
parents 52db65f0 6eb0e8f9 2e86434f b6592d88 63a5d4c6 57d4325a cbf62422 64e6b58d 0cd257bf

include/linux/platform_data/adau1977.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * ADAU1977/ADAU1978/ADAU1979 driver

 *

 * Copyright 2014 Analog Devices Inc.

 *  Author: Lars-Peter Clausen <lars@metafoo.de>

 *

 * Licensed under the GPL-2.

 */



#ifndef __LINUX_PLATFORM_DATA_ADAU1977_H__

#define __LINUX_PLATFORM_DATA_ADAU1977_H__



/**

 * enum adau1977_micbias - ADAU1977 MICBIAS pin voltage setting

 * @ADAU1977_MICBIAS_5V0: MICBIAS is set to 5.0 V

 * @ADAU1977_MICBIAS_5V5: MICBIAS is set to 5.5 V

 * @ADAU1977_MICBIAS_6V0: MICBIAS is set to 6.0 V

 * @ADAU1977_MICBIAS_6V5: MICBIAS is set to 6.5 V

 * @ADAU1977_MICBIAS_7V0: MICBIAS is set to 7.0 V

 * @ADAU1977_MICBIAS_7V5: MICBIAS is set to 7.5 V

 * @ADAU1977_MICBIAS_8V0: MICBIAS is set to 8.0 V

 * @ADAU1977_MICBIAS_8V5: MICBIAS is set to 8.5 V

 * @ADAU1977_MICBIAS_9V0: MICBIAS is set to 9.0 V

 */

enum adau1977_micbias {

	ADAU1977_MICBIAS_5V0 = 0x0,

	ADAU1977_MICBIAS_5V5 = 0x1,

	ADAU1977_MICBIAS_6V0 = 0x2,

	ADAU1977_MICBIAS_6V5 = 0x3,

	ADAU1977_MICBIAS_7V0 = 0x4,

	ADAU1977_MICBIAS_7V5 = 0x5,

	ADAU1977_MICBIAS_8V0 = 0x6,

	ADAU1977_MICBIAS_8V5 = 0x7,

	ADAU1977_MICBIAS_9V0 = 0x8,

};



/**

 * struct adau1977_platform_data - Platform configuration data for the ADAU1977

 * @micbias: Specifies the voltage for the MICBIAS pin

 */

struct adau1977_platform_data {

	enum adau1977_micbias micbias;

};



#endif

sound/core/pcm_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,7 @@ int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_par 
		return -EINVAL;

	return 0;

}

EXPORT_SYMBOL(snd_pcm_hw_constraint_mask64);



/**

 * snd_pcm_hw_constraint_integer - apply an integer constraint to an interval

sound/soc/blackfin/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ config SND_SOC_BFIN_EVAL_ADAV80X 
	tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards"

	depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI

	select SND_BF5XX_SOC_I2S

	select SND_SOC_ADAV80X

	select SND_SOC_ADAV801 if SPI_MASTER

	select SND_SOC_ADAV803 if I2C

	help

	  Say Y if you want to add support for the Analog Devices EVAL-ADAV801 or

	  EVAL-ADAV803 board connected to one of the Blackfin evaluation boards
@@ -67,7 +68,8 @@ config SND_BF5XX_SOC_AD193X 
	tristate "SoC AD193X Audio support for Blackfin"

	depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI

	select SND_BF5XX_SOC_I2S

	select SND_SOC_AD193X

	select SND_SOC_AD193X_I2C if I2C

	select SND_SOC_AD193X_SPI if SPI_MASTER

	help

	  Say Y if you want to add support for AD193X codec on Blackfin.

	  This driver supports AD1936, AD1937, AD1938 and AD1939.

sound/soc/codecs/88pm860x-codec.c

+58 −58
Original line number Diff line number Diff line
@@ -448,38 +448,38 @@ static const char *pm860x_opamp_texts[] = {"-50%", "-25%", "0%", "75%"}; 


static const char *pm860x_pa_texts[] = {"-33%", "0%", "33%", "66%"};



static const struct soc_enum pm860x_hs1_opamp_enum =

	SOC_ENUM_SINGLE(PM860X_HS1_CTRL, 5, 4, pm860x_opamp_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_hs1_opamp_enum,

			    PM860X_HS1_CTRL, 5, pm860x_opamp_texts);



static const struct soc_enum pm860x_hs2_opamp_enum =

	SOC_ENUM_SINGLE(PM860X_HS2_CTRL, 5, 4, pm860x_opamp_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_hs2_opamp_enum,

			    PM860X_HS2_CTRL, 5, pm860x_opamp_texts);



static const struct soc_enum pm860x_hs1_pa_enum =

	SOC_ENUM_SINGLE(PM860X_HS1_CTRL, 3, 4, pm860x_pa_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_hs1_pa_enum,

			    PM860X_HS1_CTRL, 3, pm860x_pa_texts);



static const struct soc_enum pm860x_hs2_pa_enum =

	SOC_ENUM_SINGLE(PM860X_HS2_CTRL, 3, 4, pm860x_pa_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_hs2_pa_enum,

			    PM860X_HS2_CTRL, 3, pm860x_pa_texts);



static const struct soc_enum pm860x_lo1_opamp_enum =

	SOC_ENUM_SINGLE(PM860X_LO1_CTRL, 5, 4, pm860x_opamp_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_lo1_opamp_enum,

			    PM860X_LO1_CTRL, 5, pm860x_opamp_texts);



static const struct soc_enum pm860x_lo2_opamp_enum =

	SOC_ENUM_SINGLE(PM860X_LO2_CTRL, 5, 4, pm860x_opamp_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_lo2_opamp_enum,

			    PM860X_LO2_CTRL, 5, pm860x_opamp_texts);



static const struct soc_enum pm860x_lo1_pa_enum =

	SOC_ENUM_SINGLE(PM860X_LO1_CTRL, 3, 4, pm860x_pa_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_lo1_pa_enum,

			    PM860X_LO1_CTRL, 3, pm860x_pa_texts);



static const struct soc_enum pm860x_lo2_pa_enum =

	SOC_ENUM_SINGLE(PM860X_LO2_CTRL, 3, 4, pm860x_pa_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_lo2_pa_enum,

			    PM860X_LO2_CTRL, 3, pm860x_pa_texts);



static const struct soc_enum pm860x_spk_pa_enum =

	SOC_ENUM_SINGLE(PM860X_EAR_CTRL_1, 5, 4, pm860x_pa_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_spk_pa_enum,

			    PM860X_EAR_CTRL_1, 5, pm860x_pa_texts);



static const struct soc_enum pm860x_ear_pa_enum =

	SOC_ENUM_SINGLE(PM860X_EAR_CTRL_2, 0, 4, pm860x_pa_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_ear_pa_enum,

			    PM860X_EAR_CTRL_2, 0, pm860x_pa_texts);



static const struct soc_enum pm860x_spk_ear_opamp_enum =

	SOC_ENUM_SINGLE(PM860X_EAR_CTRL_1, 3, 4, pm860x_opamp_texts);

static SOC_ENUM_SINGLE_DECL(pm860x_spk_ear_opamp_enum,

			    PM860X_EAR_CTRL_1, 3, pm860x_opamp_texts);



static const struct snd_kcontrol_new pm860x_snd_controls[] = {

	SOC_DOUBLE_R_TLV("ADC Capture Volume", PM860X_ADC_ANA_2,
@@ -561,8 +561,8 @@ static const char *aif1_text[] = { 
	"PCM L", "PCM R",

};



static const struct soc_enum aif1_enum =

	SOC_ENUM_SINGLE(PM860X_PCM_IFACE_3, 6, 2, aif1_text);

static SOC_ENUM_SINGLE_DECL(aif1_enum,

			    PM860X_PCM_IFACE_3, 6, aif1_text);



static const struct snd_kcontrol_new aif1_mux =

	SOC_DAPM_ENUM("PCM Mux", aif1_enum);
@@ -572,8 +572,8 @@ static const char *i2s_din_text[] = { 
	"DIN", "DIN1",

};



static const struct soc_enum i2s_din_enum =

	SOC_ENUM_SINGLE(PM860X_I2S_IFACE_3, 1, 2, i2s_din_text);

static SOC_ENUM_SINGLE_DECL(i2s_din_enum,

			    PM860X_I2S_IFACE_3, 1, i2s_din_text);



static const struct snd_kcontrol_new i2s_din_mux =

	SOC_DAPM_ENUM("I2S DIN Mux", i2s_din_enum);
@@ -583,8 +583,8 @@ static const char *i2s_mic_text[] = { 
	"Ex PA", "ADC",

};



static const struct soc_enum i2s_mic_enum =

	SOC_ENUM_SINGLE(PM860X_I2S_IFACE_3, 4, 2, i2s_mic_text);

static SOC_ENUM_SINGLE_DECL(i2s_mic_enum,

			    PM860X_I2S_IFACE_3, 4, i2s_mic_text);



static const struct snd_kcontrol_new i2s_mic_mux =

	SOC_DAPM_ENUM("I2S Mic Mux", i2s_mic_enum);
@@ -594,8 +594,8 @@ static const char *adcl_text[] = { 
	"ADCR", "ADCL",

};



static const struct soc_enum adcl_enum =

	SOC_ENUM_SINGLE(PM860X_PCM_IFACE_3, 4, 2, adcl_text);

static SOC_ENUM_SINGLE_DECL(adcl_enum,

			    PM860X_PCM_IFACE_3, 4, adcl_text);



static const struct snd_kcontrol_new adcl_mux =

	SOC_DAPM_ENUM("ADC Left Mux", adcl_enum);
@@ -605,8 +605,8 @@ static const char *adcr_text[] = { 
	"ADCL", "ADCR",

};



static const struct soc_enum adcr_enum =

	SOC_ENUM_SINGLE(PM860X_PCM_IFACE_3, 2, 2, adcr_text);

static SOC_ENUM_SINGLE_DECL(adcr_enum,

			    PM860X_PCM_IFACE_3, 2, adcr_text);



static const struct snd_kcontrol_new adcr_mux =

	SOC_DAPM_ENUM("ADC Right Mux", adcr_enum);
@@ -616,8 +616,8 @@ static const char *adcr_ec_text[] = { 
	"ADCR", "EC",

};



static const struct soc_enum adcr_ec_enum =

	SOC_ENUM_SINGLE(PM860X_ADC_EN_2, 3, 2, adcr_ec_text);

static SOC_ENUM_SINGLE_DECL(adcr_ec_enum,

			    PM860X_ADC_EN_2, 3, adcr_ec_text);



static const struct snd_kcontrol_new adcr_ec_mux =

	SOC_DAPM_ENUM("ADCR EC Mux", adcr_ec_enum);
@@ -627,8 +627,8 @@ static const char *ec_text[] = { 
	"Left", "Right", "Left + Right",

};



static const struct soc_enum ec_enum =

	SOC_ENUM_SINGLE(PM860X_EC_PATH, 1, 3, ec_text);

static SOC_ENUM_SINGLE_DECL(ec_enum,

			    PM860X_EC_PATH, 1, ec_text);



static const struct snd_kcontrol_new ec_mux =

	SOC_DAPM_ENUM("EC Mux", ec_enum);
@@ -638,36 +638,36 @@ static const char *dac_text[] = { 
};



/* DAC Headset 1 Mux / Mux10 */

static const struct soc_enum dac_hs1_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_INPUT_SEL_1, 0, 4, dac_text);

static SOC_ENUM_SINGLE_DECL(dac_hs1_enum,

			    PM860X_ANA_INPUT_SEL_1, 0, dac_text);



static const struct snd_kcontrol_new dac_hs1_mux =

	SOC_DAPM_ENUM("DAC HS1 Mux", dac_hs1_enum);



/* DAC Headset 2 Mux / Mux11 */

static const struct soc_enum dac_hs2_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_INPUT_SEL_1, 2, 4, dac_text);

static SOC_ENUM_SINGLE_DECL(dac_hs2_enum,

			    PM860X_ANA_INPUT_SEL_1, 2, dac_text);



static const struct snd_kcontrol_new dac_hs2_mux =

	SOC_DAPM_ENUM("DAC HS2 Mux", dac_hs2_enum);



/* DAC Lineout 1 Mux / Mux12 */

static const struct soc_enum dac_lo1_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_INPUT_SEL_1, 4, 4, dac_text);

static SOC_ENUM_SINGLE_DECL(dac_lo1_enum,

			    PM860X_ANA_INPUT_SEL_1, 4, dac_text);



static const struct snd_kcontrol_new dac_lo1_mux =

	SOC_DAPM_ENUM("DAC LO1 Mux", dac_lo1_enum);



/* DAC Lineout 2 Mux / Mux13 */

static const struct soc_enum dac_lo2_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_INPUT_SEL_1, 6, 4, dac_text);

static SOC_ENUM_SINGLE_DECL(dac_lo2_enum,

			    PM860X_ANA_INPUT_SEL_1, 6, dac_text);



static const struct snd_kcontrol_new dac_lo2_mux =

	SOC_DAPM_ENUM("DAC LO2 Mux", dac_lo2_enum);



/* DAC Spearker Earphone Mux / Mux14 */

static const struct soc_enum dac_spk_ear_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_INPUT_SEL_2, 0, 4, dac_text);

static SOC_ENUM_SINGLE_DECL(dac_spk_ear_enum,

			    PM860X_ANA_INPUT_SEL_2, 0, dac_text);



static const struct snd_kcontrol_new dac_spk_ear_mux =

	SOC_DAPM_ENUM("DAC SP Mux", dac_spk_ear_enum);
@@ -677,29 +677,29 @@ static const char *in_text[] = { 
	"Digital", "Analog",

};



static const struct soc_enum hs1_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_TO_ANA, 0, 2, in_text);

static SOC_ENUM_SINGLE_DECL(hs1_enum,

			    PM860X_ANA_TO_ANA, 0, in_text);



static const struct snd_kcontrol_new hs1_mux =

	SOC_DAPM_ENUM("Headset1 Mux", hs1_enum);



/* Headset 2 Mux / Mux16 */

static const struct soc_enum hs2_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_TO_ANA, 1, 2, in_text);

static SOC_ENUM_SINGLE_DECL(hs2_enum,

			    PM860X_ANA_TO_ANA, 1, in_text);



static const struct snd_kcontrol_new hs2_mux =

	SOC_DAPM_ENUM("Headset2 Mux", hs2_enum);



/* Lineout 1 Mux / Mux17 */

static const struct soc_enum lo1_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_TO_ANA, 2, 2, in_text);

static SOC_ENUM_SINGLE_DECL(lo1_enum,

			    PM860X_ANA_TO_ANA, 2, in_text);



static const struct snd_kcontrol_new lo1_mux =

	SOC_DAPM_ENUM("Lineout1 Mux", lo1_enum);



/* Lineout 2 Mux / Mux18 */

static const struct soc_enum lo2_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_TO_ANA, 3, 2, in_text);

static SOC_ENUM_SINGLE_DECL(lo2_enum,

			    PM860X_ANA_TO_ANA, 3, in_text);



static const struct snd_kcontrol_new lo2_mux =

	SOC_DAPM_ENUM("Lineout2 Mux", lo2_enum);
@@ -709,8 +709,8 @@ static const char *spk_text[] = { 
	"Earpiece", "Speaker",

};



static const struct soc_enum spk_enum =

	SOC_ENUM_SINGLE(PM860X_ANA_TO_ANA, 6, 2, spk_text);

static SOC_ENUM_SINGLE_DECL(spk_enum,

			    PM860X_ANA_TO_ANA, 6, spk_text);



static const struct snd_kcontrol_new spk_demux =

	SOC_DAPM_ENUM("Speaker Earpiece Demux", spk_enum);
@@ -720,8 +720,8 @@ static const char *mic_text[] = { 
	"Mic 1", "Mic 2",

};



static const struct soc_enum mic_enum =

	SOC_ENUM_SINGLE(PM860X_ADC_ANA_4, 4, 2, mic_text);

static SOC_ENUM_SINGLE_DECL(mic_enum,

			    PM860X_ADC_ANA_4, 4, mic_text);



static const struct snd_kcontrol_new mic_mux =

	SOC_DAPM_ENUM("MIC Mux", mic_enum);

sound/soc/codecs/Kconfig

+103 −36
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ config SND_SOC_I2C_AND_SPI 
	default y if I2C=y

	default y if SPI_MASTER=y



menu "CODEC drivers"



config SND_SOC_ALL_CODECS

	tristate "Build all ASoC CODEC drivers"

	depends on COMPILE_TEST
@@ -16,15 +18,20 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_AB8500_CODEC if ABX500_CORE

	select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS

	select SND_SOC_AD1836 if SPI_MASTER

	select SND_SOC_AD193X if SND_SOC_I2C_AND_SPI

	select SND_SOC_AD193X_SPI if SPI_MASTER

	select SND_SOC_AD193X_I2C if I2C

	select SND_SOC_AD1980 if SND_SOC_AC97_BUS

	select SND_SOC_AD73311

	select SND_SOC_ADAU1373 if I2C

	select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI

	select SND_SOC_ADAV801 if SPI_MASTER

	select SND_SOC_ADAV803 if I2C

	select SND_SOC_ADAU1977_SPI if SPI_MASTER

	select SND_SOC_ADAU1977_I2C if I2C

	select SND_SOC_ADAU1701 if I2C

	select SND_SOC_ADS117X

	select SND_SOC_AK4104 if SPI_MASTER

	select SND_SOC_AK4535 if I2C

	select SND_SOC_AK4554

	select SND_SOC_AK4641 if I2C

	select SND_SOC_AK4642 if I2C

	select SND_SOC_AK4671 if I2C
@@ -184,6 +191,14 @@ config SND_SOC_AD1836 
config SND_SOC_AD193X

	tristate



config SND_SOC_AD193X_SPI

	tristate

	select SND_SOC_AD193X



config SND_SOC_AD193X_I2C

	tristate

	select SND_SOC_AD193X



config SND_SOC_AD1980

	tristate
@@ -191,41 +206,66 @@ config SND_SOC_AD73311 
	tristate



config SND_SOC_ADAU1701

	tristate "Analog Devices ADAU1701 CODEC"

	depends on I2C

	select SND_SOC_SIGMADSP

	tristate



config SND_SOC_ADAU1373

	tristate



config SND_SOC_ADAU1977

	tristate



config SND_SOC_ADAU1977_SPI

	tristate

	select SND_SOC_ADAU1977

	select REGMAP_SPI



config SND_SOC_ADAU1977_I2C

	tristate

	select SND_SOC_ADAU1977

	select REGMAP_I2C



config SND_SOC_ADAV80X

	tristate



config SND_SOC_ADAV801

	tristate

	select SND_SOC_ADAV80X



config SND_SOC_ADAV803

	tristate

	select SND_SOC_ADAV80X



config SND_SOC_ADS117X

	tristate



config SND_SOC_AK4104

	tristate

	tristate "AKM AK4104 CODEC"

	depends on SPI_MASTER



config SND_SOC_AK4535

	tristate



config SND_SOC_AK4554

	tristate

	tristate "AKM AK4554 CODEC"



config SND_SOC_AK4641

	tristate



config SND_SOC_AK4642

	tristate

	tristate "AKM AK4642 CODEC"

	depends on I2C



config SND_SOC_AK4671

	tristate



config SND_SOC_AK5386

	tristate

	tristate "AKM AK5638 CODEC"



config SND_SOC_ALC5623

       tristate



config SND_SOC_ALC5632

	tristate
@@ -236,14 +276,17 @@ config SND_SOC_CS42L51 
	tristate



config SND_SOC_CS42L52

	tristate

	tristate "Cirrus Logic CS42L52 CODEC"

	depends on I2C



config SND_SOC_CS42L73

	tristate

	tristate "Cirrus Logic CS42L73 CODEC"

	depends on I2C



# Cirrus Logic CS4270 Codec

config SND_SOC_CS4270

	tristate

	tristate "Cirrus Logic CS4270 CODEC"

	depends on I2C



# Cirrus Logic CS4270 Codec VD = 3.3V Errata

# Select if you are affected by the errata where the part will not function
@@ -254,7 +297,8 @@ config SND_SOC_CS4270_VD33_ERRATA 
	depends on SND_SOC_CS4270



config SND_SOC_CS4271

	tristate

	tristate "Cirrus Logic CS4271 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_CX20442

	tristate
@@ -285,6 +329,9 @@ config SND_SOC_BT_SCO 
config SND_SOC_DMIC

	tristate



config SND_SOC_HDMI_CODEC

       tristate "HDMI stub CODEC"



config SND_SOC_ISABELLE

        tristate
@@ -303,14 +350,13 @@ config SND_SOC_MAX98095 
config SND_SOC_MAX9850

	tristate



config SND_SOC_HDMI_CODEC

       tristate



config SND_SOC_PCM1681

       tristate

	tristate "Texas Instruments PCM1681 CODEC"

	depends on I2C



config SND_SOC_PCM1792A

       tristate

	tristate "Texas Instruments PCM1792A CODEC"

	depends on SPI_MASTER



config SND_SOC_PCM3008

       tristate
@@ -338,7 +384,8 @@ config SND_SOC_RT5640 


#Freescale sgtl5000 codec

config SND_SOC_SGTL5000

	tristate

	tristate "Freescale SGTL5000 CODEC"

	depends on I2C



config SND_SOC_SI476X

	tristate
@@ -351,7 +398,7 @@ config SND_SOC_SN95031 
	tristate



config SND_SOC_SPDIF

	tristate

	tristate "S/PDIF CODEC"



config SND_SOC_SSM2518

	tristate
@@ -369,7 +416,8 @@ config SND_SOC_STAC9766 
	tristate



config SND_SOC_TAS5086

	tristate

	tristate "Texas Instruments TAS5086 speaker amplifier"

	depends on I2C



config SND_SOC_TLV320AIC23

	tristate
@@ -382,7 +430,8 @@ config SND_SOC_TLV320AIC32X4 
	tristate



config SND_SOC_TLV320AIC3X

	tristate

	tristate "Texas Instruments TLV320AIC3x CODECs"

	depends on I2C



config SND_SOC_TLV320DAC33

	tristate
@@ -431,55 +480,69 @@ config SND_SOC_WM8400 
	tristate



config SND_SOC_WM8510

	tristate

	tristate "Wolfson Microelectronics WM8510 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8523

	tristate

	tristate "Wolfson Microelectronics WM8523 DAC"

	depends on I2C



config SND_SOC_WM8580

	tristate

	tristate "Wolfson Microelectronics WM8523 CODEC"

	depends on I2C



config SND_SOC_WM8711

	tristate

	tristate "Wolfson Microelectronics WM8711 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8727

	tristate



config SND_SOC_WM8728

	tristate

	tristate "Wolfson Microelectronics WM8728 DAC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8731

	tristate

	tristate "Wolfson Microelectronics WM8731 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8737

	tristate

	tristate "Wolfson Microelectronics WM8737 ADC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8741

	tristate

	tristate "Wolfson Microelectronics WM8737 DAC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8750

	tristate

	tristate "Wolfson Microelectronics WM8750 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8753

	tristate

	tristate "Wolfson Microelectronics WM8753 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8770

	tristate

	tristate "Wolfson Microelectronics WM8770 CODEC"

	depends on SPI_MASTER



config SND_SOC_WM8776

	tristate

	tristate "Wolfson Microelectronics WM8776 CODEC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8782

	tristate



config SND_SOC_WM8804

	tristate

	tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8900

	tristate



config SND_SOC_WM8903

	tristate

	tristate "Wolfson Microelectronics WM8903 CODEC"

	depends on I2C



config SND_SOC_WM8904

	tristate
@@ -497,7 +560,8 @@ config SND_SOC_WM8961 
	tristate



config SND_SOC_WM8962

	tristate

	tristate "Wolfson Microelectronics WM8962 CODEC"

	depends on I2C



config SND_SOC_WM8971

	tristate
@@ -570,4 +634,7 @@ config SND_SOC_ML26124 
	tristate



config SND_SOC_TPA6130A2

	tristate
 
	tristate "Texas Instruments TPA6130A2 headphone amplifier"

	depends on I2C



endmenu