From patchwork Wed Oct 24 11:45:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 149495 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp477237ljp; Wed, 24 Oct 2018 04:45:50 -0700 (PDT) X-Google-Smtp-Source: AJdET5cA6FY8ND5DpIV2RbhR+EdXKONl70JDPiWmVyDMFiCNPL7GOHO5qT8kLhdHqMYNKzRBrt+7 X-Received: by 2002:a65:4208:: with SMTP id c8-v6mr2188598pgq.335.1540381550447; Wed, 24 Oct 2018 04:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540381550; cv=none; d=google.com; s=arc-20160816; b=Eag8VmbVNOMdOAYQW2WzM56ef0bKXKCQWoBHev62L+9ftuAfOYll6o6QhEd9LIaPkl lM8cTOy48rg3bUwLSVcBv5DGHgXIc4JICVkopw30yynsmuKO8zBxWkLKk5cmTDgrMYvJ aESLJwQbJ7a+3nobjDWHAShhLh1p8WJ5G9HxM+uIkHh7LjcYAd3Jq+eghxijRO/8+3+G 6DImwgRFn3K5l+gxD7wEU4cCLjPu3uW1R+d146MOWIYENKPed4ZRGrhR7Xg/l7qRezhd /4cxKKGyrcscfUAvAUFEMBz2SYheby4RJx5DGFxC4zVMcapTOiJ/ntiVinjYeP/1kctb QcNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=uHWvr3qpyVgVTgny9BpiD7kAQqUOagpx8f7hICHSnyo=; b=gY8D7hsCBM7zmFp+Z78ckHmjmqAYE7xbeQqTkhiXtm0kwrWI5fzA633tXPdx/sEDez dN+md5wFzly8/8FElatalyyReoK10vEKsD/vvgfYMWUMq07SyWQM1EtTO/x/ChmoDDXe MSFUtAK2WM5brxOtYEVIqtedS2XOssknDCPF+7KtOc/5/qSjs8XOfSXYYrqr1j/t+lCl LCJom+DBVdCaDvCEzYzOVrBUxa39TqO2rJDCiX6svOaoIpD2UvuQ5FNsng6cjEmbvQ9X o3FSZiQTUHc5DSSXQRzwAnL9bQ/1++W3KRxk64rEpWujXki8A2L8StL13JCADARI6m+O KMNQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ca6-v6si4573688plb.52.2018.10.24.04.45.50; Wed, 24 Oct 2018 04:45:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbeJXUNh (ORCPT + 6 others); Wed, 24 Oct 2018 16:13:37 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42338 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726899AbeJXUNh (ORCPT ); Wed, 24 Oct 2018 16:13:37 -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 A8429341; Wed, 24 Oct 2018 04:45:48 -0700 (PDT) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D2AC13F627; Wed, 24 Oct 2018 04:45:46 -0700 (PDT) From: Sudeep Holla To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Sudeep Holla , Nicolas Ferre , Alexandre Belloni , Peter Rosin , Shawn Guo , Sascha Hauer , Fabio Estevam , Michal Simek Subject: [PATCH] ARM: dts: replace gpio-key, wakeup with wakeup-source property Date: Wed, 24 Oct 2018 12:45:39 +0100 Message-Id: <20181024114540.5196-1-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Most of the legacy "gpio-key,wakeup" and "enable-sdio-wakeup" boolean properties are already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees. This patch replaces the legacy properties with the unified "wakeup-source" property. Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Peter Rosin Cc: Shawn Guo Cc: Sascha Hauer Cc: Fabio Estevam Cc: Michal Simek Signed-off-by: Sudeep Holla --- arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +- arch/arm/boot/dts/at91-wb45n.dts | 2 +- arch/arm/boot/dts/at91-wb50n.dts | 4 ++-- arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- arch/arm/boot/dts/imx6sll-evk.dts | 2 +- arch/arm/boot/dts/zynq-zturn.dts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) Hi all, If possible and if ARM SoC agrees, I would prefer to keep this as simple one patch instead of splitting into 3 different once and push as a fix. Regards, Sudeep -- 2.17.1 Acked-by: Alexandre Belloni Reviewed-by: Fabio Estevam Acked-by: Peter Rosin Reviewed-by: Michal Simek diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts index af9f38456d04..375f54010b79 100644 --- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts +++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts @@ -62,7 +62,7 @@ wakeup { label = "Wakeup"; linux,code = <10>; - gpio-key,wakeup; + wakeup-source; gpios = <&pioB 27 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/at91-wb45n.dts b/arch/arm/boot/dts/at91-wb45n.dts index 5b9512a6c89c..54d130c92185 100644 --- a/arch/arm/boot/dts/at91-wb45n.dts +++ b/arch/arm/boot/dts/at91-wb45n.dts @@ -22,7 +22,7 @@ label = "IRQBTN"; linux,code = <99>; gpios = <&pioB 18 GPIO_ACTIVE_LOW>; - gpio-key,wakeup = <1>; + wakeup-source; }; }; }; diff --git a/arch/arm/boot/dts/at91-wb50n.dts b/arch/arm/boot/dts/at91-wb50n.dts index 8cecc7051a86..a5e45bb95c04 100644 --- a/arch/arm/boot/dts/at91-wb50n.dts +++ b/arch/arm/boot/dts/at91-wb50n.dts @@ -23,7 +23,7 @@ label = "BTNESC"; linux,code = <1>; /* ESC button */ gpios = <&pioA 10 GPIO_ACTIVE_LOW>; - gpio-key,wakeup = <1>; + wakeup-source; }; irqbtn@31 { @@ -31,7 +31,7 @@ label = "IRQBTN"; linux,code = <99>; /* SysReq button */ gpios = <&pioE 31 GPIO_ACTIVE_LOW>; - gpio-key,wakeup = <1>; + wakeup-source; }; }; diff --git a/arch/arm/boot/dts/imx6q-pistachio.dts b/arch/arm/boot/dts/imx6q-pistachio.dts index a31e83cd07a3..8f4b60dd819c 100644 --- a/arch/arm/boot/dts/imx6q-pistachio.dts +++ b/arch/arm/boot/dts/imx6q-pistachio.dts @@ -102,7 +102,7 @@ power { label = "Power Button"; gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; - gpio-key,wakeup; + wakeup-source; linux,code = ; }; }; diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts index c8e115564ba2..30b5d63ed319 100644 --- a/arch/arm/boot/dts/imx6sll-evk.dts +++ b/arch/arm/boot/dts/imx6sll-evk.dts @@ -296,7 +296,7 @@ pinctrl-2 = <&pinctrl_usdhc3_200mhz>; cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; vmmc-supply = <®_sd3_vmmc>; status = "okay"; }; diff --git a/arch/arm/boot/dts/zynq-zturn.dts b/arch/arm/boot/dts/zynq-zturn.dts index b38704657960..5ec616ebca08 100644 --- a/arch/arm/boot/dts/zynq-zturn.dts +++ b/arch/arm/boot/dts/zynq-zturn.dts @@ -54,7 +54,7 @@ label = "K1"; gpios = <&gpio0 0x32 0x1>; linux,code = <0x66>; - gpio-key,wakeup; + wakeup-source; autorepeat; }; };