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

Commit e5edba46 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.19' of... 

Merge tag 'asoc-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.19

Lots and lots of changes this time around, the usual set of driver
updates and a huge bulk of cleanups from Lars-Peter.  Probably the most
interesting thing for most users is the Intel driver updates which will
(with some more machine integration work) enable support for newer x86
laptops.

 - Conversion of AC'97 drivers to use regmap, bringing us closer to the
   removal of the ASoC level I/O code.
 - Clean up a lot of old drivers that were open coding things that have
   subsequently been implemented in the core.
 - Some DAPM performance improvements.
 - Removal of the now seldom used CODEC mutex.
 - Lots of updates for the newer Intel SoC support, including support
   for the DSP and some Cherrytrail and Braswell machine drivers.
 - Support for Samsung boards using rt5631 as the CODEC.
 - Removal of the obsolete AFEB9260 machine driver.
 - Driver support for the TI TS3A227E headset driver used in some
   Chrombeooks.
parents 77de61c3 1810afd3

Documentation/devicetree/bindings/sound/arndale.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Audio Binding for Arndale boards



Required properties:

- compatible : Can be the following,

			"samsung,arndale-rt5631"



- samsung,audio-cpu: The phandle of the Samsung I2S controller

- samsung,audio-codec: The phandle of the audio codec



Optional:

- samsung,model: The name of the sound-card



Arndale Boards has many audio daughter cards, one of them is

rt5631/alc5631. Below example shows audio bindings for rt5631/

alc5631 based codec.



Example:



sound {

		compatible = "samsung,arndale-rt5631";



		samsung,audio-cpu = <&i2s0>

		samsung,audio-codec = <&rt5631>;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Optional properties: 
- rx-num-evt : FIFO levels.

- sram-size-playback : size of sram to be allocated during playback

- sram-size-capture  : size of sram to be allocated during capture

- interrupts : Interrupt numbers for McASP, currently not used by the driver

- interrupts : Interrupt numbers for McASP

- interrupt-names : Known interrupt names are "tx" and "rx"

- pinctrl-0: Should specify pin control group used for this controller.

- pinctrl-names: Should contain only one value - "default", for more details

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

+10 −5
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

Documentation/devicetree/bindings/sound/fsl,esai.txt

+23 −21
Original line number Diff line number Diff line
@@ -23,21 +23,23 @@ Required properties: 


  - clock-names		: Includes the following entries:

	"core"		  The core clock used to access registers

	"extal"		The esai baud clock for esai controller used to derive

			HCK, SCK and FS.

	"fsys"		The system clock derived from ahb clock used to derive

			HCK, SCK and FS.

	"extal"		  The esai baud clock for esai controller used to

			  derive HCK, SCK and FS.

	"fsys"		  The system clock derived from ahb clock used to

			  derive HCK, SCK and FS.



  - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs.

    This number is the maximum allowed value for TFCR[TFWM] or RFCR[RFWM].

  - fsl,fifo-depth	: The number of elements in the transmit and receive

			  FIFOs. This number is the maximum allowed value for

			  TFCR[TFWM] or RFCR[RFWM].



  - fsl,esai-synchronous: This is a boolean property. If present, indicating

    that ESAI would work in the synchronous mode, which means all the settings

    for Receiving would be duplicated from Transmition related registers.

			  that ESAI would work in the synchronous mode, which

			  means all the settings for Receiving would be

			  duplicated from Transmition related registers.



  - big-endian : If this property is absent, the native endian mode will

    be in use as default, or the big endian mode will be in use for all the

    device registers.

  - big-endian		: If this property is absent, the native endian mode

			  will be in use as default, or the big endian mode

			  will be in use for all the device registers.



Example:

Documentation/devicetree/bindings/sound/fsl,spdif.txt

+18 −19
Original line number Diff line number Diff line
@@ -20,18 +20,17 @@ Required properties: 
  - clocks		: Contains an entry for each entry in clock-names.



  - clock-names		: Includes the following entries:

	"core"		The core clock of spdif controller

	"core"		  The core clock of spdif controller.

	"rxtx<0-7>"	  Clock source list for tx and rx clock.

			This clock list should be identical to

			the source list connecting to the spdif

			clock mux in "SPDIF Transceiver Clock

			Diagram" of SoC reference manual. It

			can also be referred to TxClk_Source

			bit of register SPDIF_STC.



   - big-endian : If this property is absent, the native endian mode will

   be in use as default, or the big endian mode will be in use for all the

   device registers.

			  This clock list should be identical to the source

			  list connecting to the spdif clock mux in "SPDIF

			  Transceiver Clock Diagram" of SoC reference manual.

			  It can also be referred to TxClk_Source bit of

			  register SPDIF_STC.



   - big-endian		: If this property is absent, the native endian mode

			  will be in use as default, or the big endian mode

			  will be in use for all the device registers.



Example: