Unverified Commit 04a1254c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/tlv320dac33',... 

Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e', 'asoc/topic/tscs42xx' and 'asoc/topic/twl4030' into asoc-next
parents 3f8fe9be 3d3dd0d3 af0f6c58 3511108a 3bb0f7c3

Documentation/devicetree/bindings/sound/tscs42xx.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
TSCS42XX Audio CODEC



Required Properties:



	- compatible :	"tempo,tscs42A1" for analog mic

			"tempo,tscs42A2" for digital mic



	- reg : 	<0x71> for analog mic

			<0x69> for digital mic



Example:



wookie: codec@69 {

	compatible = "tempo,tscs42A2";

	reg = <0x69>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ tcg Trusted Computing Group 
tcl	Toby Churchill Ltd.

technexion	TechNexion

technologic	Technologic Systems

tempo	Tempo Semiconductor

terasic	Terasic Inc.

thine	THine Electronics, Inc.

ti	Texas Instruments

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -13850,6 +13850,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git 
S:	Maintained

K:	^Subject:.*(?i)trivial



TEMPO SEMICONDUCTOR DRIVERS

M:	Steven Eckhoff <steven.eckhoff.opensource@gmail.com>

S:	Maintained

F:	sound/soc/codecs/tscs*.c

F:	sound/soc/codecs/tscs*.h

F:	Documentation/devicetree/bindings/sound/tscs*.txt



TTY LAYER

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

M:	Jiri Slaby <jslaby@suse.com>

sound/soc/codecs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_TLV320AIC3X if I2C

	select SND_SOC_TPA6130A2 if I2C

	select SND_SOC_TLV320DAC33 if I2C

	select SND_SOC_TSCS42XX if I2C

	select SND_SOC_TS3A227E if I2C

	select SND_SOC_TWL4030 if TWL4030_CORE

	select SND_SOC_TWL6040 if TWL6040_CORE
@@ -959,6 +960,13 @@ config SND_SOC_TS3A227E 
	tristate "TI Headset/Mic detect and keypress chip"

	depends on I2C



config SND_SOC_TSCS42XX

	tristate "Tempo Semiconductor TSCS42xx CODEC"

	depends on I2C

	select REGMAP_I2C

	help

	  Add support for Tempo Semiconductor's TSCS42xx audio CODEC.



config SND_SOC_TWL4030

	select MFD_TWL4030_AUDIO

	tristate

sound/soc/codecs/Makefile

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

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

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

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

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

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

snd-soc-twl6040-objs := twl6040.o
@@ -415,6 +416,7 @@ obj-$(CONFIG_SND_SOC_TLV320AIC32X4_I2C) += snd-soc-tlv320aic32x4-i2c.o 
obj-$(CONFIG_SND_SOC_TLV320AIC32X4_SPI)	+= snd-soc-tlv320aic32x4-spi.o

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

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

obj-$(CONFIG_SND_SOC_TSCS42XX)	+= snd-soc-tscs42xx.o

obj-$(CONFIG_SND_SOC_TS3A227E)	+= snd-soc-ts3a227e.o

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

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