Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / vfxxx.dtsi

diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 5d654b5b4ce647786278e3cdd4711560c9464d49..c3f09b7379240b1823e0fcc573597f29c0026284 100644 (file)
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -84,6 +84,11 @@
                mask = <0x1000>;
        };
 
+       iio-hwmon {
+               compatible = "iio-hwmon";
+               io-channels = <&adc0 16>, <&adc1 16>;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -762,10 +767,5 @@
                                status = "disabled";
                        };
                };
-
-               iio-hwmon {
-                       compatible = "iio-hwmon";
-                       io-channels = <&adc0 16>, <&adc1 16>;
-               };
        };
 };