diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:05:35 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:05:35 +0100 |
| commit | 542798cdd500614feba234ed602777eae33edbb8 (patch) | |
| tree | 9e7769130746032a9cd64f3e1b32a6dd3089ae7c /Documentation/devicetree/bindings/usb | |
| parent | 0f4d5641a65b4a8428a4b9a7ad6f0ed580863e19 (diff) | |
| parent | 1d33a2c9e9279f1e41836effb91309c90608a0e2 (diff) | |
| download | linux-stable-542798cdd500614feba234ed602777eae33edbb8.tar.gz linux-stable-542798cdd500614feba234ed602777eae33edbb8.tar.bz2 linux-stable-542798cdd500614feba234ed602777eae33edbb8.zip | |
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre:
- activate DMA for NAND flash controller
- some binding documentation update for usba and ADC (iio) drivers
- removal of some deprecated ADC (iio) properties
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: at91-cosino: remove useless adc properties
ARM: at91/dt: sama5d3: remove useless adc properties
ARM: at91/dt: at91sam9x5: remove useless adc properties
ARM: at91/dt: at91sam9g45: remove useless adc properties
ARM: at91/dt: at91sam9260: remove useless adc properties
ARM: at91/dt: at91-ariag25: remove useless adc properties
Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt
Documentation: dt: iio: improve atmel-adc documentation
ARM: at91: sama5d3: get rid of atmel_tsadcc driver
ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning
ARM: at91/DT: add NAND + DMA property
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/usb')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/atmel-usb.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt index 55f51af08bc7..bc2222ca3f2a 100644 --- a/Documentation/devicetree/bindings/usb/atmel-usb.txt +++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt @@ -57,8 +57,8 @@ Required properties: - ep childnode: To specify the number of endpoints and their properties. Optional properties: - - atmel,vbus-gpio: If present, specifies a gpio that needs to be - activated for the bus to be powered. + - atmel,vbus-gpio: If present, specifies a gpio that allows to detect whether + vbus is present (USB is connected). Required child node properties: - name: Name of the endpoint. |