Merge tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[karo-tx-linux.git] / arch / arm / boot / dts / r8a7793-gose.dts

diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index cfe142c2ba3890316977021b1a64c788669e118b..3cd1c804621fad4cb210e5208a6203d4c6ea61ef 100644 (file)
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -67,77 +67,77 @@
                        gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_1>;
                        label = "SW2-1";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-2 {
                        gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_2>;
                        label = "SW2-2";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-3 {
                        gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_3>;
                        label = "SW2-3";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-4 {
                        gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_4>;
                        label = "SW2-4";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-a {
                        gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_A>;
                        label = "SW30";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-b {
                        gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_B>;
                        label = "SW31";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-c {
                        gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_C>;
                        label = "SW32";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-d {
                        gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_D>;
                        label = "SW33";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-e {
                        gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_E>;
                        label = "SW34";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-f {
                        gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_F>;
                        label = "SW35";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
                key-g {
                        gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_G>;
                        label = "SW36";
-                       gpio-key,wakeup;
+                       wakeup-source;
                        debounce-interval = <20>;
                };
        };
@@ -158,11 +158,10 @@
                };
        };
 
-       audio_clock: clock {
+       audio_clock: audio_clock {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <11289600>;
-               clock-output-names = "audio_clock";
        };
 
        rsnd_ak4643: sound {
@@ -240,53 +239,53 @@
        pinctrl-names = "default";
 
        i2c2_pins: i2c2 {
-               renesas,groups = "i2c2";
-               renesas,function = "i2c2";
+               groups = "i2c2";
+               function = "i2c2";
        };
 
        du_pins: du {
-               renesas,groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
-               renesas,function = "du";
+               groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
+               function = "du";
        };
 
        scif0_pins: serial0 {
-               renesas,groups = "scif0_data_d";
-               renesas,function = "scif0";
+               groups = "scif0_data_d";
+               function = "scif0";
        };
 
        scif1_pins: serial1 {
-               renesas,groups = "scif1_data_d";
-               renesas,function = "scif1";
+               groups = "scif1_data_d";
+               function = "scif1";
        };
 
        scif_clk_pins: scif_clk {
-               renesas,groups = "scif_clk";
-               renesas,function = "scif_clk";
+               groups = "scif_clk";
+               function = "scif_clk";
        };
 
        ether_pins: ether {
-               renesas,groups = "eth_link", "eth_mdio", "eth_rmii";
-               renesas,function = "eth";
+               groups = "eth_link", "eth_mdio", "eth_rmii";
+               function = "eth";
        };
 
        phy1_pins: phy1 {
-               renesas,groups = "intc_irq0";
-               renesas,function = "intc";
+               groups = "intc_irq0";
+               function = "intc";
        };
 
        qspi_pins: spi0 {
-               renesas,groups = "qspi_ctrl", "qspi_data4";
-               renesas,function = "qspi";
+               groups = "qspi_ctrl", "qspi_data4";
+               function = "qspi";
        };
 
        sound_pins: sound {
-               renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
-               renesas,function = "ssi";
+               groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
+               function = "ssi";
        };
 
        sound_clk_pins: sound_clk {
-               renesas,groups = "audio_clk_a";
-               renesas,function = "audio_clk";
+               groups = "audio_clk_a";
+               function = "audio_clk";
        };
 };