Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / s5pv210-aries.dtsi

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 91ecad8..160f8cd 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -589,7 +589,6 @@
                io-channels = <&adc 9>;
                shunt-resistor-micro-ohms = <47000000>; /* 47 ohms */
                #io-channel-cells = <0>;
-               io-channel-ranges;
        };
 };
 
@@ -632,7 +631,7 @@
                interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&ts_irq>;
-               reset-gpios = <&gpj1 3 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&gpj1 3 GPIO_ACTIVE_LOW>;
        };
 };