Unverified Commit 7f4b8750 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/sun4i-i2s', 'asoc/topic/sunxi',... 

Merge remote-tracking branches 'asoc/topic/sun4i-i2s', 'asoc/topic/sunxi', 'asoc/topic/symmetry', 'asoc/topic/tas5720' and 'asoc/topic/tas6424' into asoc-next
parents 6486cae8 2ff739b9 5a0cf024 574d31d0 d5eb436a 157b68ba

Documentation/devicetree/bindings/sound/sun4i-i2s.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
- compatible: should be one of the following:

   - "allwinner,sun4i-a10-i2s"

   - "allwinner,sun6i-a31-i2s"

   - "allwinner,sun8i-a83t-i2s"

   - "allwinner,sun8i-h3-i2s"

- reg: physical base address of the controller and length of memory mapped

  region.
@@ -23,6 +24,7 @@ Required properties: 


Required properties for the following compatibles:

	- "allwinner,sun6i-a31-i2s"

	- "allwinner,sun8i-a83t-i2s"

	- "allwinner,sun8i-h3-i2s"

- resets: phandle to the reset line for this codec

Documentation/devicetree/bindings/sound/tas5720.txt

+3 −1
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ audio playback. For more product information please see the links below: 


http://www.ti.com/product/TAS5720L

http://www.ti.com/product/TAS5720M

http://www.ti.com/product/TAS5722L



Required properties:



- compatible : "ti,tas5720"

- compatible : "ti,tas5720",

               "ti,tas5722"

- reg : I2C slave address

- dvdd-supply : phandle to a 3.3-V supply for the digital circuitry

- pvdd-supply : phandle to a supply used for the Class-D amp and the analog

Documentation/devicetree/bindings/sound/ti,tas6424.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Texas Instruments TAS6424 Quad-Channel Audio amplifier



The TAS6424 serial control bus communicates through I2C protocols.



Required properties:

	- compatible: "ti,tas6424" - TAS6424

	- reg: I2C slave address

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



Example:



tas6424: tas6424@6a {

	compatible = "ti,tas6424";

	reg = <0x6a>;



	#sound-dai-cells = <0>;

};



For more product information please see the link below:

http://www.ti.com/product/TAS6424-Q1

include/sound/soc-dai.h

+0 −3
Original line number Diff line number Diff line
@@ -296,9 +296,6 @@ struct snd_soc_dai { 
	/* DAI runtime info */

	unsigned int capture_active:1;		/* stream is in use */

	unsigned int playback_active:1;		/* stream is in use */

	unsigned int symmetric_rates:1;

	unsigned int symmetric_channels:1;

	unsigned int symmetric_samplebits:1;

	unsigned int probed:1;



	unsigned int active;

sound/soc/codecs/Kconfig

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

	select SND_SOC_TAS571X if I2C

	select SND_SOC_TAS5720 if I2C

	select SND_SOC_TAS6424 if I2C

	select SND_SOC_TFA9879 if I2C

	select SND_SOC_TLV320AIC23_I2C if I2C

	select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@ -905,6 +906,13 @@ config SND_SOC_TAS5720 
	  Enable support for Texas Instruments TAS5720L/M high-efficiency mono

	  Class-D audio power amplifiers.



config SND_SOC_TAS6424

	tristate "Texas Instruments TAS6424 Quad-Channel Audio amplifier"

	depends on I2C

	help

	  Enable support for Texas Instruments TAS6424 high-efficiency

	  digital input quad-channel Class-D audio power amplifiers.



config SND_SOC_TFA9879

	tristate "NXP Semiconductors TFA9879 amplifier"

	depends on I2C