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

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

Merge tag 'asoc-v3.15' into asoc-next 

ASoC: Updates for v3.15

Quite a busy release for ASoC this time, more on janitorial work than
exciting new features but welcome nontheless:

 - Lots of cleanups from Takashi for enumerations; the original API for
   these was error prone so he's refactored lots of code to use more
   modern APIs which avoid issues.
 - Elimination of the ASoC level wrappers for I2C and SPI moving us
   closer to converting to regmap completely and avoiding some
   randconfig hassle.
 - Provide both manually and transparently locked DAPM APIs rather than
   a mix of the two fixing some concurrency issues.
 - Start converting CODEC drivers to use separate bus interface drivers
   rather than having them all in one file helping avoid dependency
   issues.
 - DPCM support for Intel Haswell and Bay Trail platforms.
 - Lots of work on improvements for simple-card, DaVinci and the Renesas
   rcar drivers.
 - New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
   CSR SiRF SoC.

# gpg: Signature made Wed 12 Mar 2014 23:05:45 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 db68b68d deeed338

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ atmel,24c02 i2c serial eeprom (24cxx) 
atmel,at97sc3204t	i2c trusted platform module (TPM)

capella,cm32181		CM32181: Ambient Light Sensor

catalyst,24c32		i2c serial eeprom

cirrus,cs42l51		Cirrus Logic CS42L51 audio codec

dallas,ds1307		64 x 8, Serial, I2C Real-Time Clock

dallas,ds1338		I2C RTC with 56-Byte NV RAM

dallas,ds1339		I2C Serial Real-Time Clock

Documentation/devicetree/bindings/misc/atmel-ssc.txt

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ Required properties for devices compatible with "atmel,at91sam9g45-ssc": 
  See Documentation/devicetree/bindings/dma/atmel-dma.txt for details.

- dma-names: Must be "tx", "rx".



Optional properties:

  - atmel,clk-from-rk-pin: bool property.

     - When SSC works in slave mode, according to the hardware design, the

       clock can get from TK pin, and also can get from RK pin. So, add

       this parameter to choose where the clock from.

     - By default the clock is from TK pin, if the clock from RK pin, this

       property is needed.



Examples:

- PDC transfer:

ssc0: ssc@fffbc000 {

Documentation/devicetree/bindings/sound/da9055.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
* Dialog DA9055 Audio CODEC



DA9055 provides Audio CODEC support (I2C only).



The Audio CODEC device in DA9055 has it's own I2C address which is configurable,

so the device is instantiated separately from the PMIC (MFD) device.



For details on accompanying PMIC I2C device, see the following:

Documentation/devicetree/bindings/mfd/da9055.txt



Required properties:



  - compatible: "dlg,da9055-codec"

  - reg: Specifies the I2C slave address





Example:



	codec: da9055-codec@1a {

		compatible = "dlg,da9055-codec";

		reg = <0x1a>;

	};

Documentation/devicetree/bindings/sound/davinci-evm-audio.txt

+8 −1
Original line number Diff line number Diff line
@@ -5,12 +5,19 @@ Required properties: 
- ti,model : The user-visible name of this sound complex.

- ti,audio-codec : The phandle of the TLV320AIC3x audio codec

- ti,mcasp-controller : The phandle of the McASP controller

- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec

- ti,audio-routing : A list of the connections between audio components.

  Each entry is a pair of strings, the first being the connection's sink,

  the second being the connection's source. Valid names for sources and

  sinks are the codec's pins, and the jacks on the board:



Optional properties:

- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec.

- clocks : Reference to the master clock

- clock-names : The clock should be named "mclk"

- Either codec-clock-rate or the codec-clock reference has to be defined. If

  the both are defined the driver attempts to set referenced clock to the

  defined rate and takes the rate from the clock reference.



  Board connectors:



  * Headphone Jack

Documentation/devicetree/bindings/sound/eukrea-tlv320.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Audio complex for Eukrea boards with tlv320aic23 codec.



Required properties:

- compatible : "eukrea,asoc-tlv320"

- eukrea,model : The user-visible name of this sound complex.

- ssi-controller : The phandle of the SSI controller.

- fsl,mux-int-port : The internal port of the i.MX audio muxer (AUDMUX).

- fsl,mux-ext-port : The external port of the i.MX audio muxer.



Note: The AUDMUX port numbering should start at 1, which is consistent with

hardware manual.



Example:



	sound {

		compatible = "eukrea,asoc-tlv320";

		eukrea,model = "imx51-eukrea-tlv320aic23";

		ssi-controller = <&ssi2>;

		fsl,mux-int-port = <2>;

		fsl,mux-ext-port = <3>;

	};