Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.

What:		/sys/bus/pci/devices/.../d3cold_allowed

Date:		July 2012

Contact:	Huang Ying <ying.huang@intel.com>

Description:

		d3cold_allowed is bit to control whether the corresponding PCI

		device can be put into D3Cold state.  If it is cleared, the

		device will never be put into D3Cold state.  If it is set, the

		device may be put into D3Cold state if other requirements are

		satisfied too.  Reading this attribute will show the current

		value of d3cold_allowed bit.  Writing this attribute will set

		the value of d3cold_allowed bit.

Texas Instruments TWL family (twl4030) audio module

The audio module inside the TWL family consist of an audio codec and a vibra

driver.

Required properties:

- compatible : must be "ti,twl4030-audio"

Optional properties, nodes:

Audio functionality:

- codec { }: Need to be present if the audio functionality is used. Within this

	     section the following options can be used:

- ti,digimic_delay: Delay need after enabling the digimic to reduce artifacts

		    from the start of the recorded sample (in ms)

-ti,ramp_delay_value: HS ramp delay configuration to reduce pop noise

-ti,hs_extmute: Use external mute for HS pop reduction

-ti,hs_extmute_gpio: Use external GPIO to control the external mute

-ti,offset_cncl_path: Offset cancellation path selection, refer to TRM for the

		      valid values.

Vibra functionality

- ti,enable-vibra: Need to be set to <1> if the vibra functionality is used. if

		   missing or it is 0, the vibra functionality is disabled.

Example:

&i2c1 {

	clock-frequency = <2600000>;

	twl: twl@48 {

		reg = <0x48>;

		interrupts = <7>; /* SYS_NIRQ cascaded to intc */

		interrupt-parent = <&intc>;

		twl_audio: audio {

			compatible = "ti,twl4030-audio";

			ti,enable-vibra = <1>;

			codec {

				ti,ramp_delay_value = <3>;

			};

		};

	};

};

CS4270 audio CODEC

The driver for this device currently only supports I2C.

Required properties:

  - compatible : "cirrus,cs4270"

  - reg : the I2C address of the device for I2C

Optional properties:

  - reset-gpio : a GPIO spec for the reset pin. If specified, it will be

		 deasserted before communication to the codec starts.

Example:

codec: cs4270@48 {

	compatible = "cirrus,cs4270";

	reg = <0x48>;

};

Texas Instruments McASP controller

Required properties:

- compatible :

	"ti,dm646x-mcasp-audio"	: for DM646x platforms

	"ti,da830-mcasp-audio"	: for both DA830 & DA850 platforms

	"ti,omap2-mcasp-audio"	: for OMAP2 platforms (TI81xx, AM33xx)

- reg : Should contain McASP registers offset and length

- interrupts : Interrupt number for McASP

- op-mode : I2S/DIT ops mode.

- tdm-slots : Slots for TDM operation.

- num-serializer : Serializers used by McASP.

- serial-dir : A list of serializer pin mode. The list number should be equal

		to "num-serializer" parameter. Each entry is a number indication

		serializer pin direction. (0 - INACTIVE, 1 - TX, 2 - RX)

Optional properties:

- ti,hwmods : Must be "mcasp<n>", n is controller instance starting 0

- tx-num-evt : FIFO levels.

- rx-num-evt : FIFO levels.

- sram-size-playback : size of sram to be allocated during playback

- sram-size-capture  : size of sram to be allocated during capture

Example:

mcasp0: mcasp0@1d00000 {

	compatible = "ti,da830-mcasp-audio";

	#address-cells = <1>;

	#size-cells = <0>;

	reg = <0x100000 0x3000>;

	interrupts = <82 83>;

	op-mode = <0>;		/* MCASP_IIS_MODE */

	tdm-slots = <2>;

	num-serializer = <16>;

	serial-dir = <

			0 0 0 0	/* 0: INACTIVE, 1: TX, 2: RX */

			0 0 0 0

			0 0 0 1

			2 0 0 0 >;

	tx-num-evt = <1>;

	rx-num-evt = <1>;

};

* Texas Instruments OMAP4+ and twl6040 based audio setups

Required properties:

- compatible: "ti,abe-twl6040"

- ti,model: Name of the sound card ( for example "SDP4430")

- ti,mclk-freq: MCLK frequency for HPPLL operation

- ti,mcpdm: phandle for the McPDM node

- ti,twl6040: phandle for the twl6040 core node

- ti,audio-routing: List of 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.

Optional properties:

- ti,dmic: phandle for the OMAP dmic node if the machine have it connected

- ti,jack_detection: Need to be set to <1> if the board capable to detect jack

  insertion, removal.

Available audio endpoints for the audio-routing table:

Board connectors:

 * Headset Stereophone

 * Earphone Spk

 * Ext Spk

 * Line Out

 * Vibrator

 * Headset Mic

 * Main Handset Mic

 * Sub Handset Mic

 * Line In

 * Digital Mic

twl6040 pins:

 * HSOL

 * HSOR

 * EP

 * HFL

 * HFR

 * AUXL

 * AUXR

 * VIBRAL

 * VIBRAR

 * HSMIC

 * MAINMIC

 * SUBMIC

 * AFML

 * AFMR

 * Headset Mic Bias

 * Main Mic Bias

 * Digital Mic1 Bias

 * Digital Mic2 Bias

Digital mic pins:

 * DMic

Example:

sound {

	compatible = "ti,abe-twl6040";

	ti,model = "SDP4430";

	ti,jack-detection = <1>;

	ti,mclk-freq = <38400000>;

	ti,mcpdm = <&mcpdm>;

	ti,dmic = <&dmic>;

	ti,twl6040 = <&twl6040>;

	/* Audio routing */

	ti,audio-routing =

		"Headset Stereophone", "HSOL",

		"Headset Stereophone", "HSOR",

		"Earphone Spk", "EP",

		"Ext Spk", "HFL",

		"Ext Spk", "HFR",

		"Line Out", "AUXL",

		"Line Out", "AUXR",

		"Vibrator", "VIBRAL",

		"Vibrator", "VIBRAR",

		"HSMIC", "Headset Mic",

		"Headset Mic", "Headset Mic Bias",

		"MAINMIC", "Main Handset Mic",

		"Main Handset Mic", "Main Mic Bias",

		"SUBMIC", "Sub Handset Mic",

		"Sub Handset Mic", "Main Mic Bias",

		"AFML", "Line In",

		"AFMR", "Line In",

		"DMic", "Digital Mic",

		"Digital Mic", "Digital Mic1 Bias";

};