diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
commit | 6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch) | |
tree | c250644c5adce04947d664318996de16df3f02da /Documentation/devicetree/bindings/usb/ci13xxx-imx.txt | |
parent | b96516220870d8571fc12da980668687c122976e (diff) | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/devicetree/bindings/usb/ci13xxx-imx.txt')
-rw-r--r-- | Documentation/devicetree/bindings/usb/ci13xxx-imx.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt index 5778b9c83bd8..1c04a4c9515f 100644 --- a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt +++ b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt @@ -11,6 +11,7 @@ Optional properties: that indicate usb controller index - vbus-supply: regulator for vbus - disable-over-current: disable over current detect +- external-vbus-divider: enables off-chip resistor divider for Vbus Examples: usb@02184000 { /* USB OTG */ @@ -20,4 +21,5 @@ usb@02184000 { /* USB OTG */ fsl,usbphy = <&usbphy1>; fsl,usbmisc = <&usbmisc 0>; disable-over-current; + external-vbus-divider; }; |