Merge branch 'for-next' into for-linus

!Esound/soc/soc-devres.c

!Esound/soc/soc-io.c

!Esound/soc/soc-pcm.c

!Esound/soc/soc-ops.c

!Esound/soc/soc-compress.c

     </sect1>

     <sect1><title>ASoC DAPM API</title>

!Esound/soc/soc-dapm.c

	struct snd_pcm_hardware hw;

	struct snd_pcm_hw_constraints hw_constraints;

	/* -- interrupt callbacks -- */

	void (*transfer_ack_begin)(struct snd_pcm_substream *substream);

	void (*transfer_ack_end)(struct snd_pcm_substream *substream);

	/* -- timer -- */

	unsigned int timer_resolution;	/* timer resolution */

	  For the operators (callbacks) of each sound driver, most of

	these records are supposed to be read-only.  Only the PCM

	middle-layer changes / updates them.  The exceptions are

	the hardware description (hw), interrupt callbacks

	(transfer_ack_xxx), DMA buffer information, and the private

	data.  Besides, if you use the standard buffer allocation

	the hardware description (hw) DMA buffer information and the

	private data.  Besides, if you use the standard buffer allocation

	method via <function>snd_pcm_lib_malloc_pages()</function>,

	you don't need to set the DMA buffer information by yourself.

	</para>

        </para>

	</section>

	<section id="pcm-interface-runtime-intr">

	<title>Interrupt Callbacks</title>

	<para>

	The field <structfield>transfer_ack_begin</structfield> and

	<structfield>transfer_ack_end</structfield> are called at

	the beginning and at the end of

	<function>snd_pcm_period_elapsed()</function>, respectively. 

	</para>

	</section>

    </section>

    <section id="pcm-interface-operators">

AK4613 I2C transmitter

This device supports I2C mode only.

Required properties:

- compatible : "asahi-kasei,ak4613"

- reg : The chip select number on the I2C bus

Example:

&i2c {

	ak4613: ak4613@0x10 {

		compatible = "asahi-kasei,ak4613";

		reg = <0x10>;

	};

};

  - compatible : "asahi-kasei,ak4642" or "asahi-kasei,ak4643" or "asahi-kasei,ak4648"

  - reg : The chip select number on the I2C bus

Example:

Optional properties:

  - #clock-cells :		common clock binding; shall be set to 0

  - clocks :			common clock binding; MCKI clock

  - clock-frequency :		common clock binding; frequency of MCKO

  - clock-output-names :	common clock binding; MCKO clock name

Example 1:

&i2c {

	ak4648: ak4648@0x12 {

		reg = <0x12>;

	};

};

Example 2:

&i2c {

	ak4643: codec@12 {

		compatible = "asahi-kasei,ak4643";

		reg = <0x12>;

		#clock-cells = <0>;

		clocks = <&audio_clock>;

		clock-frequency = <12288000>;

		clock-output-names = "ak4643_mcko";

	};

};

* Atmel ClassD driver under ALSA SoC architecture

Required properties:

- compatible

	Should be "atmel,sama5d2-classd".

- reg

	Should contain ClassD registers location and length.

- interrupts

	Should contain the IRQ line for the ClassD.

- dmas

	One DMA specifiers as described in atmel-dma.txt and dma.txt files.

- dma-names

	Must be "tx".

- clock-names

	Tuple listing input clock names.

	Required elements: "pclk", "gclk" and "aclk".

- clocks

	Please refer to clock-bindings.txt.

Optional properties:

- pinctrl-names, pinctrl-0

	Please refer to pinctrl-bindings.txt.

- atmel,model

	The user-visible name of this sound complex.

	The default value is "CLASSD".

- atmel,pwm-type

	PWM modulation type, "single" or "diff".

	The default value is "single".

- atmel,non-overlap-time

	Set non-overlapping time, the unit is nanosecond(ns).

	There are four values,

	<5>, <10>, <15>, <20>, the default value is <10>.

	Non-overlapping will be disabled if not specified.

Example:

classd: classd@fc048000 {

		compatible = "atmel,sama5d2-classd";

		reg = <0xfc048000 0x100>;

		interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>;

		dmas = <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(47))>;

		dma-names = "tx";

		clocks = <&classd_clk>, <&classd_gclk>, <&audio_pll_pmc>;

		clock-names = "pclk", "gclk", "aclk";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_classd_default>;

		atmel,model = "classd @ SAMA5D2-Xplained";

		atmel,pwm-type = "diff";

		atmel,non-overlap-time = <10>;

};