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 bd4450d..160f8cd 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -54,7 +54,7 @@
                clock-frequency = <32768>;
        };
 
-       bt_codec: bt_sco {
+       bt_codec: bt-sco {
                compatible = "linux,bt-sco";
                #sound-dai-cells = <0>;
        };
@@ -113,7 +113,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&sound_i2c_pins>;
 
-               wm8994: wm8994@1a {
+               wm8994: audio-codec@1a {
                        compatible = "wlf,wm8994";
                        reg = <0x1a>;
 
@@ -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>;
        };
 };