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

Commit 977dbfcf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound updates from Takashi Iwai:
 "Changes are seen in a wide range of codes, mainly due to ASoC DAPM
  requirements; HD-audio shows a high peak in diffstat, it's just a
  removal of bunch of old static quirks.

  Some highlights:

   - HDPM: Updates for AIO/RayDAT support, TCO/sync support

   - RME96: Add PCM sync support

   - HD-audio:

     * A few HDMI/DP audio updates (CA assignment fix, stream switching
       fix, Intel DP device list support)
     * Device specific fixes (ASUS/CXT HP mic support, Thinkpad mic
       improvements, Chromebook fixes, STAC9228 Dell fixes)
     * Replace the all static quirks for AD codecs with the generic
       parser
     * WAKEEN support for handling irqs in the power saving mode

   - USB-audio: Clean up implicit fb handling and related codes

   - DAPM is now mandatory for ASoC CODEC drivers; all existing drivers
     have had some level of DAPM support added.  In addition, a lot of
     cleanups and improvements in DAPM.

   - Support for ASoC cross-platform compile test

   - New drivers and support for Analog Devices ADAU1702 and
     ADAU1401(a), Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and
     WM8904 based machines, Freescale S/PDIF and SSI AC'97, Renesas
     R-Car SoCs, Samsung Exynos5420 SoCs, Texas Instruments PCM1681 and
     PCM1792A and Wolfson Microelectronics WM8997

   - DT bindings for kirkwood and i.MX S/PDIF

   - Clean up and bug fixes: ssm2602, rt5640 and sgtl5000.

   - Core helpers for bitbanged AC'97 reset"

* tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (375 commits)
  ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches
  ALSA: hda - hdmi: Fallback to ALSA allocation when selecting CA
  ASoC: mxs-sgtl5000: Configure the dai_links as unidirectional
  ASoC: soc-pcm: Allow to specify unidirectional dai_link
  ASoC: fsl_spdif: Staticse non-exported symbols
  ASoC: ssm2602: Fix cache sync
  ASoC: Remove unused sysfs_registered field from snd_soc_codec struct
  ASoC: Remove unused debugfs_dapm field from snd_soc_{platform,codec} struct
  ASoC: Remove unused control_type field from snd_soc_codec struct
  ASoC: fsl: Add one blank space after ':=' in Makefile
  ASoC: fsl: Add wrapping for dev_dbg() in fsl_spdif.c
  ASoC: rt5640: change widget sequence for depop
  ASoC: dapm: Fix auto-disable for inverted controls
  ASoC: fsl: Drop SND_SOC_FSL_UTILS from SND_SOC_IMX_SPDIF
  ASoC: Samsung: Do not queue cyclic buffers multiple times
  ASoC: ep93xx-i2s: Remove unnecessary dev_set_drvdata()
  ASoC: designware_i2s: Remove unnecessary dev_set_drvdata()
  ASoC: fsl_spdif: remove redundant dev_err call in fsl_spdif_probe()
  ASoC: fsl: Add S/PDIF machine driver
  ASoc: kirkwood: Use the Kirkwood audio driver in Dove boards
  ...
parents aa7054f5 b054087d

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

+22 −1
Original line number Diff line number Diff line
@@ -7,9 +7,30 @@ Required properties: 
- reg: Should contain SSC registers location and length

- interrupts: Should contain SSC interrupt



Example:



Required properties for devices compatible with "atmel,at91sam9g45-ssc":

- dmas: DMA specifier, consisting of a phandle to DMA controller node,

  the memory interface and SSC DMA channel ID (for tx and rx).

  See Documentation/devicetree/bindings/dma/atmel-dma.txt for details.

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



Examples:

- PDC transfer:

ssc0: ssc@fffbc000 {

	compatible = "atmel,at91rm9200-ssc";

	reg = <0xfffbc000 0x4000>;

	interrupts = <14 4 5>;

};



- DMA transfer:

ssc0: ssc@f0010000 {

      compatible = "atmel,at91sam9g45-ssc";

      reg = <0xf0010000 0x4000>;

      interrupts = <28 4 5>;

      dmas = <&dma0 1 13>,

	     <&dma0 1 14>;

      dma-names = "tx", "rx";

      pinctrl-names = "default";

      pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;

      status = "disabled";

};

Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt

