Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / Documentation / devicetree / bindings / iio / adc / at91_adc.txt

diff --git a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
index 82061c7..0f813de 100644 (file)
--- a/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/at91_adc.txt
@@ -5,6 +5,9 @@ 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
+  - clock-names: tuple listing input clock names.
+       Required elements: "adc_clk", "adc_op_clk".
+  - clocks: phandles to input clocks.
   - 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
@@ -46,6 +49,8 @@ adc0: adc@fffb0000 {
        compatible = "atmel,at91sam9260-adc";
        reg = <0xfffb0000 0x100>;
        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
+       clocks = <&adc_clk>, <&adc_op_clk>;
+       clock-names = "adc_clk", "adc_op_clk";
        atmel,adc-channels-used = <0xff>;
        atmel,adc-startup-time = <40>;
        atmel,adc-use-external-triggers;