From patchwork Wed Nov 16 13:42:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 82512 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp159449qge; Wed, 16 Nov 2016 05:42:28 -0800 (PST) X-Received: by 10.98.144.86 with SMTP id a83mr4569885pfe.107.1479303748145; Wed, 16 Nov 2016 05:42:28 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y27si31961707pfj.161.2016.11.16.05.42.27; Wed, 16 Nov 2016 05:42:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-input-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 linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932140AbcKPNmX (ORCPT + 1 other); Wed, 16 Nov 2016 08:42:23 -0500 Received: from foss.arm.com ([217.140.101.70]:51416 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932119AbcKPNmW (ORCPT ); Wed, 16 Nov 2016 08:42:22 -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 292BC16; Wed, 16 Nov 2016 05:42:21 -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 03B623F24D; Wed, 16 Nov 2016 05:42:19 -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 v2 -next] Input: gpio_keys: set input direction explicitly for gpio keys Date: Wed, 16 Nov 2016 13:42:14 +0000 Message-Id: <1479303734-16198-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479297298-26555-1-git-send-email-sudeep.holla@arm.com> References: <1479297298-26555-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 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 | 5 ++++- drivers/input/keyboard/gpio_keys_polled.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) v1->v2: - Fix the build(had sent a wrong version by accident) Hi Dmitry, The other option would be to pass the flag explicitly and add support to handle it in the path devm_get_gpiod_from_child would take. Let me know your opinion. Regards, Sudeep -- 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..f5e2d377f5c1 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,9 @@ static int gpio_keys_setup_key(struct platform_device *pdev, } if (bdata->gpiod) { + /* set the GPIO direction to input */ + gpiod_direction_input(bdata->gpiod); + 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..56bf0dc5e2e4 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,9 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) } } + /* set the GPIO direction to input */ + gpiod_direction_input(bdata->gpiod); + bdata->last_state = -1; bdata->threshold = DIV_ROUND_UP(button->debounce_interval, pdata->poll_interval);