5 files changed, 139 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/sound/ak4104.txt b/Documentation/devicetree/bindings/sound/ak4104.txt
index b902ee39cf89..deca5e18f304 100644
--- a/Documentation/devicetree/bindings/sound/ak4104.txt
+++ b/Documentation/devicetree/bindings/sound/ak4104.txt
@@ -8,6 +8,8 @@ Required properties:
  - reg : The chip select number on the SPI bus
+  - vdd-supply : A regulator node, providing 2.7V - 3.6V
 Optional properties:
  - reset-gpio : a GPIO spec for the reset pin. If specified, it will be
@@ -19,4 +21,5 @@ spdif: ak4104@0 {
        compatible = "asahi-kasei,ak4104";
        reg = <0>;
        spi-max-frequency = <5000000>;
+        vdd-supply = <&vdd_3v3_reg>;
 };
diff --git a/Documentation/devicetree/bindings/sound/alc5623.txt b/Documentation/devicetree/bindings/sound/alc5623.txt
new file mode 100644
index 000000000000..26c86c98d671
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/alc5623.txt
@@ -0,0 +1,25 @@
+ALC5621/ALC5622/ALC5623 audio Codec
+Required properties:
+ - compatible:  "realtek,alc5623"
+ - reg:         the I2C address of the device.
+Optional properties:
+ - add-ctrl:      Default register value for Reg-40h, Additional Control
+                  Register. If absent or has the value of 0, the
+                  register is untouched.
+ - jack-det-ctrl: Default register value for Reg-5Ah, Jack Detect
+                  Control Register. If absent or has value 0, the
+                  register is untouched.
+Example:
+        alc5621: alc5621@1a {
+                compatible = "alc5621";
+                reg = <0x1a>;
+                add-ctrl = <0x3700>;
+                jack-det-ctrl = <0x4810>;
+        };
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
index 569b26c4a81e..60ca07996458 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 {
        reg = <0x100000 0x3000>;
        reg-names "mpu";
        interrupts = <82>, <83>;
-        interrupts-names = "tx", "rx";
+        interrupt-names = "tx", "rx";
        op-mode = <0>;          /* MCASP_IIS_MODE */
        tdm-slots = <2>;
        serial-dir = <
diff --git a/Documentation/devicetree/bindings/sound/st,sta350.txt b/Documentation/devicetree/bindings/sound/st,sta350.txt
new file mode 100644
index 000000000000..950188891abd
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/st,sta350.txt
@@ -0,0 +1,107 @@
+STA350 audio CODEC
+The driver for this device only supports I2C.
+Required properties:
+  - compatible: "st,sta350"
+  - reg: the I2C address of the device for I2C
+  - reset-gpios: a GPIO spec for the reset pin. If specified, it will be
+                 deasserted before communication to the codec starts.
+  - power-down-gpios: a GPIO spec for the power down pin. If specified,
+                      it will be deasserted before communication to the codec
+                      starts.
+  - vdd-dig-supply: regulator spec, providing 3.3V
+  - vdd-pll-supply: regulator spec, providing 3.3V
+  - vcc-supply: regulator spec, providing 5V - 26V
+Optional properties:
+  -  st,output-conf: number, Selects the output configuration:
+        0: 2-channel (full-bridge) power, 2-channel data-out
+        1: 2 (half-bridge). 1 (full-bridge) on-board power
+        2: 2 Channel (Full-Bridge) Power, 1 Channel FFX
+        3: 1 Channel Mono-Parallel
+        If parameter is missing, mode 0 will be enabled.
+  -  st,ch1-output-mapping: Channel 1 output mapping
+  -  st,ch2-output-mapping: Channel 2 output mapping
+  -  st,ch3-output-mapping: Channel 3 output mapping
+        0: Channel 1
+        1: Channel 2
+        2: Channel 3
+        If parameter is missing, channel 1 is choosen.
+  -  st,thermal-warning-recover:
+        If present, thermal warning recovery is enabled.
+  -  st,thermal-warning-adjustment:
+        If present, thermal warning adjustment is enabled.
+  -  st,fault-detect-recovery:
+        If present, then fault recovery will be enabled.
+  -  st,ffx-power-output-mode: string
+        The FFX power output mode selects how the FFX output timing is
+        configured. Must be one of these values:
+          -  "drop-compensation"
+          -  "tapered-compensation"
+          -  "full-power-mode"
+          -  "variable-drop-compensation" (default)
+  -  st,drop-compensation-ns: number
+        Only required for "st,ffx-power-output-mode" ==
+        "variable-drop-compensation".
+        Specifies the drop compensation in nanoseconds.
+        The value must be in the range of 0..300, and only
+        multiples of 20 are allowed. Default is 140ns.
+  -  st,overcurrent-warning-adjustment:
+        If present, overcurrent warning adjustment is enabled.
+  -  st,max-power-use-mpcc:
+        If present, then MPCC bits are used for MPC coefficients,
+        otherwise standard MPC coefficients are used.
+  -  st,max-power-corr:
+        If present, power bridge correction for THD reduction near maximum
+        power output is enabled.
+  -  st,am-reduction-mode:
+        If present, FFX mode runs in AM reduction mode, otherwise normal
+        FFX mode is used.
+  -  st,odd-pwm-speed-mode:
+        If present, PWM speed mode run on odd speed mode (341.3 kHz) on all
+        channels. If not present, normal PWM spped mode (384 kHz) will be used.
+  -  st,distortion-compensation:
+        If present, distortion compensation variable uses DCC coefficient.
+        If not present, preset DC coefficient is used.
+  -  st,invalid-input-detect-mute:
+        If not present, automatic invalid input detect mute is enabled.
+Example:
+codec: sta350@38 {
+        compatible = "st,sta350";
+        reg = <0x1c>;
+        reset-gpios = <&gpio1 19 0>;
+        power-down-gpios = <&gpio1 16 0>;
+        st,output-conf = <0x3>;                 // set output to 2-channel
+                                                // (full-bridge) power,
+                                                // 2-channel data-out
+        st,ch1-output-mapping = <0>;            // set channel 1 output ch 1
+        st,ch2-output-mapping = <0>;            // set channel 2 output ch 1
+        st,ch3-output-mapping = <0>;            // set channel 3 output ch 1
+        st,max-power-correction;                // enables power bridge
+                                                // correction for THD reduction
+                                                // near maximum power output
+        st,invalid-input-detect-mute;           // mute if no valid digital
+                                                // audio signal is provided.
+};
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
index 74c66dee3e14..eff12be5e789 100644
--- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
@@ -13,6 +13,9 @@ Required properties:
    "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)
 - reg - <int> -  I2C slave address
+- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
+  DVDD-supply : power supplies for the device as covered in
+  Documentation/devicetree/bindings/regulator/regulator.txt
 Optional properties:
@@ -24,9 +27,6 @@ Optional properties:
        3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD
        If this node is not mentioned or if the value is unknown, then
        micbias is set to 2.0V.
- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
-  DVDD-supply : power supplies for the device as covered in
-  Documentation/devicetree/bindings/regulator/regulator.txt
 CODEC output pins:
  * HPL

diff --git a/Documentation/devicetree/bindings/sound/ak4104.txt b/Documentation/devicetree/bindings/sound/ak4104.txt index b902ee39cf89..deca5e18f304 100644 --- a/Documentation/devicetree/bindings/sound/ak4104.txt +++ b/Documentation/devicetree/bindings/sound/ak4104.txt
@@ -8,6 +8,8 @@ Required properties:
8		8
9	- reg : The chip select number on the SPI bus	9	- reg : The chip select number on the SPI bus
10		10
		11	- vdd-supply : A regulator node, providing 2.7V - 3.6V
		12
11	Optional properties:	13	Optional properties:
12		14
13	- reset-gpio : a GPIO spec for the reset pin. If specified, it will be	15	- reset-gpio : a GPIO spec for the reset pin. If specified, it will be
@@ -19,4 +21,5 @@ spdif: ak4104@0 {
19	compatible = "asahi-kasei,ak4104";	21	compatible = "asahi-kasei,ak4104";
20	reg = <0>;	22	reg = <0>;
21	spi-max-frequency = <5000000>;	23	spi-max-frequency = <5000000>;
		24	vdd-supply = <&vdd_3v3_reg>;
22	};	25	};


