summaryrefslogtreecommitdiff
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-08 10:36:04 +0100
committerMark Brown <broonie@linaro.org>2013-08-08 10:36:04 +0100
commit49ca8bb5e49362b1f5cc48e0f36d6e767e9c2b35 (patch)
treead8e0da81f5039c8758dc508f4f1f2835b2af9ab /Documentation/devicetree
parent0c82f5b84ea7078dfe3de388e9703df6c02a06ff (diff)
parented6a27723979cfffab62c450baba4f75ebcbda78 (diff)
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/sound/wm8994.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/wm8994.txt b/Documentation/devicetree/bindings/sound/wm8994.txt
index f2f3e80934d2..e045e90a0924 100644
--- a/Documentation/devicetree/bindings/sound/wm8994.txt
+++ b/Documentation/devicetree/bindings/sound/wm8994.txt
@@ -32,6 +32,10 @@ Optional properties:
The second cell is the flags, encoded as the trigger masks from
Documentation/devicetree/bindings/interrupts.txt
+ - clocks : A list of up to two phandle and clock specifier pairs
+ - clock-names : A list of clock names sorted in the same order as clocks.
+ Valid clock names are "MCLK1" and "MCLK2".
+
- wlf,gpio-cfg : A list of GPIO configuration register values. If absent,
no configuration of these registers is performed. If any value is
over 0xffff then the register will be left as default. If present 11