Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus

- 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";

};

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";

	};

AK4554 ADC/DAC

Required properties:

  - compatible : "asahi-kasei,ak4554"

Example:

ak4554-adc-dac {

	compatible = "asahi-kasei,ak4554";

};

  - #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 {

* 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>;

};