arm64: dts: rockchip: Clean up gpio-keys nodes

Drop superfluous #address-cells and #size-cells.
Use KEY_POWER define for 116.
Rename sub-nodes to avoid new dtc warnings.

Reported-by: Julien Chauveau <chauveau.julien@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Julien Chauveau <chauveau.julien@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
index 06bbe421db3758af80188c2ddfc0b745be683f6d..fff8b1931f26d76776d79e83aa9b090b2118f19c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
@@ -40,6 +40,7 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/pwm/pwm.h>
 #include "rk3368.dtsi"
 
@@ -105,16 +106,14 @@
 
        keys: gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwr_key>;
 
-               button@0 {
+               power {
                        wakeup-source;
                        gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
-                       linux,code = <116>;
+                       linux,code = <KEY_POWER>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index a1d1aa9c16feae957ed0ceccd9d440e03344ee4e..b56b7205e39b65d73e3e8a8409f24c13f2896767 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -42,6 +42,7 @@
 
 /dts-v1/;
 #include "rk3368.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Rockchip R88";
@@ -65,16 +66,14 @@
 
        keys: gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwr_key>;
 
-               button@0 {
+               power {
                        wakeup-source;
                        gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
-                       linux,code = <116>;
+                       linux,code = <KEY_POWER>;
                };
        };