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

Commit 33ee617f authored by Liam Girdwood's avatar Liam Girdwood
Browse files

Merge remote branch 'tiwai/topic/asoc' into for-2.6.38

parents 0a27f050 9e3be1ed

include/sound/alc5623.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#ifndef _INCLUDE_SOUND_ALC5623_H

#define _INCLUDE_SOUND_ALC5623_H

struct alc5623_platform_data {

	/* configure :                              */

	/* Lineout/Speaker Amps Vmid ratio control  */

	/* enable/disable adc/dac high pass filters */

	unsigned int add_ctrl;

	/* configure :                              */

	/* output to enable when jack is low        */

	/* output to enable when jack is high       */

	/* jack detect (gpio/nc/jack detect [12]    */

	unsigned int jack_det_ctrl;

};

#endif

sound/soc/codecs/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_AK4535 if I2C

	select SND_SOC_AK4642 if I2C

	select SND_SOC_AK4671 if I2C

	select SND_SOC_ALC5623 if I2C

	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC

	select SND_SOC_CS42L51 if I2C

	select SND_SOC_CS4270 if I2C

	select SND_SOC_CX20442

	select SND_SOC_DA7210 if I2C

	select SND_SOC_JZ4740 if SOC_JZ4740

	select SND_SOC_JZ4740_CODEC if SOC_JZ4740

	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX9877 if I2C

	select SND_SOC_PCM3008
@@ -129,6 +131,9 @@ config SND_SOC_AK4642 
config SND_SOC_AK4671

	tristate



config SND_SOC_ALC5623

       tristate



config SND_SOC_CQ0093VC

	tristate
@@ -317,3 +322,4 @@ config SND_SOC_WM2000 


config SND_SOC_WM9090

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ snd-soc-da7210-objs := da7210.o 
snd-soc-l3-objs := l3.o

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

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

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

snd-soc-spdif-objs := spdif_transciever.o

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

snd-soc-stac9766-objs := stac9766.o
@@ -92,6 +93,7 @@ obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o 
obj-$(CONFIG_SND_SOC_JZ4740_CODEC)	+= snd-soc-jz4740-codec.o

obj-$(CONFIG_SND_SOC_MAX98088)	+= snd-soc-max98088.o

obj-$(CONFIG_SND_SOC_PCM3008)	+= snd-soc-pcm3008.o

obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o

obj-$(CONFIG_SND_SOC_SPDIF)	+= snd-soc-spdif.o

obj-$(CONFIG_SND_SOC_SSM2602)	+= snd-soc-ssm2602.o

obj-$(CONFIG_SND_SOC_STAC9766)	+= snd-soc-stac9766.o