Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751342AbcCFTzc (ORCPT ); Sun, 6 Mar 2016 14:55:32 -0500 Received: from mx2.suse.de ([195.135.220.15]:34242 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751228AbcCFTyG (ORCPT ); Sun, 6 Mar 2016 14:54:06 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: linux-rockchip@lists.infradead.org Cc: Julien Chauveau , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Catalin Marinas , Will Deacon , Heiko Stuebner , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM64 PORT), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 6/8] arm64: dts: rockchip: Add power key to GeekBox Date: Sun, 6 Mar 2016 20:53:55 +0100 Message-Id: <1457294038-14243-7-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1457294038-14243-1-git-send-email-afaerber@suse.de> References: <1457294038-14243-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1416 Lines: 61 Signed-off-by: Andreas Färber --- 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 098be3700a6f..7036b49c9206 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 / { model = "GeekBox"; @@ -70,6 +71,19 @@ pinctrl-0 = <&ir_int>; }; + keys: gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pwr_key>; + + button@0 { + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + label = "GPIO Power"; + linux,code = ; + 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