On Wed, Oct 26, 2016 at 06:16:10PM -0700, Dmitry Torokhov wrote:
> Hi Mika,
>
> On Mon, Oct 17, 2016 at 05:38:03PM +0300, Mika Westerberg wrote:
> > In order to use this driver in ACPI based systems, convert the driver to
> > take advantage of device properties APIs instead of Device Tree specific
> > one and make it available outside of CONFIG_OF.
> >
> > Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> > ---
> > drivers/input/keyboard/gpio_keys.c | 92 ++++++++++++++++----------------------
> > 1 file changed, 38 insertions(+), 54 deletions(-)
> >
> > diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
> > index 29093657f2ef..0e6d516df01b 100644
> > --- a/drivers/input/keyboard/gpio_keys.c
> > +++ b/drivers/input/keyboard/gpio_keys.c
> > @@ -22,13 +22,12 @@
> > #include <linux/proc_fs.h>
> > #include <linux/delay.h>
> > #include <linux/platform_device.h>
> > +#include <linux/property.h>
> > #include <linux/input.h>
> > #include <linux/gpio_keys.h>
> > #include <linux/workqueue.h>
> > #include <linux/gpio.h>
> > #include <linux/of.h>
> > -#include <linux/of_platform.h>
> > -#include <linux/of_gpio.h>
> > #include <linux/of_irq.h>
> > #include <linux/spinlock.h>
> >
> > @@ -479,13 +478,15 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
> > spin_lock_init(&bdata->lock);
> >
> > if (gpio_is_valid(button->gpio)) {
> > -
> > - error = devm_gpio_request_one(&pdev->dev, button->gpio,
> > - GPIOF_IN, desc);
> > - if (error < 0) {
> > - dev_err(dev, "Failed to request GPIO %d, error %d\n",
> > - button->gpio, error);
> > - return error;
> > + /* Only request GPIO if GPIO descriptor is not used */
> > + if (!button->gpiod) {
>
> So the issue here is that button is supposed to be constant (in case of
> legacy platform data) and we should not be stuffing gpiod in there. The
> commit adding the descriptor to button data was wrong.
>
> I have a patch that moves in from button data to bdata for polled keys
> and also an alternative patch for gpio_keys; I'll post the series.
OK, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
