diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-03-22 21:53:22 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-03-27 16:15:04 +0200 |
| commit | cd544a8466506385dfa943f0f8bab89f82cf0bf0 (patch) | |
| tree | a185f4dee2ac2cd54dde1ff3d14d827c304991e6 /arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | |
| parent | c4392ef6c52506823e05d98b1a3ff73c85fed491 (diff) | |
| download | lwn-cd544a8466506385dfa943f0f8bab89f82cf0bf0.tar.gz lwn-cd544a8466506385dfa943f0f8bab89f82cf0bf0.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 12 |
1 files changed, 8 insertions, 4 deletions
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>; |