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

Conflicts:
	Documentation/devicetree/bindings/sound/sgtl5000.txt

diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt
index 1aab40339617ac61fdbbb559c487061438bce868..0e5e4eb3ef1bdd9c3b85ccfcd8c81fbbc5455f08 100644 (file)
--- a/Documentation/devicetree/bindings/sound/sgtl5000.txt
+++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt
@@ -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>;
 };