From patchwork Wed Nov 16 18:38:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 9432369 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 18F5E60471 for ; Wed, 16 Nov 2016 18:38:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D6942863A for ; Wed, 16 Nov 2016 18:38:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 021E4286EA; Wed, 16 Nov 2016 18:38:32 +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=-6.9 required=2.0 tests=BAYES_00,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 9A7822863A for ; Wed, 16 Nov 2016 18:38:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753099AbcKPSia (ORCPT ); Wed, 16 Nov 2016 13:38:30 -0500 Received: from foss.arm.com ([217.140.101.70]:33782 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517AbcKPSi3 (ORCPT ); Wed, 16 Nov 2016 13:38:29 -0500 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 5185916; Wed, 16 Nov 2016 10:38:29 -0800 (PST) Received: from e107155-lin.cambridge.arm.com (unknown [10.1.210.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2D9D53F218; Wed, 16 Nov 2016 10:38:28 -0800 (PST) From: Sudeep Holla To: linux-input@vger.kernel.org, Dmitry Torokhov Cc: Sudeep Holla , linux-kernel@vger.kernel.org, Linus Walleij , Geert Uytterhoeven , Mika Westerberg Subject: [PATCH v3 -next] Input: gpio_keys: set input direction explicitly for gpio keys Date: Wed, 16 Nov 2016 18:38:22 +0000 Message-Id: <1479321502-22265-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479303734-16198-1-git-send-email-sudeep.holla@arm.com> References: <1479303734-16198-1-git-send-email-sudeep.holla@arm.com> 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 Commit 700a38b27eef ("Input: gpio_keys - switch to using generic device properties") switched to use generic device properties for GPIO keys and commit 5feeca3c1e39 ("Input: gpio_keys - add support for GPIO descriptors") switched from legacy GPIO numbers to GPIO descriptors. Previously devm_gpio_request_one was explicitly passed GPIOF_DIR_IN flag to set the GPIO direction as input. However devm_get_gpiod_from_child doesn't have such provisions and hence fwnode_get_named_gpiod can't set it as input. This breaks few platforms with the following error: " gpiochip_lock_as_irq: tried to flag a GPIO set as output for IRQ unable to lock HW IRQ for IRQ genirq: Failed to request resources for POWER (irq ) on irqchip gpio_keys: Unable to claim irq ; error -22 gpio-keys: probe failed with error -22 " This patch fixes the issue by setting input direction explicitly for gpio input keys. It also remove the existing GPIOF_DIR_IN flag setting for the legacy gpios and merges into single gpiod_direction_input call. Fixes: 700a38b27eef ("Input: gpio_keys - switch to using generic device properties") Cc: Dmitry Torokhov Cc: Linus Walleij Cc: Geert Uytterhoeven Cc: Mika Westerberg Signed-off-by: Sudeep Holla --- drivers/input/keyboard/gpio_keys.c | 10 +++++++++- drivers/input/keyboard/gpio_keys_polled.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) v2->v3: - Added error handling and error message -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 5576f2ae0b71..ed38a05b3039 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -502,7 +502,7 @@ static int gpio_keys_setup_key(struct platform_device *pdev, * Legacy GPIO number, so request the GPIO here and * convert it to descriptor. */ - unsigned flags = GPIOF_IN; + unsigned flags = 0; if (button->active_low) flags |= GPIOF_ACTIVE_LOW; @@ -521,6 +521,14 @@ static int gpio_keys_setup_key(struct platform_device *pdev, } if (bdata->gpiod) { + /* set the GPIO direction to input */ + error = gpiod_direction_input(bdata->gpiod); + if (error) { + dev_err(dev, "Failed to configure GPIO %d as input, error %d\n", + desc_to_gpio(bdata->gpiod), error); + return error; + } + if (button->debounce_interval) { error = gpiod_set_debounce(bdata->gpiod, button->debounce_interval * 1000); diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 72b350315d43..4bd8a015cf5f 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -319,7 +319,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) * Legacy GPIO number so request the GPIO here and * convert it to descriptor. */ - unsigned flags = GPIOF_IN; + unsigned flags = 0; if (button->active_low) flags |= GPIOF_ACTIVE_LOW; @@ -342,6 +342,14 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) } } + /* set the GPIO direction to input */ + error = gpiod_direction_input(bdata->gpiod); + if (error) { + dev_err(dev, "Failed to configure GPIO %d as input, error %d\n", + desc_to_gpio(bdata->gpiod), error); + return error; + } + bdata->last_state = -1; bdata->threshold = DIV_ROUND_UP(button->debounce_interval, pdata->poll_interval);