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

Commit 56fe4897 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next

parents 1727428d e00447fa

Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

0 → 100644
+61 −0
Original line number Original line Diff line number Diff line 
Texas Instruments - tlv320aic31xx Codec module



The tlv320aic31xx serial control bus communicates through I2C protocols



Required properties:



- compatible - "string" - One of:

    "ti,tlv320aic310x" - Generic TLV320AIC31xx with mono speaker amp

    "ti,tlv320aic311x" - Generic TLV320AIC31xx with stereo speaker amp

    "ti,tlv320aic3100" - TLV320AIC3100 (mono speaker amp, no MiniDSP)

    "ti,tlv320aic3110" - TLV320AIC3110 (stereo speaker amp, no MiniDSP)

    "ti,tlv320aic3120" - TLV320AIC3120 (mono speaker amp, MiniDSP)

    "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)



- reg - <int> -  I2C slave address





Optional properties:



- gpio-reset - gpio pin number used for codec reset

- ai31xx-micbias-vg - MicBias Voltage setting

        1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V

        2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V

        3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD

	If this node is not mentioned or if the value is unknown, then

	micbias	is set to 2.0V.

- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,

  DVDD-supply : power supplies for the device as covered in

  Documentation/devicetree/bindings/regulator/regulator.txt



CODEC output pins:

  * HPL

  * HPR

  * SPL, devices with stereo speaker amp

  * SPR, devices with stereo speaker amp

  * SPK, devices with mono speaker amp

  * MICBIAS



CODEC input pins:

  * MIC1LP

  * MIC1RP

  * MIC1LM



The pins can be used in referring sound node's audio-routing property.



Example:

#include <dt-bindings/sound/tlv320aic31xx-micbias.h>



tlv320aic31xx: tlv320aic31xx@18 {

	compatible = "ti,tlv320aic311x";

	reg = <0x18>;



	ai31xx-micbias-vg = <MICBIAS_OFF>;



	HPVDD-supply = <&regulator>;

	SPRVDD-supply = <&regulator>;

	SPLVDD-supply = <&regulator>;

	AVDD-supply = <&regulator>;

	IOVDD-supply = <&regulator>;

	DVDD-supply = <&regulator>;

};

include/dt-bindings/sound/tlv320aic31xx-micbias.h

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
#ifndef __DT_TLV320AIC31XX_MICBIAS_H

#define __DT_TLV320AIC31XX_MICBIAS_H



#define MICBIAS_2_0V		1

#define MICBIAS_2_5V		2

#define MICBIAS_AVDDV		3



#endif /* __DT_TLV320AIC31XX_MICBIAS_H */

sound/soc/codecs/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_TLV320AIC23_I2C if I2C

	select SND_SOC_TLV320AIC23_I2C if I2C

	select SND_SOC_TLV320AIC23_SPI if SPI_MASTER

	select SND_SOC_TLV320AIC23_SPI if SPI_MASTER

	select SND_SOC_TLV320AIC26 if SPI_MASTER

	select SND_SOC_TLV320AIC26 if SPI_MASTER

	select SND_SOC_TLV320AIC31XX if I2C

	select SND_SOC_TLV320AIC32X4 if I2C

	select SND_SOC_TLV320AIC32X4 if I2C

	select SND_SOC_TLV320AIC3X if I2C

	select SND_SOC_TLV320AIC3X if I2C

	select SND_SOC_TPA6130A2 if I2C

	select SND_SOC_TPA6130A2 if I2C
@@ -449,6 +450,9 @@ config SND_SOC_TLV320AIC26 
	tristate

	tristate

	depends on SPI

	depends on SPI





config SND_SOC_TLV320AIC31XX

        tristate



config SND_SOC_TLV320AIC32X4

config SND_SOC_TLV320AIC32X4

	tristate

	tristate

sound/soc/codecs/Makefile

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

snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o

snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o

snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o

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

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

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

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

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

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

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

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

snd-soc-tlv320dac33-objs := tlv320dac33.o
@@ -223,6 +224,7 @@ obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o 
obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)	+= snd-soc-tlv320aic23-i2c.o

obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)	+= snd-soc-tlv320aic23-i2c.o

obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o

obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o

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

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

obj-$(CONFIG_SND_SOC_TLV320AIC31XX)     += snd-soc-tlv320aic31xx.o

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

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

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

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

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

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