devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: linux-rockchip@lists.infradead.org
Cc: "Heiko Stuebner" <heiko@sntech.de>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, "Andreas Färber" <afaerber@suse.de>,
	"Julien Chauveau" <chauveau.julien@gmail.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Pawel Moll" <pawel.moll@arm.com>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
	"Kumar Gala" <galak@codeaurora.org>,
	"Catalin Marinas" <catalin.marinas@arm.com>,
	"Will Deacon" <will.deacon@arm.com>,
	"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
	<devicetree@vger.kernel.org>
Subject: [PATCH v4 6/8] arm64: dts: rockchip: Add power key to GeekBox
Date: Wed, 16 Mar 2016 14:58:44 +0100	[thread overview]
Message-ID: <1458136727-32075-7-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1458136727-32075-1-git-send-email-afaerber@suse.de>

Cc: Julien Chauveau <chauveau.julien@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 v3 -> v4:
 * Renamed power button sub-node name (Julien)
 
 v2 -> v3:
 * Adopted wakeup-source instead of gpio-key,wakeup (Julien)
 * Dropped gpio-keys #address-cells and #size-cells properties (Julien)
 * Dropped power button reg property (Julien)
 * Adopted KEY_POWER (Julien)
 * Fixed power button pinctrl pull setting (Julien)
 
 v2: New
 
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
index cef4c12bda48..46cdddfcea6c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
@@ -42,6 +42,7 @@
 
 /dts-v1/;
 #include "rk3368.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
 	model = "GeekBox";
@@ -70,6 +71,19 @@
 		pinctrl-0 = <&ir_int>;
 	};
 
+	keys: gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pwr_key>;
+
+		power {
+			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+			label = "GPIO Power";
+			linux,code = <KEY_POWER>;
+			wakeup-source;
+		};
+	};
+
 	leds: gpio-leds {
 		compatible = "gpio-leds";
 
@@ -265,6 +279,12 @@
 		};
 	};
 
+	keys {
+		pwr_key: pwr-key {
+			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	pmic {
 		pmic_sleep: pmic-sleep {
 			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
-- 
2.6.2

  parent reply	other threads:[~2016-03-16 13:58 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 13:58 [PATCH v4 0/8] arm64: rockchip: Initial GeekBox enablement Andreas Färber
2016-03-16 13:58 ` [PATCH v4 1/8] arm64: dts: rockchip: Clean up /memory nodes Andreas Färber
     [not found]   ` <1458136727-32075-2-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-19  8:04     ` Heiko Stuebner
2016-03-31 17:15       ` Heiko Stuebner
2016-03-31 20:45         ` Heiko Stuebner
2016-04-12  5:24           ` Heiko Stuebner
     [not found] ` <1458136727-32075-1-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-16 13:58   ` [PATCH v4 2/8] Documentation: devicetree: Add vendor prefix for GeekBuying.com Andreas Färber
     [not found]     ` <1458136727-32075-3-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-28 20:24       ` Heiko Stübner
2016-03-16 13:58   ` [PATCH v4 3/8] Documentation: devicetree: rockchip: Document GeekBox Andreas Färber
2016-03-29 20:13     ` Heiko Stübner
2016-03-29 20:45       ` Andreas Färber
2016-03-29 21:21         ` Heiko Stübner
2016-03-31 17:02           ` Heiko Stuebner
2016-03-16 13:58   ` [PATCH v4 7/8] Documentation: devicetree: rockchip: Document Landingship Andreas Färber
     [not found]     ` <1458136727-32075-8-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-18 21:30       ` Rob Herring
2016-03-18 21:37         ` Andreas Färber
2016-03-16 13:58   ` [PATCH v4 8/8] arm64: dts: rockchip: Add Landingship config Andreas Färber
2016-03-29 20:18     ` Heiko Stübner
2016-03-29 22:18       ` Andreas Färber
2016-03-16 13:58 ` [PATCH v4 4/8] arm64: dts: rockchip: Add GeekBox config Andreas Färber
     [not found]   ` <1458136727-32075-5-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-29 19:50     ` Heiko Stübner
2016-03-16 13:58 ` [PATCH v4 5/8] arm64: dts: rockchip: Clean up gpio-keys nodes Andreas Färber
     [not found]   ` <1458136727-32075-6-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-16 21:55     ` Julien Chauveau
2016-03-28 20:24     ` Heiko Stübner
2016-03-28 20:25       ` Heiko Stübner
2016-03-16 13:58 ` Andreas Färber [this message]
2016-03-16 21:55   ` [PATCH v4 6/8] arm64: dts: rockchip: Add power key to GeekBox Julien Chauveau
     [not found]   ` <1458136727-32075-7-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org>
2016-03-29 20:14     ` Heiko Stübner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458136727-32075-7-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=catalin.marinas@arm.com \
    --cc=chauveau.julien@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=heiko@sntech.de \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).