11 files changed, 52 insertions, 60 deletions

diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
index d1061469f63d..82061c7e4fea 100644
--- a/Documentation/devicetree/bindings/arm/atmel-adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
@@ -5,32 +5,32 @@ Required properties:
     <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"
   - reg: Should contain ADC registers location and length
   - interrupts: Should contain the IRQ line for the ADC
-  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this
+  - atmel,adc-channels-used: Bitmask of the channels muxed and enabled for this
     device
   - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
     defined in the datasheet
   - atmel,adc-vref: Reference voltage in millivolts for the conversions
-  - atmel,adc-res: List of resolution in bits supported by the ADC. List size
+  - atmel,adc-res: List of resolutions in bits supported by the ADC. List size
                    must be two at least.
   - atmel,adc-res-names: Contains one identifier string for each resolution
                          in atmel,adc-res property. "lowres" and "highres"
                          identifiers are required.
 
 Optional properties:
-  - atmel,adc-use-external: Boolean to enable of external triggers
+  - atmel,adc-use-external-triggers: Boolean to enable the external triggers
   - atmel,adc-use-res: String corresponding to an identifier from
                        atmel,adc-res-names property. If not specified, the highest
                        resolution will be used.
   - atmel,adc-sleep-mode: Boolean to enable sleep mode when no conversion
   - atmel,adc-sample-hold-time: Sample and Hold Time in microseconds
-  - atmel,adc-ts-wires: Number of touch screen wires. Should be 4 or 5. If this
-                        value is set, then adc driver will enable touch screen
+  - atmel,adc-ts-wires: Number of touchscreen wires. Should be 4 or 5. If this
+                        value is set, then the adc driver will enable touchscreen
                         support.
-    NOTE: when adc touch screen enabled, the adc hardware trigger will be
-          disabled. Since touch screen will occupied the trigger register.
+    NOTE: when adc touchscreen is enabled, the adc hardware trigger will be
+          disabled. Since touchscreen will occupy the trigger register.
   - atmel,adc-ts-pressure-threshold: a pressure threshold for touchscreen. It
-                                     make touch detect more precision.
- 
+                                     makes touch detection more precise.
+
 Optional trigger Nodes:
   - Required properties:
     * trigger-name: Name of the trigger exposed to the user
@@ -41,40 +41,41 @@ Optional trigger Nodes:
 
 Examples:
 adc0: adc@fffb0000 {
+        #address-cells = <1>;
+        #size-cells = <0>;
         compatible = "atmel,at91sam9260-adc";
         reg = <0xfffb0000 0x100>;
-        interrupts = <20 4>;
-        atmel,adc-channel-base = <0x30>;
+        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
         atmel,adc-channels-used = <0xff>;
-        atmel,adc-drdy-mask = <0x10000>;
-        atmel,adc-num-channels = <8>;
         atmel,adc-startup-time = <40>;
-        atmel,adc-status-register = <0x1c>;
-        atmel,adc-trigger-register = <0x08>;
-        atmel,adc-use-external;
+        atmel,adc-use-external-triggers;
         atmel,adc-vref = <3300>;
         atmel,adc-res = <8 10>;
         atmel,adc-res-names = "lowres", "highres";
         atmel,adc-use-res = "lowres";
 
         trigger@0 {
+                reg = <0>;
                 trigger-name = "external-rising";
                 trigger-value = <0x1>;
                 trigger-external;
         };
         trigger@1 {
+                reg = <1>;
                 trigger-name = "external-falling";
                 trigger-value = <0x2>;
                 trigger-external;
         };
 
         trigger@2 {
+                reg = <2>;
                 trigger-name = "external-any";
                 trigger-value = <0x3>;
                 trigger-external;
         };
 
         trigger@3 {
+                reg = <3>;
                 trigger-name = "continuous";
                 trigger-value = <0x6>;
         };
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.
diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index cce45f5177f9..55ab6180e350 100644
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -129,7 +129,6 @@
                         adc0: adc@f804c000 {
                                 status = "okay";
                                 atmel,adc-channels-used = <0xf>;
-                                atmel,adc-num-channels = <4>;
                         };
 
                         dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
index 2093c4d7cd6a..df4b78695695 100644
--- a/arch/arm/boot/dts/at91-cosino.dtsi
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -64,7 +64,6 @@
                         };
 
                         adc0: adc@f804c000 {
-                                atmel,adc-clock-rate = <1000000>;
                                 atmel,adc-ts-wires = <4>;
                                 atmel,adc-ts-pressure-threshold = <10000>;
                                 status = "okay";