Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000

Conflicts:
	Documentation/devicetree/bindings/sound/sgtl5000.txt
This commit is contained in:
Mark Brown 2014-10-20 12:36:02 +01:00
commit 5aa664d633
1 changed files with 10 additions and 0 deletions

View File

@ -18,6 +18,14 @@ Required properties:
If this node is not mentionned 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 {
@ -26,4 +34,6 @@ codec: sgtl5000@0a {
clocks = <&clks 150>;
micbias-resistor-k-ohms = <2>;
micbias-voltage-m-volts = <2250>;
VDDA-supply = <&reg_3p3v>;
VDDIO-supply = <&reg_3p3v>;
};