Merge tag 'tegra-for-4.18-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / arm / juno-motherboard.dtsi

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 69804c5f1197caac2815199edde847a547a0ae03..1792b074e9a3275a6702f681e02f8c0b2538738e 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -7,6 +7,8 @@
  *
  */
 
+/ {
+       smb@8000000 {
                mb_clk24mhz: clk24mhz {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
@@ -54,46 +56,46 @@
                                regulator-always-on;
                        };
 
-                       gpio_keys {
+                       gpio-keys {
                                compatible = "gpio-keys";
 
                                power-button {
-                                       debounce_interval = <50>;
+                                       debounce-interval = <50>;
                                        wakeup-source;
                                        linux,code = <116>;
                                        label = "POWER";
                                        gpios = <&iofpga_gpio0 0 0x4>;
                                };
                                home-button {
-                                       debounce_interval = <50>;
+                                       debounce-interval = <50>;
                                        wakeup-source;
                                        linux,code = <102>;
                                        label = "HOME";
                                        gpios = <&iofpga_gpio0 1 0x4>;
                                };
                                rlock-button {
-                                       debounce_interval = <50>;
+                                       debounce-interval = <50>;
                                        wakeup-source;
                                        linux,code = <152>;
                                        label = "RLOCK";
                                        gpios = <&iofpga_gpio0 2 0x4>;
                                };
                                vol-up-button {
-                                       debounce_interval = <50>;
+                                       debounce-interval = <50>;
                                        wakeup-source;
                                        linux,code = <115>;
                                        label = "VOL+";
                                        gpios = <&iofpga_gpio0 3 0x4>;
                                };
                                vol-down-button {
-                                       debounce_interval = <50>;
+                                       debounce-interval = <50>;
                                        wakeup-source;
                                        linux,code = <114>;
                                        label = "VOL-";
                                        gpios = <&iofpga_gpio0 4 0x4>;
                                };
                                nmi-button {
-                                       debounce_interval = <50>;
+                                       debounce-interval = <50>;
                                        wakeup-source;
                                        linux,code = <99>;
                                        label = "NMI";
@@ -287,3 +289,5 @@
                                };
                        };
                };
+       };
+};