MIPS: dts: correct gpio-keys names and properties

gpio-keys children do not use unit addresses.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts b/arch/mips/boot/dts/img/pistachio_marduk.dts
index a8708783f04bce60d8127eac9ca54511c3b3e098..a8da2f992b1a1d6449cb68b735e23416f142b062 100644 (file)
--- a/arch/mips/boot/dts/img/pistachio_marduk.dts
+++ b/arch/mips/boot/dts/img/pistachio_marduk.dts
@@ -59,12 +59,12 @@
 
        keys {
                compatible = "gpio-keys";
-               button@1 {
+               button-1 {
                        label = "Button 1";
                        linux,code = <0x101>; /* BTN_1 */
                        gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
                };
-               button@2 {
+               button-2 {
                        label = "Button 2";
                        linux,code = <0x102>; /* BTN_2 */
                        gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;

diff --git a/arch/mips/boot/dts/ingenic/gcw0.dts b/arch/mips/boot/dts/ingenic/gcw0.dts
index 4abb0318416ca390c17e21c0694e879c6da456fb..5d33f26fd28c8bd8729ef0039fc3caa071b1159d 100644 (file)
--- a/arch/mips/boot/dts/ingenic/gcw0.dts
+++ b/arch/mips/boot/dts/ingenic/gcw0.dts
@@ -130,89 +130,86 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
                autorepeat;
 
-               button@0 {
+               button-0 {
                        label = "D-pad up";
                        linux,code = <KEY_UP>;
                        linux,can-disable;
                        gpios = <&gpe 21 GPIO_ACTIVE_LOW>;
                };
 
-               button@1 {
+               button-1 {
                        label = "D-pad down";
                        linux,code = <KEY_DOWN>;
                        linux,can-disable;
                        gpios = <&gpe 25 GPIO_ACTIVE_LOW>;
                };
 
-               button@2 {
+               button-2 {
                        label = "D-pad left";
                        linux,code = <KEY_LEFT>;
                        linux,can-disable;
                        gpios = <&gpe 23 GPIO_ACTIVE_LOW>;
                };
 
-               button@3 {
+               button-3 {
                        label = "D-pad right";
                        linux,code = <KEY_RIGHT>;
                        linux,can-disable;
                        gpios = <&gpe 24 GPIO_ACTIVE_LOW>;
                };
 
-               button@4 {
+               button-4 {
                        label = "Button A";
                        linux,code = <KEY_LEFTCTRL>;
                        linux,can-disable;
                        gpios = <&gpe 29 GPIO_ACTIVE_LOW>;
                };
 
-               button@5 {
+               button-5 {
                        label = "Button B";
                        linux,code = <KEY_LEFTALT>;
                        linux,can-disable;
                        gpios = <&gpe 20 GPIO_ACTIVE_LOW>;
                };
 
-               button@6 {
+               button-6 {
                        label = "Button Y";
                        linux,code = <KEY_SPACE>;
                        linux,can-disable;
                        gpios = <&gpe 27 GPIO_ACTIVE_LOW>;
                };
 
-               button@7 {
+               button-7 {
                        label = "Button X";
                        linux,code = <KEY_LEFTSHIFT>;
                        linux,can-disable;
                        gpios = <&gpe 28 GPIO_ACTIVE_LOW>;
                };
 
-               button@8 {
+               button-8 {
                        label = "Left shoulder button";
                        linux,code = <KEY_TAB>;
                        linux,can-disable;
                        gpios = <&gpb 20 GPIO_ACTIVE_LOW>;
                };
 
-               button@9 {
+               button-9 {
                        label = "Right shoulder button";
                        linux,code = <KEY_BACKSPACE>;
                        linux,can-disable;
                        gpios = <&gpe 26 GPIO_ACTIVE_LOW>;
                };
 
-               button@10 {
+               button-10 {
                        label = "Start button";
                        linux,code = <KEY_ENTER>;
                        linux,can-disable;
                        gpios = <&gpb 21 GPIO_ACTIVE_LOW>;
                };
 
-               button@11 {
+               button-11 {
                        label = "Select button";
                        linux,code = <KEY_ESC>;
                        linux,can-disable;
@@ -223,7 +220,7 @@
                        gpios = <&gpd 18 GPIO_ACTIVE_HIGH>;
                };
 
-               button@12 {
+               button-12 {
                        label = "Power slider";
                        linux,code = <KEY_POWER>;
                        linux,can-disable;
@@ -231,7 +228,7 @@
                        wakeup-source;
                };
 
-               button@13 {
+               button-13 {
                        label = "Power hold";
                        linux,code = <KEY_PAUSE>;
                        linux,can-disable;

diff --git a/arch/mips/boot/dts/ingenic/rs90.dts b/arch/mips/boot/dts/ingenic/rs90.dts
index 74fee7f01352335b7498abc5ab9474fe3b88a7e2..e8df70dd42bf8e4cef2109e687ee080cc290d8a1 100644 (file)
--- a/arch/mips/boot/dts/ingenic/rs90.dts
+++ b/arch/mips/boot/dts/ingenic/rs90.dts
@@ -52,53 +52,51 @@
 
        keys@0 {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               key@0 {
+               key-0 {
                        label = "D-pad up";
                        linux,code = <KEY_UP>;
                        gpios = <&gpc 10 GPIO_ACTIVE_LOW>;
                };
 
-               key@1 {
+               key-1 {
                        label = "D-pad down";
                        linux,code = <KEY_DOWN>;
                        gpios = <&gpc 11 GPIO_ACTIVE_LOW>;
                };
 
-               key@2 {
+               key-2 {
                        label = "D-pad left";
                        linux,code = <KEY_LEFT>;
                        gpios = <&gpb 31 GPIO_ACTIVE_LOW>;
                };
 
-               key@3 {
+               key-3 {
                        label = "D-pad right";
                        linux,code = <KEY_RIGHT>;
                        gpios = <&gpd 21 GPIO_ACTIVE_LOW>;
                };
 
-               key@4 {
+               key-4 {
                        label = "Button A";
                        linux,code = <KEY_LEFTCTRL>;
                        gpios = <&gpc 31 GPIO_ACTIVE_LOW>;
                };
 
-               key@5 {
+               key-5 {
                        label = "Button B";
                        linux,code = <KEY_LEFTALT>;
                        gpios = <&gpc 30 GPIO_ACTIVE_LOW>;
                };
 
-               key@6 {
+               key-6 {
                        label = "Right shoulder button";
                        linux,code = <KEY_BACKSPACE>;
                        gpios = <&gpc 12 GPIO_ACTIVE_LOW>;
                        debounce-interval = <10>;
                };
 
-               key@7 {
+               key-7 {
                        label = "Start button";
                        linux,code = <KEY_ENTER>;
                        gpios = <&gpd 17 GPIO_ACTIVE_LOW>;

diff --git a/arch/mips/boot/dts/pic32/pic32mzda_sk.dts b/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
index d7fa5d55dbf3ec364cc54516762fc9492ceeae44..ab70637bbec564002f692ee723fab549b708af0d 100644 (file)
--- a/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
+++ b/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
@@ -52,22 +52,19 @@
                pinctrl-0 = <&user_buttons_s0>;
                pinctrl-names = "default";
 
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               button@sw1 {
+               button-1 {
                        label = "ESC";
                        linux,code = <1>;
                        gpios = <&gpio1 12 0>;
                };
 
-               button@sw2 {
+               button-2 {
                        label = "Home";
                        linux,code = <102>;
                        gpios = <&gpio1 13 0>;
                };
 
-               button@sw3 {
+               button-3 {
                        label = "Menu";
                        linux,code = <139>;
                        gpios = <&gpio1 14 0>;

diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 7fccf6357225a5d8eeb36be31567ce9140beaca1..f3dff4009ab5c49faef7acb8622f8ca181fade76 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -23,17 +23,15 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@0 {
+               button-0 {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
-               button@1 {
+               button-1 {
                        label = "qss";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

diff --git a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
index 7695d326df116eee08eda459ca0d132cefc7034e..c857cd22f7db0db6b2290cbb7bd70db8f0797854 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
+++ b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
@@ -33,10 +33,8 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@0 {
+               button-0 {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;

diff --git a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
index d38aa73f1a2e9806c5bbc4f925635b26d9d0bfae..40e4c5da0e65708ccac3e92b2a41d5856788c815 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
+++ b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
@@ -49,16 +49,14 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@0 {
+               button-0 {
                        label = "jumpstart";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
-               button@1 {
+               button-1 {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;

diff --git a/arch/mips/boot/dts/qca/ar9331_omega.dts b/arch/mips/boot/dts/qca/ar9331_omega.dts
index 11778abacf66ce62738c577a4779ce99aa9a9ca2..ed184d861d5ffbeda751644fb376bc5e7f4710d7 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9331_omega.dts
+++ b/arch/mips/boot/dts/qca/ar9331_omega.dts
@@ -31,10 +31,8 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@0 {
+               button-0 {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;

diff --git a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
index e6622f8e8c2b5ffad8fe7ec71d8a99c3a18a89f1..dc65ebd60bbcd4845517d28e08eed47acc2bec9e 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
+++ b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
@@ -33,10 +33,8 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@0 {
+               button-0 {
                        label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;

diff --git a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
index c8290d36cfbe92d3a9ca2804981619680f4a5d4b..5f424c2cd781157ef575613755872a2d8c96bbaf 100644 (file)
--- a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
+++ b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
@@ -49,22 +49,20 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               button@0 {
+               button-0 {
                        label = "wps";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
-               button@1 {
+               button-1 {
                        label = "sw1";
                        linux,code = <BTN_0>;
                        gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
                };
 
-               button@2 {
+               button-2 {
                        label = "sw2";
                        linux,code = <BTN_1>;
                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;