0 → 100644
+65 −0
Original line number Diff line number Diff line 
Device tree bindings for Marvell PXA SSP ports



Required properties:



	- compatible:	Must be one of

				mrvl,pxa25x-ssp

				mvrl,pxa25x-nssp

				mrvl,pxa27x-ssp

				mrvl,pxa3xx-ssp

				mvrl,pxa168-ssp

				mrvl,pxa910-ssp

				mrvl,ce4100-ssp

				mrvl,lpss-ssp



	- reg:		The memory base

	- dmas:		Two dma phandles, one for rx, one for tx

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





Example for PXA3xx:



	ssp0: ssp@41000000 {

		compatible = "mrvl,pxa3xx-ssp";

		reg = <0x41000000 0x40>;

		ssp-id = <1>;

		interrupts = <24>;

		clock-names = "pxa27x-ssp.0";

		dmas = <&dma 13

			&dma 14>;

		dma-names = "rx", "tx";

	};



	ssp1: ssp@41700000 {

		compatible = "mrvl,pxa3xx-ssp";

		reg = <0x41700000 0x40>;

		ssp-id = <2>;

		interrupts = <16>;

		clock-names = "pxa27x-ssp.1";

		dmas = <&dma 15

			&dma 16>;

		dma-names = "rx", "tx";

	};



	ssp2: ssp@41900000 {

		compatibl3 = "mrvl,pxa3xx-ssp";

		reg = <0x41900000 0x40>;

		ssp-id = <3>;

		interrupts = <0>;

		clock-names = "pxa27x-ssp.2";

		dmas = <&dma 66

			&dma 67>;

		dma-names = "rx", "tx";

	};



	ssp3: ssp@41a00000 {

		compatible = "mrvl,pxa3xx-ssp";

		reg = <0x41a00000 0x40>;

		ssp-id = <4>;

		interrupts = <13>;

		clock-names = "pxa27x-ssp.3";

		dmas = <&dma 2

			&dma 3>;

		dma-names = "rx", "tx";

	};

Documentation/devicetree/bindings/sound/ak4554.c

0 → 100644
+11 −0
Original line number Diff line number Diff line 
AK4554 ADC/DAC



Required properties:



  - compatible : "asahi-kasei,ak4554"



Example:



ak4554-adc-dac {

	compatible = "asahi-kasei,ak4554";

};

Documentation/devicetree/bindings/sound/alc5632.txt

+19 −0
Original line number Diff line number Diff line
@@ -13,6 +13,25 @@ Required properties: 
  - #gpio-cells : Should be two. The first cell is the pin number and the

    second cell is used to specify optional parameters (currently unused).



Pins on the device (for linking into audio routes):



  * SPK_OUTP

  * SPK_OUTN

  * HP_OUT_L

  * HP_OUT_R

  * AUX_OUT_P

  * AUX_OUT_N

  * LINE_IN_L

  * LINE_IN_R

  * PHONE_P

  * PHONE_N

  * MIC1_P

  * MIC1_N

  * MIC2_P

  * MIC2_N

  * MICBIAS1

  * DMICDAT



Example:



alc5632: alc5632@1e {

Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* Atmel at91sam9x5ek wm8731 audio complex



Required properties:

  - compatible: "atmel,sam9x5-wm8731-audio"

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

  - atmel,ssc-controller: The phandle of the SSC controller

  - atmel,audio-codec: The phandle of the WM8731 audio codec

  - atmel,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.



Available audio endpoints for the audio-routing table:



Board connectors:

 * Headphone Jack

 * Line In Jack



wm8731 pins:

cf Documentation/devicetree/bindings/sound/wm8731.txt



Example:

sound {

	compatible = "atmel,sam9x5-wm8731-audio";



	atmel,model = "wm8731 @ AT91SAM9X5EK";



	atmel,audio-routing =

		"Headphone Jack", "RHPOUT",

		"Headphone Jack", "LHPOUT",

		"LLINEIN", "Line In Jack",

		"RLINEIN", "Line In Jack";



	atmel,ssc-controller = <&ssc0>;

	atmel,audio-codec = <&wm8731>;

};