Hi, On 21-03-16 08:59, Maxime Ripard wrote:
Hi, On Sun, Mar 20, 2016 at 07:55:02PM +0100, Hans de Goede wrote:From: Krzysztof Adamski <k@xxxxxxxx> OrangePi Plus board has two leds - green ("pwr") and red ("status") and two switches ("sw4" and "sw2"). This patch describes them in devicetree. Signed-off-by: Krzysztof Adamski <k@xxxxxxxx> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>An earlier version has already been sent for 4.6, please base your changes on top of this one.
Ah, I missed that one because it is not in your for-next branch! It is only in sunxi-dt-for-4.6.
And there's a bunch of things I didn't catch at that time :/
I'll cherry-pick the patch you've in sunxi-dt-for-4.6 into my tree and send a fixup patch to apply on top. Regards, Hans
--- Changes in v6 (hdegoede): -Merge leds and r_leds nodes into one -Fix led labels to be in <board>:<colour>:<role> form -Alphabetically sort the added nodes -Add support for sw2 (this is the small reset-like button) Changes in v7 (hdegoede): -Use PL3 / PL4 in the pinctrl node, not PL03 / PL04 --- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 63 ++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index a680b1f..9d8c038 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts @@ -45,6 +45,7 @@ #include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/pinctrl/sun4i-a10.h> / { @@ -59,6 +60,43 @@ stdout-path = "serial0:115200n8"; }; + gpio_keys { + compatible = "gpio-keys"; + input-name = "sw4";This is an undocumented (and apparently unused) property+ + pinctrl-names = "default"; + pinctrl-0 = <&sw_r_opc>; + + sw2@0 {You shouldn't have a unit-address here+ label = "sw2"; + linux,code = <BTN_1>; + gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; + }; + + sw4@0 {Ditto. Thanks! Maxime
-- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
