From patchwork Fri Oct 16 16:01:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 55123 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 8C01622FFA for ; Fri, 16 Oct 2015 16:02:06 +0000 (UTC) Received: by lbbor1 with SMTP id or1sf7406682lbb.2 for ; Fri, 16 Oct 2015 09:02:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=By0LyGliy2u0YKi9MN809Ph25K6blpI6aAn9dsnPC+o=; b=lhhNTUS2MJGXDdQccNzebvuuI/l0DTKDLfWoNyyOZurfFjqJWamep55BQtQ0iDYBOQ gEVz9LdkhzDbXGZoQ5dMB5EIuu7Sq9DZD/r81eGbYQt+nhf/KYiOHCm/zXmKSWj4zxHg eMe1UVo8tipKwXpUZ9a4N1yM+YvLUPEYdFvqrpFNnrcMbhCbApE935+Kdp3XJ8FP0lGn 8R3ws5p8cQBg/v6VKQRRBMTxKdbuAq9IntsilxQ4jCYvHskTQzSMvHRjzC1ilfZEQ4jm 36BhZ1JPqOweBxQQel/1tOBR+qKFv6cppIqs6eWtt6XvJEMotQ3zTWXWw9PwBoRNO+4E rNBQ== X-Gm-Message-State: ALoCoQmxE96kvibxgMVG1wmS8bK6sdl8AdONR0XpoULem3sG5QFdHItxQ95qHDAB+lRrSkGMqkwk X-Received: by 10.112.136.99 with SMTP id pz3mr3840082lbb.11.1445011325461; Fri, 16 Oct 2015 09:02:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.21.152 with SMTP id 24ls240045lfv.97.gmail; Fri, 16 Oct 2015 09:02:05 -0700 (PDT) X-Received: by 10.112.168.194 with SMTP id zy2mr8896225lbb.79.1445011325222; Fri, 16 Oct 2015 09:02:05 -0700 (PDT) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id f64si13316200lfe.156.2015.10.16.09.02.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 09:02:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lfaz124 with SMTP id z124so81719105lfa.1 for ; Fri, 16 Oct 2015 09:02:05 -0700 (PDT) X-Received: by 10.25.82.10 with SMTP id g10mr5872197lfb.56.1445011325060; Fri, 16 Oct 2015 09:02:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp3772lbq; Fri, 16 Oct 2015 09:02:03 -0700 (PDT) X-Received: by 10.107.25.143 with SMTP id 137mr2712052ioz.52.1445011323828; Fri, 16 Oct 2015 09:02:03 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10si4443980igl.94.2015.10.16.09.02.03; Fri, 16 Oct 2015 09:02:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932838AbbJPQCB (ORCPT + 30 others); Fri, 16 Oct 2015 12:02:01 -0400 Received: from foss.arm.com ([217.140.101.70]:42294 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932305AbbJPQBr (ORCPT ); Fri, 16 Oct 2015 12:01:47 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7CD583C; Fri, 16 Oct 2015 09:01:42 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DB26F3F236; Fri, 16 Oct 2015 09:01:43 -0700 (PDT) From: Sudeep Holla To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, arm@kernel.org Cc: Sudeep Holla , Kevin Hilman , Olof Johansson , Arnd Bergmann , Simon Horman , Linus Walleij , Magnus Damm Subject: [PATCH v2] ARM: dts: fix gpio-keys wakeup-source property Date: Fri, 16 Oct 2015 17:01:36 +0100 Message-Id: <1445011296-29042-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sudeep.holla@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The keyboard driver for GPIO buttons(gpio-keys) checks for one of the two boolean properties to enable gpio buttons as wakeup source: 1. "wakeup-source" or 2. the legacy "gpio-key,wakeup" However juno, ste-snowball and emev2-kzm9d dts file have a undetected "wakeup" property to indictate the wakeup source. This patch fixes it by making use of "wakeup-source" property. Cc: Magnus Damm Acked-by: Simon Horman Reviewed-by: Linus Walleij Signed-off-by: Sudeep Holla --- arch/arm/boot/dts/emev2-kzm9d.dts | 8 ++++---- arch/arm/boot/dts/ste-snowball.dts | 10 +++++----- arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) Hi ARM-SoC group, Please consider this as a fix for v4.3 if possible. v2->v1[1] : - included all the reviewed/ack tags, also posting this fix independently Regards, Sudeep [1] https://lkml.org/lkml/2015/10/13/413 diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts index 955c24ee4a8c..8c24975e8f9d 100644 --- a/arch/arm/boot/dts/emev2-kzm9d.dts +++ b/arch/arm/boot/dts/emev2-kzm9d.dts @@ -35,28 +35,28 @@ button@1 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; label = "DSW2-1"; linux,code = ; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; }; button@2 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; label = "DSW2-2"; linux,code = ; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; button@3 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; label = "DSW2-3"; linux,code = ; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; }; button@4 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; label = "DSW2-4"; linux,code = ; gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 32a5ccb14e7e..e80e42163883 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -47,35 +47,35 @@ button@1 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <2>; label = "userpb"; gpios = <&gpio1 0 0x4>; }; button@2 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <3>; label = "extkb1"; gpios = <&gpio4 23 0x4>; }; button@3 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <4>; label = "extkb2"; gpios = <&gpio4 24 0x4>; }; button@4 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <5>; label = "extkb3"; gpios = <&gpio5 1 0x4>; }; button@5 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <6>; label = "extkb4"; gpios = <&gpio5 2 0x4>; diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi index 902f14a8e85b..42153860b41f 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi @@ -61,42 +61,42 @@ button@1 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <116>; label = "POWER"; gpios = <&iofpga_gpio0 0 0x4>; }; button@2 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <102>; label = "HOME"; gpios = <&iofpga_gpio0 1 0x4>; }; button@3 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <152>; label = "RLOCK"; gpios = <&iofpga_gpio0 2 0x4>; }; button@4 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <115>; label = "VOL+"; gpios = <&iofpga_gpio0 3 0x4>; }; button@5 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <114>; label = "VOL-"; gpios = <&iofpga_gpio0 4 0x4>; }; button@6 { debounce_interval = <50>; - wakeup = <1>; + wakeup-source; linux,code = <99>; label = "NMI"; gpios = <&iofpga_gpio0 5 0x4>;