From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934187Ab2J3SZx (ORCPT ); Tue, 30 Oct 2012 14:25:53 -0400 Received: from mho-04-ewr.mailhop.org ([204.13.248.74]:32068 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934038Ab2J3SZr (ORCPT ); Tue, 30 Oct 2012 14:25:47 -0400 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18xjlAJVNgoipziGIWN5Np7 Date: Tue, 30 Oct 2012 11:25:44 -0700 From: Tony Lindgren To: Pantelis Antoniou Cc: Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Koen Kooi , Matt Porter , Russ Dill , linux-omap@vger.kernel.org Subject: Re: [PATCH] gpio-keys: Pinctrl-fy Message-ID: <20121030182544.GO11908@atomide.com> References: <1351699019-4313-1-git-send-email-panto@antoniou-consulting.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1351699019-4313-1-git-send-email-panto@antoniou-consulting.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Pantelis Antoniou [121030 11:23]: > Enable pinctrl support for gpio-keys. There's some discussion going on regarding doing the pinctrl boilerplate things somewhere else started by Dmitry, but meanwhile: Acked-by: Tony Lindgren > Signed-off-by: Pantelis Antoniou > --- > drivers/input/keyboard/gpio_keys.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c > index 6a68041..e421082 100644 > --- a/drivers/input/keyboard/gpio_keys.c > +++ b/drivers/input/keyboard/gpio_keys.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > struct gpio_button_data { > const struct gpio_keys_button *button; > @@ -666,6 +667,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) > struct input_dev *input; > int i, error; > int wakeup = 0; > + struct pinctrl *pinctrl; > > if (!pdata) { > pdata = gpio_keys_get_devtree_pdata(dev); > @@ -731,6 +733,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) > goto fail3; > } > > + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); > + if (IS_ERR(pinctrl)) > + dev_warn(&pdev->dev, "unable to select pin group\n"); > + > /* get current state of buttons that are connected to GPIOs */ > for (i = 0; i < pdata->nbuttons; i++) { > struct gpio_button_data *bdata = &ddata->data[i]; > -- > 1.7.12 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/