From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 22 Mar 2016 20:53:22 +0000 (+0100)
Subject: ARM: dts: sun8i: Orangepi plus gpio keys fixes and improvements
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cd544a8466506385dfa943f0f8bab89f82cf0bf0;p=linux-beck.git

ARM: dts: sun8i: Orangepi plus gpio keys fixes and improvements

Fix the following issues with the gpio_keys node:
1) Use of undocumented input-name property
2) Use of a unit-address on the sw2 node
3) Having "PL03" in the pinctrl node which does not exist, this should
   be "PL3"

And add support for the sw2 button on the board.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
index 3d9996f1f947..94f8b0b834cd 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
@@ -79,12 +79,16 @@
 
 	r_gpio_keys {
 		compatible = "gpio-keys";
-		input-name = "sw4";
-
 		pinctrl-names = "default";
 		pinctrl-0 = <&sw_r_opc>;
 
-		sw4@0 {
+		sw2 {
+			label = "sw2";
+			linux,code = <BTN_1>;
+			gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>;
+		};
+
+		sw4 {
 			label = "sw4";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
@@ -187,7 +191,7 @@
 	};
 
 	sw_r_opc: key_pins@0 {
-		allwinner,pins = "PL03";
+		allwinner,pins = "PL3", "PL4";
 		allwinner,function = "gpio_in";
 		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;