diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 08:37:58 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 08:37:58 -0700 |
commit | f7046bf08549a39dfc8365f8013e6ab43f42995a (patch) | |
tree | f28057b1f462a21a1398fb078b0b72a754623999 /Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt | |
parent | 698f57f48a3b0b2caad20c560b2ba44932c2c76f (diff) | |
parent | 2b684024b59c4b1a1440e8c7499b7060a22d1ec1 (diff) |
Merge tag 'iio-for-3.10b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Second round of IIO cleanups for the 3.10 cycle
1) A nice little removal of the unwanted private pointer from
struct iio_trigger.
2) Some clean up of the ad799x driver.
3) Couple of cleanups for the exynos_adc driver and some documentation.
4) Move the mxs-lradc initialization a little earlier in the driver to avoid
wiping out the configuration just after setting it.
A nice small set of worthy bits and bobs.
Diffstat (limited to 'Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt')
-rw-r--r-- | Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt index 05e9d95ede5..47ada1dff21 100644 --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt @@ -1,6 +1,6 @@ Samsung Exynos Analog to Digital Converter bindings -This devicetree binding are for the new adc driver written fori +The devicetree bindings are for the new ADC driver written for Exynos4 and upward SoCs from Samsung. New driver handles the following @@ -20,6 +20,9 @@ Required properties: format is being dependent on which interrupt controller the Samsung device uses. - #io-channel-cells = <1>; As ADC has multiple outputs +- clocks From common clock binding: handle to adc clock. +- clock-names From common clock binding: Shall be "adc". +- vdd-supply VDD input supply. Note: child nodes can be added for auto probing from device tree. @@ -31,6 +34,11 @@ adc: adc@12D10000 { interrupts = <0 106 0>; #io-channel-cells = <1>; io-channel-ranges; + + clocks = <&clock 303>; + clock-names = "adc"; + + vdd-supply = <&buck5_reg>; }; @@ -49,4 +57,4 @@ adc@12D10000 { }; Note: Does not apply to ADC driver under arch/arm/plat-samsung/ -Note: The child node can be added under the adc node or seperately. +Note: The child node can be added under the adc node or separately. |