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>

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.