Commit b5a8342c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552',... 

Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552', 'asoc/topic/tas3a227e' and 'asoc/topic/tas571x' into asoc-next
parents 19726b0e c9eac462 a571cb17 a650bb34 97fceb4d

Documentation/devicetree/bindings/sound/tas571x.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
Texas Instruments TAS5711/TAS5717/TAS5719 stereo power amplifiers



The codec is controlled through an I2C interface.  It also has two other

signals that can be wired up to GPIOs: reset (strongly recommended), and

powerdown (optional).



Required properties:



- compatible: "ti,tas5711", "ti,tas5717", or "ti,tas5719"

- reg: The I2C address of the device

- #sound-dai-cells: must be equal to 0



Optional properties:



- reset-gpios: GPIO specifier for the TAS571x's active low reset line

- pdn-gpios: GPIO specifier for the TAS571x's active low powerdown line

- clocks: clock phandle for the MCLK input

- clock-names: should be "mclk"

- AVDD-supply: regulator phandle for the AVDD supply (all chips)

- DVDD-supply: regulator phandle for the DVDD supply (all chips)

- HPVDD-supply: regulator phandle for the HPVDD supply (5717/5719)

- PVDD_AB-supply: regulator phandle for the PVDD_AB supply (5717/5719)

- PVDD_CD-supply: regulator phandle for the PVDD_CD supply (5717/5719)

- PVDD_A-supply: regulator phandle for the PVDD_A supply (5711)

- PVDD_B-supply: regulator phandle for the PVDD_B supply (5711)

- PVDD_C-supply: regulator phandle for the PVDD_C supply (5711)

- PVDD_D-supply: regulator phandle for the PVDD_D supply (5711)



Example:



	tas5717: audio-codec@2a {

		compatible = "ti,tas5717";

		reg = <0x2a>;

		#sound-dai-cells = <0>;



		reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;

		pdn-gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;



		clocks = <&clk_core CLK_I2S>;

		clock-names = "mclk";

	};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -9922,6 +9922,12 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/ethernet/ti/netcp*



TI TAS571X FAMILY ASoC CODEC DRIVER

M:	Kevin Cernekee <cernekee@chromium.org>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Odd Fixes

F:	sound/soc/codecs/tas571x*



TI TWL4030 SERIES SOC CODEC DRIVER

M:	Peter Ujfalusi <peter.ujfalusi@ti.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

include/dt-bindings/sound/tas2552.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#ifndef __DT_TAS2552_H

#define __DT_TAS2552_H



#define TAS2552_PLL_CLKIN		(0)

#define TAS2552_PDM_CLK			(1)

#define TAS2552_CLK_TARGET_MASK		(1)



#define TAS2552_PLL_CLKIN_MCLK		((0 << 1) | TAS2552_PLL_CLKIN)

#define TAS2552_PLL_CLKIN_BCLK		((1 << 1) | TAS2552_PLL_CLKIN)

#define TAS2552_PLL_CLKIN_IVCLKIN	((2 << 1) | TAS2552_PLL_CLKIN)

#define TAS2552_PLL_CLKIN_1_8_FIXED	((3 << 1) | TAS2552_PLL_CLKIN)



#define TAS2552_PDM_CLK_PLL		((0 << 1) | TAS2552_PDM_CLK)

#define TAS2552_PDM_CLK_IVCLKIN		((1 << 1) | TAS2552_PDM_CLK)

#define TAS2552_PDM_CLK_BCLK		((2 << 1) | TAS2552_PDM_CLK)

#define TAS2552_PDM_CLK_MCLK		((3 << 1) | TAS2552_PDM_CLK)



#endif /* __DT_TAS2552_H */

sound/soc/codecs/Kconfig

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

	select SND_SOC_TAS2552 if I2C

	select SND_SOC_TAS5086 if I2C

	select SND_SOC_TAS571X if I2C

	select SND_SOC_TFA9879 if I2C

	select SND_SOC_TLV320AIC23_I2C if I2C

	select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@ -612,6 +613,10 @@ config SND_SOC_TAS5086 
	tristate "Texas Instruments TAS5086 speaker amplifier"

	depends on I2C



config SND_SOC_TAS571X

	tristate "Texas Instruments TAS5711/TAS5717/TAS5719 power amplifiers"

	depends on I2C



config SND_SOC_TFA9879

	tristate "NXP Semiconductors TFA9879 amplifier"

	depends on I2C

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ snd-soc-sta350-objs := sta350.o 
snd-soc-sta529-objs := sta529.o

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

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

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

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

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

snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
@@ -288,6 +289,7 @@ obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o 
obj-$(CONFIG_SND_SOC_STAC9766)	+= snd-soc-stac9766.o

obj-$(CONFIG_SND_SOC_TAS2552)	+= snd-soc-tas2552.o

obj-$(CONFIG_SND_SOC_TAS5086)	+= snd-soc-tas5086.o

obj-$(CONFIG_SND_SOC_TAS571X)	+= snd-soc-tas571x.o

obj-$(CONFIG_SND_SOC_TFA9879)	+= snd-soc-tfa9879.o

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE