From patchwork Sat Mar 30 13:37:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10878489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 182921874 for ; Sat, 30 Mar 2019 13:37:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02F5528727 for ; Sat, 30 Mar 2019 13:37:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB9C128E44; Sat, 30 Mar 2019 13:37:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8843B28727 for ; Sat, 30 Mar 2019 13:37:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730841AbfC3Nhs (ORCPT ); Sat, 30 Mar 2019 09:37:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37502 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730784AbfC3Nhs (ORCPT ); Sat, 30 Mar 2019 09:37:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5C1CD368A5; Sat, 30 Mar 2019 13:37:48 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18A8D1042B7B; Sat, 30 Mar 2019 13:37:46 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov Cc: Hans de Goede , Peter Hutterer , linux-input@vger.kernel.org Subject: [RFC 4/6] ARM: Stop using deprecated BTN_EXTRA, _SIDE, _FORWARD and _BACK defines Date: Sat, 30 Mar 2019 14:37:33 +0100 Message-Id: <20190330133735.14681-5-hdegoede@redhat.com> In-Reply-To: <20190330133735.14681-1-hdegoede@redhat.com> References: <20190330133735.14681-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 30 Mar 2019 13:37:48 +0000 (UTC) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because the name of the BTN_EXTRA, _SIDE, _FORWARD and _BACK defines was a mismatch with how their values were actually being used, they have been deprecated. This commit moves all users of these defines under arch/arm over to the new defines with the _same_ value. This commit does not cause any functional changes, after this userspace will see the exact same input_event codes as before. Note that in case of the "user" buttons in the dts files, the original usage of BTN_EXTRA is incorrect, as stated in Documentation/input/event-codes.rst: "BTN_{0,1,2,etc} are good generic codes for unlabeled buttons. Do not use meaningful buttons, like BTN_FORWARD.", fixing this falls outside of the scope of this commit as that would actually cause a functional change. Signed-off-by: Hans de Goede --- arch/arm/boot/dts/imx27-apf27dev.dts | 2 +- arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- arch/arm/mach-imx/mach-pcm037_eet.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts index 5f84b598e0d0..246ae4f99a83 100644 --- a/arch/arm/boot/dts/imx27-apf27dev.dts +++ b/arch/arm/boot/dts/imx27-apf27dev.dts @@ -44,7 +44,7 @@ user-key { label = "user"; gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; - linux,code = <276>; /* BTN_EXTRA */ + linux,code = <276>; /* BTN_FORWRD */ }; }; diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi index 746a658e84b6..e0620d12ccfc 100644 --- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi +++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi @@ -63,7 +63,7 @@ user { label = "user"; gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; - linux,code = ; + linux,code = ; wakeup-source; }; }; diff --git a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi index 676d8dd0624a..88597c4dd19e 100644 --- a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi +++ b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi @@ -40,7 +40,7 @@ user-key@184 { label = "user"; gpios = <&gpio6 24 GPIO_ACTIVE_HIGH>; /* gpio 184 */ - linux,code = ; + linux,code = ; wakeup-source; }; }; diff --git a/arch/arm/mach-imx/mach-pcm037_eet.c b/arch/arm/mach-imx/mach-pcm037_eet.c index 15bc956d466b..59b815449f94 100644 --- a/arch/arm/mach-imx/mach-pcm037_eet.c +++ b/arch/arm/mach-imx/mach-pcm037_eet.c @@ -124,13 +124,13 @@ static struct gpio_keys_button pcm037_gpio_keys[] = { .wakeup = 0, }, { .type = EV_KEY, - .code = BTN_FORWARD, + .code = BTN_EXTRA1, .gpio = 50, .desc = "Focus Forward", .wakeup = 0, }, { .type = EV_KEY, - .code = BTN_BACK, + .code = BTN_EXTRA2, .gpio = 51, .desc = "Focus Backward", .wakeup = 0, @@ -142,7 +142,7 @@ static struct gpio_keys_button pcm037_gpio_keys[] = { .wakeup = 0, }, { .type = EV_KEY, - .code = BTN_EXTRA, + .code = BTN_FORWRD, .gpio = 53, .desc = "Release Full", .wakeup = 0,