aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/mfd/bcm590xx.txt
diff options
context:
space:
mode:
authorPaul Moore <pmoore@redhat.com>2014-08-05 15:44:22 -0400
committerPaul Moore <pmoore@redhat.com>2014-08-05 15:44:22 -0400
commitaa9e0de81b5b257f6dae48efe2ed5f255f066497 (patch)
tree9b0b791d5912368006115427e74105cfe26750bd /Documentation/devicetree/bindings/mfd/bcm590xx.txt
parentnetlabel: shorter names for the NetLabel catmap funcs/structs (diff)
parentLinux 3.16 (diff)
downloadlinux-dev-aa9e0de81b5b257f6dae48efe2ed5f255f066497.tar.xz
linux-dev-aa9e0de81b5b257f6dae48efe2ed5f255f066497.zip
Merge tag 'v3.16' into next
Linux 3.16
Diffstat (limited to 'Documentation/devicetree/bindings/mfd/bcm590xx.txt')
-rw-r--r--Documentation/devicetree/bindings/mfd/bcm590xx.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/bcm590xx.txt b/Documentation/devicetree/bindings/mfd/bcm590xx.txt
index 1fe30e2b10da..be51a15e05f9 100644
--- a/Documentation/devicetree/bindings/mfd/bcm590xx.txt
+++ b/Documentation/devicetree/bindings/mfd/bcm590xx.txt
@@ -19,7 +19,9 @@ Optional child nodes:
The valid regulator node names for BCM59056 are:
rfldo, camldo1, camldo2, simldo1, simldo2, sdldo, sdxldo,
mmcldo1, mmcldo2, audldo, micldo, usbldo, vibldo,
- csr, iosr1, iosr2, msr, sdsr1, sdsr2, vsr
+ csr, iosr1, iosr2, msr, sdsr1, sdsr2, vsr,
+ gpldo1, gpldo2, gpldo3, gpldo4, gpldo5, gpldo6,
+ vbus
Example:
pmu: bcm59056@8 {