summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-20 12:36:02 +0100
committerMark Brown <broonie@kernel.org>2014-10-20 12:36:02 +0100
commit5aa664d63391c14f52264eb08d70f8a074ae249e (patch)
tree539134746d006e25f1d893a3a170bb94388bd86e
parent8735779774b8bbe14456c9e6ba4525eefc67a228 (diff)
parentc171b120c327e41278fc55d0b3d44be109dbf8c3 (diff)
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
-rw-r--r--Documentation/devicetree/bindings/sound/sgtl5000.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt
index 1aab40339617..0e5e4eb3ef1b 100644
--- 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>;
};