Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000',...

Samsung Exynos Odroid X2/U3 audio complex with MAX98090 codec

Required properties:

 - compatible : "samsung,odroidx2-audio" - for Odroid X2 board,

		"samsung,odroidu3-audio" - for Odroid U3 board

 - samsung,model : the user-visible name of this sound complex

 - samsung,i2s-controller : the phandle of the I2S controller

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

 - samsung,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 MAX98090's pins (as

   documented in its binding), and the jacks on the board

   For Odroid X2:

     * Headphone Jack

     * Mic Jack

     * DMIC

   For Odroid U3:

     * Headphone Jack

     * Speakers

Example:

sound {

	compatible = "samsung,odroidu3-audio";

	samsung,i2s-controller = <&i2s0>;

	samsung,audio-codec = <&max98090>;

	samsung,model = "Odroid-X2";

	samsung,audio-routing =

		"Headphone Jack", "HPL",

		"Headphone Jack", "HPR",

		"IN1", "Mic Jack",

		"Mic Jack", "MICBIAS";

};

- clocks : the clock provider of SYS_MCLK

- VDDA-supply : the regulator provider of VDDA

- VDDIO-supply: the regulator provider of VDDIO

Optional properties:

- VDDD-supply : the regulator provider of VDDD

- micbias-resistor-k-ohms : the bias resistor to be used in kOmhs

	The resistor can take values of 2k, 4k or 8k.

	If set to 0 it will be off.

- micbias-voltage-m-volts : the bias voltage to be used in mVolts

	The voltage can take values from 1.25V to 3V by 250mV steps

	If this node is not mentionned or the value is unknown, then

	If this node is not mentioned or the value is unknown, then

	the value is set to 1.25V.

- VDDA-supply : the regulator provider of VDDA

- VDDIO-supply: the regulator provider of VDDIO

Optional properties:

- VDDD-supply : the regulator provider of VDDD

Example:

codec: sgtl5000@0a {

	"tx" for "st,sti-uni-player" compatibility

	"rx" for "st,sti-uni-reader" compatibility

  - version: IP version integrated in SOC.

  - st,version: IP version integrated in SOC.

  - dai-name: DAI name that describes the IP.

  - IP mode: IP working mode depending on associated codec.

  - st,mode: IP working mode depending on associated codec.

	"HDMI" connected to HDMI codec and support IEC HDMI formats (player only).

	"SPDIF" connected to SPDIF codec and support SPDIF formats (player only).

	"PCM" PCM standard mode for I2S or TDM bus.

  - clocks: CPU_DAI IP clock source, listed in the same order than the

	    CPU_DAI properties.

  - uniperiph-id: internal SOC IP instance ID.

  - st,uniperiph-id: internal SOC IP instance ID.

Optional properties:

  - pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for

		dmas = <&fdma0 4 0 1>;

		dai-name = "Uni Player #2 (DAC)";

		dma-names = "tx";

		uniperiph-id = <2>;

		version = <5>;

		mode = "PCM";

		st,uniperiph-id = <2>;

		st,version = <5>;

		st,mode = "PCM";

	};

	sti_uni_player3: sti-uni-player@3 {

		dmas = <&fdma0 7 0 1>;

		dma-names = "tx";

		dai-name = "Uni Player #3 (SPDIF)";

		uniperiph-id = <3>;

		version = <5>;

		mode = "SPDIF";

		st,uniperiph-id = <3>;

		st,version = <5>;

		st,mode = "SPDIF";

	};

	sti_uni_reader1: sti-uni-reader@1 {

		dmas = <&fdma0 6 0 1>;

		dma-names = "rx";

		dai-name = "Uni Reader #1 (HDMI RX)";

		version = <3>;

		st,version = <3>;

		st,mode = "PCM";

	};

* Allwinner A10 I2S controller

The I2S bus (Inter-IC sound bus) is a serial link for digital

audio data transfer between devices in the system.

Required properties:

- compatible: should be one of the followings

   - "allwinner,sun4i-a10-i2s"

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

  region.

- interrupts: should contain the I2S interrupt.

- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

	Documentation/devicetree/bindings/dma/dma.txt

- dma-names: should include "tx" and "rx".

- clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.

- clock-names: should contain followings:

   - "apb" : clock for the I2S bus interface

   - "mod" : module clock for the I2S controller

- #sound-dai-cells : Must be equal to 0

Example:

i2s0: i2s@01c22400 {

	#sound-dai-cells = <0>;

	compatible = "allwinner,sun4i-a10-i2s";

	reg = <0x01c22400 0x400>;

	interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&apb0_gates 3>, <&i2s0_clk>;

	clock-names = "apb", "mod";

	dmas = <&dma SUN4I_DMA_NORMAL 3>,

	       <&dma SUN4I_DMA_NORMAL 3>;

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

};

F:	drivers/memory/samsung/*

F:	drivers/soc/samsung/*

F:	drivers/spi/spi-s3c*

F:	sound/soc/samsung/*

F:	Documentation/arm/Samsung/

F:	Documentation/devicetree/bindings/arm/samsung/

F:	Documentation/devicetree/bindings/sram/samsung-sram.txt

F:	drivers/platform/x86/samsung-laptop.c

SAMSUNG AUDIO (ASoC) DRIVERS

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Sangbeom Kim <sbkim73@samsung.com>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

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

S:	Supported

F:	sound/soc/samsung/