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

Merge tag 'asoc-v3.15-2' into asoc-linus 

ASoC: Updates for v3.15

This is mostly a few additional fixes from Lars-Peter, a new driver and
cleaning up a git failure with merging the Intel branch (combined with
an xargs failure to pay attention to error codes).  The history lists a
bunch of additional commits for the branch but the content of those
commits is actually present already but not recorded in history due to
git failing.  Unfortunately xargs is used in the merge script and it
doesn't do a good job of noticing errors from the commands it invokes.

# gpg: Signature made Thu 13 Mar 2014 14:25:44 GMT using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
parents 30b58f22 56fe4897

Documentation/devicetree/bindings/sound/armada-370db-audio.txt

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
Device Tree bindings for the Armada 370 DB audio

================================================



These Device Tree bindings are used to describe the audio complex

found on the Armada 370 DB platform.



Mandatory properties:



 * compatible: must be "marvell,a370db-audio"



 * marvell,audio-controller: a phandle that points to the audio

   controller of the Armada 370 SoC.



 * marvell,audio-codec: a phandle that points to the analog audio

   codec connected to the Armada 370 SoC.



Example:



	sound {

	      compatible = "marvell,a370db-audio";

	      marvell,audio-controller = <&audio_controller>;

	      marvell,audio-codec = <&audio_codec>;

	      status = "okay";

	};

Documentation/devicetree/bindings/sound/mvebu-audio.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
- compatible:

- compatible:

  "marvell,kirkwood-audio" for Kirkwood platforms

  "marvell,kirkwood-audio" for Kirkwood platforms

  "marvell,dove-audio" for Dove platforms

  "marvell,dove-audio" for Dove platforms

  "marvell,armada370-audio" for Armada 370 platforms





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

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

  region.

  region.

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>;

};

MAINTAINERS

+7 −0
Original line number Original line Diff line number Diff line
@@ -2203,6 +2203,13 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers) 
S:	Odd Fixes

S:	Odd Fixes

F:	sound/soc/codecs/cs4270*

F:	sound/soc/codecs/cs4270*





CIRRUS LOGIC AUDIO CODEC DRIVERS

M:	Brian Austin <brian.austin@cirrus.com>

M:	Paul Handrigan <Paul.Handrigan@cirrus.com>

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

S:	Maintained

F:	sound/soc/codecs/cs*



CLEANCACHE API

CLEANCACHE API

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	linux-kernel@vger.kernel.org

L:	linux-kernel@vger.kernel.org

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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE