Commit 202f5ecb authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/adav80x',... 

Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/adav80x', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next
parents 0451b02e 1a65864a a34c31a9 69a6582e 0ef9dc13

drivers/regulator/arizona-ldo1.c

+0 −5
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ static int arizona_ldo1_hc_set_voltage_sel(struct regulator_dev *rdev, 
	if (ret != 0)

		return ret;



	ret = regmap_update_bits(regmap, ARIZONA_DYNAMIC_FREQUENCY_SCALING_1,

				 ARIZONA_SUBSYS_MAX_FREQ, val);

	if (ret != 0)

		return ret;



	if (val)

		return 0;

sound/soc/atmel/Kconfig

+8 −12
Original line number Diff line number Diff line
@@ -6,27 +6,22 @@ config SND_ATMEL_SOC 
	  the ATMEL SSC interface. You will also need

	  to select the audio interfaces to support below.



if SND_ATMEL_SOC



config SND_ATMEL_SOC_PDC

	tristate

	depends on SND_ATMEL_SOC

	bool



config SND_ATMEL_SOC_DMA

	tristate

	depends on SND_ATMEL_SOC

	bool

	select SND_SOC_GENERIC_DMAENGINE_PCM



config SND_ATMEL_SOC_SSC

	tristate

	depends on SND_ATMEL_SOC

	help

	  Say Y or M if you want to add support for codecs the

	  ATMEL SSC interface. You will also needs to select the individual

	  machine drivers to support below.



config SND_AT91_SOC_SAM9G20_WM8731

	tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"

	depends on ARCH_AT91 || COMPILE_TEST

	depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI

	depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI

	select SND_ATMEL_SOC_PDC

	select SND_ATMEL_SOC_SSC

	select SND_SOC_WM8731
@@ -37,7 +32,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 
config SND_ATMEL_SOC_WM8904

	tristate "Atmel ASoC driver for boards using WM8904 codec"

	depends on ARCH_AT91 || COMPILE_TEST

	depends on ATMEL_SSC && SND_ATMEL_SOC && I2C

	depends on ATMEL_SSC && I2C

	select SND_ATMEL_SOC_SSC

	select SND_ATMEL_SOC_DMA

	select SND_SOC_WM8904
@@ -48,10 +43,11 @@ config SND_ATMEL_SOC_WM8904 
config SND_AT91_SOC_SAM9X5_WM8731

	tristate "SoC Audio support for WM8731-based at91sam9x5 board"

	depends on ARCH_AT91 || COMPILE_TEST

	depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI

	depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI

	select SND_ATMEL_SOC_SSC

	select SND_ATMEL_SOC_DMA

	select SND_SOC_WM8731

	help

	  Say Y if you want to add support for audio SoC on an

	  at91sam9x5 based board that is using WM8731 codec.

endif

sound/soc/atmel/Makefile

+3 −5
Original line number Diff line number Diff line 
# AT91 Platform Support

snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o

snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o

snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o

snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_PDC) := atmel-pcm-pdc.o

snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_DMA) += atmel-pcm-dma.o

snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o $(snd-soc-atmel-pcm-y)



obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o

obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o

obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o



# AT91 Machine Support

sound/soc/atmel/sam9g20_wm8731.c

+3 −7
Original line number Diff line number Diff line
@@ -95,8 +95,9 @@ static const struct snd_soc_dapm_widget at91sam9g20ek_dapm_widgets[] = { 


static const struct snd_soc_dapm_route intercon[] = {



	/* speaker connected to LHPOUT */

	/* speaker connected to LHPOUT/RHPOUT */

	{"Ext Spk", NULL, "LHPOUT"},

	{"Ext Spk", NULL, "RHPOUT"},



	/* mic is connected to Mic Jack, with WM8731 Mic Bias */

	{"MICIN", NULL, "Mic Bias"},
@@ -108,9 +109,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
 */

static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	printk(KERN_DEBUG
@@ -124,10 +123,6 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	/* not connected */

	snd_soc_dapm_nc_pin(dapm, "RLINEIN");

	snd_soc_dapm_nc_pin(dapm, "LLINEIN");



#ifndef ENABLE_MIC_INPUT

	snd_soc_dapm_nc_pin(&rtd->card->dapm, "Int Mic");

#endif
@@ -158,6 +153,7 @@ static struct snd_soc_card snd_soc_at91sam9g20ek = { 
	.num_dapm_widgets = ARRAY_SIZE(at91sam9g20ek_dapm_widgets),

	.dapm_routes = intercon,

	.num_dapm_routes = ARRAY_SIZE(intercon),

	.fully_routed = true,

};



static int at91sam9g20ek_audio_probe(struct platform_device *pdev)

sound/soc/codecs/adau1977.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static const struct snd_soc_dapm_route adau1977_dapm_routes[] = { 
		ADAU1977_REG_DC_HPF_CAL, (x) - 1, 1, 0)



#define ADAU1977_DC_SUB_SWITCH(x) \

	SOC_SINGLE("ADC" #x " DC Substraction Capture Switch", \

	SOC_SINGLE("ADC" #x " DC Subtraction Capture Switch", \

		ADAU1977_REG_DC_HPF_CAL, (x) + 3, 1, 0)



static const struct snd_kcontrol_new adau1977_snd_controls[] = {