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

Commit a754a87c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Olof Johansson
Browse files

Merge tag 'asoc-3.4' of... 

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound

 into next/boards

The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
	arch/arm/mach-omap2/board-omap4panda.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 70688056 22f8d055

Documentation/devicetree/bindings/sound/alc5632.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
ALC5632 audio CODEC



This device supports I2C only.



Required properties:



  - compatible : "realtek,alc5632"



  - reg : the I2C address of the device.



  - gpio-controller : Indicates this device is a GPIO controller.



  - #gpio-cells : Should be two. The first cell is the pin number and the

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



Example:



alc5632: alc5632@1e {

	compatible = "realtek,alc5632";

	reg = <0x1a>;



	gpio-controller;

	#gpio-cells = <2>;

};

Documentation/devicetree/bindings/sound/imx-audmux.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Freescale Digital Audio Mux (AUDMUX) device



Required properties:

- compatible : "fsl,imx21-audmux" for AUDMUX version firstly used on i.MX21,

  or "fsl,imx31-audmux" for the version firstly used on i.MX31.

- reg : Should contain AUDMUX registers location and length



Example:



audmux@021d8000 {

	compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";

	reg = <0x021d8000 0x4000>;

};

Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
NVIDIA Tegra audio complex



Required properties:

- compatible : "nvidia,tegra-audio-alc5632"

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

- nvidia,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 ALC5632's pins:



  ALC5632 pins:



  * 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



  Board connectors:



  * Headset Stereophone

  * Int Spk

  * Headset Mic

  * Digital Mic



- nvidia,i2s-controller : The phandle of the Tegra I2S controller

- nvidia,audio-codec : The phandle of the ALC5632 audio codec



Example:



sound {

	compatible = "nvidia,tegra-audio-alc5632-paz00",

				 "nvidia,tegra-audio-alc5632";



	nvidia,model = "Compal PAZ00";



	nvidia,audio-routing =

				"Int Spk", "SPK_OUTP",

				"Int Spk", "SPK_OUTN",

				"Headset Mic","MICBIAS1",

				"MIC1_N", "Headset Mic",

				"MIC1_P", "Headset Mic",

				"Headset Stereophone", "HP_OUT_R",

				"Headset Stereophone", "HP_OUT_L";



	nvidia,i2s-controller = <&tegra_i2s1>;

	nvidia,audio-codec = <&alc5632>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ picochip Picochip Ltd 
powervr	Imagination Technologies

qcom	Qualcomm, Inc.

ramtron	Ramtron International

realtek Realtek Semiconductor Corp.

samsung	Samsung Semiconductor

sbs	Smart Battery System

schindler	Schindler