From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [RFC/PATCH 1/3] drivers: input: keyboard: adp5589: add DT support Date: Sun, 18 May 2014 13:40:09 -0700 Message-ID: <20140518204009.GB13276@core.coreip.homeip.net> References: <1399467644-27222-1-git-send-email-guido@vanguardiasur.com.ar> <1399467644-27222-2-git-send-email-guido@vanguardiasur.com.ar> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-pa0-f44.google.com ([209.85.220.44]:34432 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752025AbaERUkM (ORCPT ); Sun, 18 May 2014 16:40:12 -0400 Content-Disposition: inline In-Reply-To: <1399467644-27222-2-git-send-email-guido@vanguardiasur.com.ar> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Guido =?iso-8859-1?Q?Mart=EDnez?= Cc: robh+dt@kernel.org, devicetree@vger.kernel.org, Ezequiel =?iso-8859-1?Q?Garc=EDa?= , linux-input@vger.kernel.org, LKML Hi Guido, On Wed, May 07, 2014 at 10:00:42AM -0300, Guido Mart=EDnez wrote: > Add DT support for the Analog ADP5589 matrix keypad decoding function= s. >=20 > Signed-off-by: Guido Mart=EDnez > --- > drivers/input/keyboard/adp5589-keys.c | 207 ++++++++++++++++++++++++= +++++++++- > 1 file changed, 206 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/ke= yboard/adp5589-keys.c > index 6329549..2b232c0 100644 > --- a/drivers/input/keyboard/adp5589-keys.c > +++ b/drivers/input/keyboard/adp5589-keys.c > @@ -18,7 +18,10 @@ > #include > #include > #include > +#include > +#include > =20 > +#include > #include > =20 > /* ADP5589/ADP5585 Common Registers */ > @@ -246,6 +249,14 @@ struct adp5589_kpad { > #endif > }; > =20 > +static struct of_device_id adp5589_of_match[] =3D { > + { > + .compatible =3D "adi,adp5589", > + .data =3D (void *)ADP5589 > + }, > + { }, > +}; > + > /* > * ADP5589 / ADP5585 derivative / variant handling > */ > @@ -858,6 +869,188 @@ static void adp5589_report_switch_state(struct = adp5589_kpad *kpad) > input_sync(kpad->input); > } > =20 > +#ifdef CONFIG_OF > +static int adp5589_key(int row, int col) > +{ > + return col + row * 11; > +} > + > +static int adp5589_dt_read_keymap(struct device *dev, > + struct adp5589_kpad_platform_data *pdata, > + const struct device_node *node) > +{ > + int i; > + const u32 *dt_keymap; > + unsigned short *keymap; > + int keymap_len; > + > + dt_keymap =3D of_get_property(node, "linux,keymap", &keymap_len); > + if (!dt_keymap) { > + dev_err(dev, "missing dt keymap\n"); > + return -ENODEV; > + } > + > + if (keymap_len % sizeof(u32)) { > + dev_err(dev, "malformed keymap (len=3D%i)\n", keymap_len); > + return -EINVAL; > + } > + > + keymap_len /=3D sizeof(u32); > + > + keymap =3D devm_kzalloc(dev, ADP5589_KEYMAPSIZE * sizeof(u32), > + GFP_KERNEL); > + if (!keymap) > + return -ENOMEM; > + > + for (i =3D 0; i < keymap_len; i++) { > + u32 val; > + u16 key; > + u8 row, col; > + > + val =3D be32_to_cpup(&dt_keymap[i]); > + > + row =3D KEY_ROW(val); > + col =3D KEY_COL(val); > + key =3D KEY_VAL(val); > + > + if (row > ADP5589_MAX_ROW_NUM) { > + dev_err(dev, "invalid row number (%i)\n", row); > + return -EINVAL; > + } > + > + if (col > ADP5589_MAX_COL_NUM) { > + dev_err(dev, "invalid column number (%i)\n", col); > + return -EINVAL; > + } > + > + pdata->keypad_en_mask |=3D ADP_ROW(row); > + pdata->keypad_en_mask |=3D ADP_COL(col); > + > + keymap[adp5589_key(row, col)] =3D key; > + } > + > + pdata->keymap =3D keymap; > + pdata->keymapsize =3D ADP5589_KEYMAPSIZE; I was wondering if we could also move non-DT variant to matrix-keypad infrastructure and use matrix_keypad_build_keymap and friends to handle this uniformly. Thanks. --=20 Dmitry -- 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