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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
phy
/
sun9i-usb-phy.txt
diff --git
a/Documentation/devicetree/bindings/phy/sun9i-usb-phy.txt
b/Documentation/devicetree/bindings/phy/sun9i-usb-phy.txt
index 1cca85c709d1bc281bd25abd790a7f4f5a935260..f9853156e311fb1180a373cb8ed93a293ff59c9b 100644
(file)
--- a/
Documentation/devicetree/bindings/phy/sun9i-usb-phy.txt
+++ b/
Documentation/devicetree/bindings/phy/sun9i-usb-phy.txt
@@
-33,6
+33,5
@@
Example:
clock-names = "hsic_480M", "hsic_12M", "phy";
resets = <&usb_phy_clk 18>, <&usb_phy_clk 19>;
reset-names = "hsic", "phy";
- status = "disabled";
#phy-cells = <0>;
};