git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.17/drivers' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
regulator
/
palmas-pmic.txt
diff --git
a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
index 42e6b6bc48ff3b5cfe383cf7598ffb42bee5e286..725393c8a7f290f93de13fe5e0f69dd13e138560 100644
(file)
--- a/
Documentation/devicetree/bindings/regulator/palmas-pmic.txt
+++ b/
Documentation/devicetree/bindings/regulator/palmas-pmic.txt
@@
-7,6
+7,7
@@
Required properties:
ti,twl6037-pmic
ti,tps65913-pmic
ti,tps65914-pmic
+ ti,tps65917-pmic
and also the generic series names
ti,palmas-pmic
- interrupt-parent : The parent interrupt controller which is palmas.