From patchwork Fri May 18 21:09:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10412145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD019602C2 for ; Fri, 18 May 2018 21:10:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC7CE28AB7 for ; Fri, 18 May 2018 21:10:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0EBF28AF1; Fri, 18 May 2018 21:10:12 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 5633C28AB7 for ; Fri, 18 May 2018 21:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752153AbeERVKJ (ORCPT ); Fri, 18 May 2018 17:10:09 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:39068 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752026AbeERVKE (ORCPT ); Fri, 18 May 2018 17:10:04 -0400 Received: by mail-lf0-f65.google.com with SMTP id j193-v6so15869093lfg.6; Fri, 18 May 2018 14:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B6aqZwxP+OJ/Kv0tGiJH5UJdVCPy/mS72mZDCiwri10=; b=mL4LkNuFdC6x2CMYdFBIdQ2kHq6dzUms07dREnKjQUehYo1IhTPL98JuSctop9QUEg 1BdX/G+W2RHkR9HroCVRxJ8uGtG8mxZ0MFoQ90tI5rHNMSkxUryeSnCtXDYbrXuwYXh5 qrCqzTpuRB1r385TW1qILZDdGGfVRLGx98SSiCEvAodMOXB22C1AQ/ViXR96paMTXioX UsBo7fdNcTm6x1FFDDJ/2Rov6fsAZjOVykjY0vH1y8ZvAjCpDfXZn9DHG6LkVVg1ay2I FTlzSK9EiJR5atkJbz3Huz+j9Lx8YwaEdth32EKjKEhVEuMjpmMkZhDovp7btFMM7wYw pz4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B6aqZwxP+OJ/Kv0tGiJH5UJdVCPy/mS72mZDCiwri10=; b=ZDFPWyP9NFLhsIHkvu2cYHnbRMo0FRsJdY3KQcYRtuZnkz1HdMG/Mp7J2XlHrX+hvY 23Gn7+Tgc2QokIE9GosMCc456FcKsOkpOghLXaR+PNdWmNjfNB0lWaFuk5w5+WySl3kC AGCQAErLhgM55NslEv1jHmITu1cmN9R7DUoVDsRCDJ/bt4UKXCalBtOwe/BWgGM1AG+m +Oig7b499n+8zsLwo1582e18GWq+anyYoCxoPhYdwZ8vEKSVkmCc2EuPxRjDx8LlmUK3 uKdjkcFgTSVBknacfwhlTqbkOEZ1ahOX+OYoKQVjnIkrst2difWEf8SJNFMFK4C0MX6Z lTTg== X-Gm-Message-State: ALKqPwe32daYmFHO6b7ePX+kOaDEG4WvMZnoQr9JpshepKuqwqZMOMe/ OxUWfTWf7bltM4bhCh+vtf0= X-Google-Smtp-Source: AB8JxZpuZe1VD1NyOVLRB/2ywuNN2LMdZIcO9AnKLVGsiIuXKOLU3E2/xKZrxx+nn8/F0Myw4rnS8g== X-Received: by 2002:a2e:6c10:: with SMTP id h16-v6mr6515303ljc.81.1526677802302; Fri, 18 May 2018 14:10:02 -0700 (PDT) Received: from localhost.localdomain (apn-31-0-34-132.dynamic.gprs.plus.pl. [31.0.34.132]) by smtp.gmail.com with ESMTPSA id 23-v6sm2057026lfw.64.2018.05.18.14.09.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 14:10:01 -0700 (PDT) From: Janusz Krzysztofik To: Tony Lindgren , Dmitry Torokhov , Boris Brezillon , Tomi Valkeinen , Mark Brown Cc: Aaro Koskinen , Richard Weinberger , Peter Ujfalusi , Jarkko Nikula , Liam Girdwood , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org, Janusz Krzysztofik Subject: [PATCH 2/6] Input: ams_delta_serio: use GPIO lookup table Date: Fri, 18 May 2018 23:09:50 +0200 Message-Id: <20180518210954.29044-2-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180518210954.29044-1-jmkrzyszt@gmail.com> References: <20180518210954.29044-1-jmkrzyszt@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now as the Amstrad Delta board provides GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and use the table to locate required GPIO pins. Declare static variables for storing GPIO descriptors and replace gpio_ functions with their gpiod_ equivalents. Pin naming used by the driver should be followed while respective GPIO lookup table is initialized by a board init code. Created and tested against linux-4.17-rc3, on top of patch 1/6 "ARM: OMAP1: ams-delta: add GPIO lookup tables" Signed-off-by: Janusz Krzysztofik --- drivers/input/serio/ams_delta_serio.c | 98 +++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c index 3df501c3421b..dd1f8f118c08 100644 --- a/drivers/input/serio/ams_delta_serio.c +++ b/drivers/input/serio/ams_delta_serio.c @@ -20,14 +20,13 @@ * However, when used with the E3 mailboard that producecs non-standard * scancodes, a custom key table must be prepared and loaded from userspace. */ -#include +#include #include #include #include #include #include -#include #include @@ -36,6 +35,10 @@ MODULE_DESCRIPTION("AMS Delta (E3) keyboard port driver"); MODULE_LICENSE("GPL"); static struct serio *ams_delta_serio; +static struct gpio_desc *gpiod_data; +static struct gpio_desc *gpiod_clock; +static struct gpio_desc *gpiod_power; +static struct gpio_desc *gpiod_dataout; static int check_data(int data) { @@ -92,7 +95,7 @@ static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id) static int ams_delta_serio_open(struct serio *serio) { /* enable keyboard */ - gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 1); + gpiod_set_value(gpiod_power, 1); return 0; } @@ -100,32 +103,9 @@ static int ams_delta_serio_open(struct serio *serio) static void ams_delta_serio_close(struct serio *serio) { /* disable keyboard */ - gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 0); + gpiod_set_value(gpiod_power, 0); } -static const struct gpio ams_delta_gpios[] __initconst_or_module = { - { - .gpio = AMS_DELTA_GPIO_PIN_KEYBRD_DATA, - .flags = GPIOF_DIR_IN, - .label = "serio-data", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_KEYBRD_CLK, - .flags = GPIOF_DIR_IN, - .label = "serio-clock", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_KEYBRD_PWR, - .flags = GPIOF_OUT_INIT_LOW, - .label = "serio-power", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT, - .flags = GPIOF_OUT_INIT_LOW, - .label = "serio-dataout", - }, -}; - static int __init ams_delta_serio_init(void) { int err; @@ -145,36 +125,62 @@ static int __init ams_delta_serio_init(void) strlcpy(ams_delta_serio->phys, "GPIO/serio0", sizeof(ams_delta_serio->phys)); - err = gpio_request_array(ams_delta_gpios, - ARRAY_SIZE(ams_delta_gpios)); - if (err) { - pr_err("ams_delta_serio: Couldn't request gpio pins\n"); + gpiod_data = gpiod_get(NULL, "data", GPIOD_IN); + if (IS_ERR(gpiod_data)) { + err = PTR_ERR(gpiod_data); + pr_err("%s: 'data' GPIO request failed (%d)\n", __func__, + err); goto serio; } + gpiod_clock = gpiod_get(NULL, "clock", GPIOD_IN); + if (IS_ERR(gpiod_clock)) { + err = PTR_ERR(gpiod_clock); + pr_err("%s: 'clock' GPIO request failed (%d)\n", __func__, + err); + goto gpio_data; + } + gpiod_power = gpiod_get(NULL, "power", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_power)) { + err = PTR_ERR(gpiod_power); + pr_err("%s: 'power' GPIO request failed (%d)\n", __func__, + err); + goto gpio_clock; + } + gpiod_dataout = gpiod_get(NULL, "dataout", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_dataout)) { + err = PTR_ERR(gpiod_dataout); + pr_err("%s: 'dataout' GPIO request failed (%d)\n", + __func__, err); + goto gpio_power; + } - err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), - ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING, - "ams-delta-serio", 0); + err = request_irq(gpiod_to_irq(gpiod_clock), + ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING, + "ams-delta-serio", 0); if (err < 0) { - pr_err("ams_delta_serio: couldn't request gpio interrupt %d\n", - gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK)); - goto gpio; + pr_err("%s: 'clock' GPIO interrupt request failed (%d)\n", + __func__, err); + goto gpio_dataout; } /* * Since GPIO register handling for keyboard clock pin is performed * at FIQ level, switch back from edge to simple interrupt handler * to avoid bad interaction. */ - irq_set_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), - handle_simple_irq); + irq_set_handler(gpiod_to_irq(gpiod_clock), handle_simple_irq); serio_register_port(ams_delta_serio); dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name); return 0; -gpio: - gpio_free_array(ams_delta_gpios, - ARRAY_SIZE(ams_delta_gpios)); +gpio_dataout: + gpiod_put(gpiod_dataout); +gpio_power: + gpiod_put(gpiod_power); +gpio_clock: + gpiod_put(gpiod_clock); +gpio_data: + gpiod_put(gpiod_data); serio: kfree(ams_delta_serio); return err; @@ -184,8 +190,10 @@ module_init(ams_delta_serio_init); static void __exit ams_delta_serio_exit(void) { serio_unregister_port(ams_delta_serio); - free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0); - gpio_free_array(ams_delta_gpios, - ARRAY_SIZE(ams_delta_gpios)); + free_irq(gpiod_to_irq(gpiod_clock), 0); + gpiod_put(gpiod_dataout); + gpiod_put(gpiod_power); + gpiod_put(gpiod_clock); + gpiod_put(gpiod_data); } module_exit(ams_delta_serio_exit);