diff --git a/Documentation/devicetree/bindings/sound/alc5623.txt b/Documentation/devicetree/bindings/sound/alc5623.txt new file mode 100644 index 000000000000..26c86c98d671 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/alc5623.txt
@@ -0,0 +1,25 @@
		1	ALC5621/ALC5622/ALC5623 audio Codec
		2
		3	Required properties:
		4
		5	- compatible: "realtek,alc5623"
		6	- reg: the I2C address of the device.
		7
		8	Optional properties:
		9
		10	- add-ctrl: Default register value for Reg-40h, Additional Control
		11	Register. If absent or has the value of 0, the
		12	register is untouched.
		13
		14	- jack-det-ctrl: Default register value for Reg-5Ah, Jack Detect
		15	Control Register. If absent or has value 0, the
		16	register is untouched.
		17
		18	Example:
		19
		20	alc5621: alc5621@1a {
		21	compatible = "alc5621";
		22	reg = <0x1a>;
		23	add-ctrl = <0x3700>;
		24	jack-det-ctrl = <0x4810>;
		25	};


diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt index 569b26c4a81e..60ca07996458 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 {
47	reg = <0x100000 0x3000>;	47	reg = <0x100000 0x3000>;
48	reg-names "mpu";	48	reg-names "mpu";
49	interrupts = <82>, <83>;	49	interrupts = <82>, <83>;
50	interrupts-names = "tx", "rx";	50	interrupt-names = "tx", "rx";
51	op-mode = <0>; /* MCASP_IIS_MODE */	51	op-mode = <0>; /* MCASP_IIS_MODE */
52	tdm-slots = <2>;	52	tdm-slots = <2>;
53	serial-dir = <	53	serial-dir = <


diff --git a/Documentation/devicetree/bindings/sound/st,sta350.txt b/Documentation/devicetree/bindings/sound/st,sta350.txt new file mode 100644 index 000000000000..950188891abd --- /dev/null +++ b/Documentation/devicetree/bindings/sound/st,sta350.txt
@@ -0,0 +1,107 @@
		1	STA350 audio CODEC
		2
		3	The driver for this device only supports I2C.
		4
		5	Required properties:
		6
		7	- compatible: "st,sta350"
		8	- reg: the I2C address of the device for I2C
		9	- reset-gpios: a GPIO spec for the reset pin. If specified, it will be
		10	deasserted before communication to the codec starts.
		11
		12	- power-down-gpios: a GPIO spec for the power down pin. If specified,
		13	it will be deasserted before communication to the codec
		14	starts.
		15
		16	- vdd-dig-supply: regulator spec, providing 3.3V
		17	- vdd-pll-supply: regulator spec, providing 3.3V
		18	- vcc-supply: regulator spec, providing 5V - 26V
		19
		20	Optional properties:
		21
		22	- st,output-conf: number, Selects the output configuration:
		23	0: 2-channel (full-bridge) power, 2-channel data-out
		24	1: 2 (half-bridge). 1 (full-bridge) on-board power
		25	2: 2 Channel (Full-Bridge) Power, 1 Channel FFX
		26	3: 1 Channel Mono-Parallel
		27	If parameter is missing, mode 0 will be enabled.
		28
		29	- st,ch1-output-mapping: Channel 1 output mapping
		30	- st,ch2-output-mapping: Channel 2 output mapping
		31	- st,ch3-output-mapping: Channel 3 output mapping
		32	0: Channel 1
		33	1: Channel 2
		34	2: Channel 3
		35	If parameter is missing, channel 1 is choosen.
		36
		37	- st,thermal-warning-recover:
		38	If present, thermal warning recovery is enabled.
		39
		40	- st,thermal-warning-adjustment:
		41	If present, thermal warning adjustment is enabled.
		42
		43	- st,fault-detect-recovery:
		44	If present, then fault recovery will be enabled.
		45
		46	- st,ffx-power-output-mode: string
		47	The FFX power output mode selects how the FFX output timing is
		48	configured. Must be one of these values:
		49	- "drop-compensation"
		50	- "tapered-compensation"
		51	- "full-power-mode"
		52	- "variable-drop-compensation" (default)
		53
		54	- st,drop-compensation-ns: number
		55	Only required for "st,ffx-power-output-mode" ==
		56	"variable-drop-compensation".
		57	Specifies the drop compensation in nanoseconds.
		58	The value must be in the range of 0..300, and only
		59	multiples of 20 are allowed. Default is 140ns.
		60
		61	- st,overcurrent-warning-adjustment:
		62	If present, overcurrent warning adjustment is enabled.
		63
		64	- st,max-power-use-mpcc:
		65	If present, then MPCC bits are used for MPC coefficients,
		66	otherwise standard MPC coefficients are used.
		67
		68	- st,max-power-corr:
		69	If present, power bridge correction for THD reduction near maximum
		70	power output is enabled.
		71
		72	- st,am-reduction-mode:
		73	If present, FFX mode runs in AM reduction mode, otherwise normal
		74	FFX mode is used.
		75
		76	- st,odd-pwm-speed-mode:
		77	If present, PWM speed mode run on odd speed mode (341.3 kHz) on all
		78	channels. If not present, normal PWM spped mode (384 kHz) will be used.
		79
		80	- st,distortion-compensation:
		81	If present, distortion compensation variable uses DCC coefficient.
		82	If not present, preset DC coefficient is used.
		83
		84	- st,invalid-input-detect-mute:
		85	If not present, automatic invalid input detect mute is enabled.
		86
		87
		88
		89	Example:
		90
		91	codec: sta350@38 {
		92	compatible = "st,sta350";
		93	reg = <0x1c>;
		94	reset-gpios = <&gpio1 19 0>;
		95	power-down-gpios = <&gpio1 16 0>;
		96	st,output-conf = <0x3>; // set output to 2-channel
		97	// (full-bridge) power,
		98	// 2-channel data-out
		99	st,ch1-output-mapping = <0>; // set channel 1 output ch 1
		100	st,ch2-output-mapping = <0>; // set channel 2 output ch 1
		101	st,ch3-output-mapping = <0>; // set channel 3 output ch 1
		102	st,max-power-correction; // enables power bridge
		103	// correction for THD reduction
		104	// near maximum power output
		105	st,invalid-input-detect-mute; // mute if no valid digital
		106	// audio signal is provided.
		107	};


diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt index 74c66dee3e14..eff12be5e789 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
@@ -13,6 +13,9 @@ Required properties:
13	"ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)	13	"ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)
14		14
15	- reg - <int> - I2C slave address	15	- reg - <int> - I2C slave address
		16	- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
		17	DVDD-supply : power supplies for the device as covered in
		18	Documentation/devicetree/bindings/regulator/regulator.txt
16		19
17		20
18	Optional properties:	21	Optional properties:
@@ -24,9 +27,6 @@ Optional properties:
24	3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD	27	3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD
25	If this node is not mentioned or if the value is unknown, then	28	If this node is not mentioned or if the value is unknown, then
26	micbias is set to 2.0V.	29	micbias is set to 2.0V.
27	- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
28	DVDD-supply : power supplies for the device as covered in
29	Documentation/devicetree/bindings/regulator/regulator.txt
30		30
31	CODEC output pins:	31	CODEC output pins:
32	* HPL	32	* HPL