Re: [RFC/PATCH 1/3] drivers: input: keyboard: adp5589: add DT support

[Dmitry Torokhov]

Hi Guido,

On Wed, May 07, 2014 at 10:00:42AM -0300, Guido Martínez wrote:
> Add DT support for the Analog ADP5589 matrix keypad decoding functions.
> 
> Signed-off-by: Guido Martínez <guido@xxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/input/keyboard/adp5589-keys.c | 207 +++++++++++++++++++++++++++++++++-
>  1 file changed, 206 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/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 <linux/i2c.h>
>  #include <linux/gpio.h>
>  #include <linux/slab.h>
> +#include <linux/of.h>
> +#include <linux/err.h>
>  
> +#include <linux/input/matrix_keypad.h>
>  #include <linux/input/adp5589.h>
>  
>  /* ADP5589/ADP5585 Common Registers */
> @@ -246,6 +249,14 @@ struct adp5589_kpad {
>  #endif
>  };
>  
> +static struct of_device_id adp5589_of_match[] = {
> +	{
> +		.compatible = "adi,adp5589",
> +		.data = (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);
>  }
>  
> +#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 = 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=%i)\n", keymap_len);
> +		return -EINVAL;
> +	}
> +
> +	keymap_len /= sizeof(u32);
> +
> +	keymap = devm_kzalloc(dev, ADP5589_KEYMAPSIZE * sizeof(u32),
> +			      GFP_KERNEL);
> +	if (!keymap)
> +		return -ENOMEM;
> +
> +	for (i = 0; i < keymap_len; i++) {
> +		u32 val;
> +		u16 key;
> +		u8 row, col;
> +
> +		val = be32_to_cpup(&dt_keymap[i]);
> +
> +		row = KEY_ROW(val);
> +		col = KEY_COL(val);
> +		key = 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 |= ADP_ROW(row);
> +		pdata->keypad_en_mask |= ADP_COL(col);
> +
> +		keymap[adp5589_key(row, col)] = key;
> +	}
> +
> +	pdata->keymap = keymap;
> +	pdata->keymapsize = 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.

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/