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

Commit 1d471cd1 authored by Javier Martin's avatar Javier Martin Committed by Mark Brown
Browse files

ASoC: Add TI tlv320aic32x4 codec support. 



This patch adds support for tlv320aic3205 and tlv320aic3254 codecs.
It doesn't include miniDSP support for aic3254.

Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 28e9ad92

include/sound/tlv320aic32x4.h

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

 * tlv320aic32x4.h  --  TLV320AIC32X4 Soc Audio driver platform data

 *

 * Copyright 2011 Vista Silicon S.L.

 *

 * Author: Javier Martin <javier.martin@vista-silicon.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _AIC32X4_PDATA_H

#define _AIC32X4_PDATA_H



#define AIC32X4_PWR_MICBIAS_2075_LDOIN		0x00000001

#define AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE	0x00000002

#define AIC32X4_PWR_AIC32X4_LDO_ENABLE		0x00000004

#define AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36	0x00000008

#define AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED	0x00000010



#define AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K	0x00000001

#define AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K	0x00000002



struct aic32x4_pdata {

	u32 power_cfg;

	u32 micpga_routing;

	bool swapdacs;

};



#endif

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_STAC9766 if SND_SOC_AC97_BUS

	select SND_SOC_TLV320AIC23 if I2C

	select SND_SOC_TLV320AIC26 if SPI_MASTER

	select SND_SOC_TVL320AIC32X4 if I2C

	select SND_SOC_TLV320AIC3X if I2C

	select SND_SOC_TPA6130A2 if I2C

	select SND_SOC_TLV320DAC33 if I2C
@@ -206,6 +207,9 @@ config SND_SOC_TLV320AIC26 
	tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE

	depends on SPI



config SND_SOC_TVL320AIC32X4

	tristate



config SND_SOC_TLV320AIC3X

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ snd-soc-stac9766-objs := stac9766.o 
snd-soc-tlv320aic23-objs := tlv320aic23.o

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

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

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

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

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

snd-soc-twl6040-objs := twl6040.o
@@ -112,6 +113,7 @@ obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o 
obj-$(CONFIG_SND_SOC_TLV320AIC23)	+= snd-soc-tlv320aic23.o

obj-$(CONFIG_SND_SOC_TLV320AIC26)	+= snd-soc-tlv320aic26.o

obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o

obj-$(CONFIG_SND_SOC_TVL320AIC32X4)     += snd-soc-tlv320aic32x4.o

obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o

obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o

obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o