Hi Lee,
On Fri, Oct 05, 2012 at 04:31:43PM +0100, Lee Jones wrote:
> This patch allows the STMPE driver to be successfully probed and
> initialised when Device Tree support is enabled. Besides the usual
> platform data changes, we also separate the process of filling in
> the 'in use' pin bitmap, as we have to extract the information from
> Device Tree in the DT boot case.
This generally looks OK although I wonder if we could not unify DT and
non-DT case by doing:
for (row = 0; row < STMPE_KEYPAD_MAX_ROWS; row++) {
if (col = 0; col < STMPE_KEYPAD_MAX_COLS; col++) {
int code = MATRIX_SCAN_CODE(row, col,
STMPE_KEYPAD_ROW_SHIFT);
if (keypad->keymap[code] != KEY_RESERVED) {
keypad->rows |= 1 << row;
keypad->cols |= 1 << col;
}
}
}
BTW, am I supposed to merge it or ack it?
Thanks!
>
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Cc: linux-input@xxxxxxxxxxxxxxx
> Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
> ---
> drivers/input/keyboard/stmpe-keypad.c | 67 ++++++++++++++++++++++++++++-----
> drivers/mfd/stmpe.c | 1 +
> 2 files changed, 59 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c
> index 470a877..c722d23 100644
> --- a/drivers/input/keyboard/stmpe-keypad.c
> +++ b/drivers/input/keyboard/stmpe-keypad.c
> @@ -257,19 +257,73 @@ static int __devinit stmpe_keypad_chip_init(struct stmpe_keypad *keypad)
> (plat->debounce_ms << 1));
> }
>
> +static int stmpe_keypad_fill_used_pins(struct platform_device *pdev,
> + struct stmpe_keypad *keypad,
> + struct stmpe_keypad_platform_data *plat)
> +{
> + struct device_node *np = pdev->dev.of_node;
> + unsigned int proplen;
> + const __be32 *prop;
> + int i;
> +
> + if (np) {
> + prop = of_get_property(np, "linux,keymap", &proplen);
> + if (!prop) {
> + dev_err(&pdev->dev,
> + "linux,keymap property not defined\n");
> + return -EINVAL;
> + }
> +
> + for (i = 0; i < proplen / sizeof(u32); i++) {
> + unsigned int key = be32_to_cpup(prop + i);
> +
> + keypad->cols |= 1 << KEY_COL(key);
> + keypad->rows |= 1 << KEY_ROW(key);
> + }
> + } else {
> + for (i = 0; i < plat->keymap_data->keymap_size; i++) {
> + unsigned int key = plat->keymap_data->keymap[i];
> +
> + keypad->cols |= 1 << KEY_COL(key);
> + keypad->rows |= 1 << KEY_ROW(key);
> + }
> + }
> +
> + return 0;
> +}
> +
> +static void __devinit stmpe_keypad_of_probe(struct device_node *np,
> + struct stmpe_keypad_platform_data *plat)
> +{
> + of_property_read_u32(np, "debounce-interval", &plat->debounce_ms);
> + of_property_read_u32(np, "stericsson,scan-count", &plat->scan_count);
> +
> + if (of_get_property(np, "stericsson,no-autorepeat", NULL))
> + plat->no_autorepeat = true;
> +}
> +
> static int __devinit stmpe_keypad_probe(struct platform_device *pdev)
> {
> struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
> struct stmpe_keypad_platform_data *plat;
> + struct device_node *np = pdev->dev.of_node;
> struct stmpe_keypad *keypad;
> struct input_dev *input;
> int ret;
> int irq;
> - int i;
>
> plat = stmpe->pdata->keypad;
> - if (!plat)
> - return -ENODEV;
> + if (!plat) {
> + if (np) {
> + plat = devm_kzalloc(&pdev->dev,
> + sizeof(*plat), GFP_KERNEL);
> + if (!plat)
> + return -ENOMEM;
> +
> + stmpe_keypad_of_probe(np, plat);
> + } else
> + return -ENODEV;
> + }
>
> irq = platform_get_irq(pdev, 0);
> if (irq < 0)
> @@ -300,12 +354,7 @@ static int __devinit stmpe_keypad_probe(struct platform_device *pdev)
> if (!plat->no_autorepeat)
> __set_bit(EV_REP, input->evbit);
>
> - for (i = 0; i < plat->keymap_data->keymap_size; i++) {
> - unsigned int key = plat->keymap_data->keymap[i];
> -
> - keypad->cols |= 1 << KEY_COL(key);
> - keypad->rows |= 1 << KEY_ROW(key);
> - }
> + stmpe_keypad_fill_used_pins(pdev, keypad, plat);
>
> keypad->stmpe = stmpe;
> keypad->plat = plat;
> diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
> index ba157d4..b03cc64 100644
> --- a/drivers/mfd/stmpe.c
> +++ b/drivers/mfd/stmpe.c
> @@ -321,6 +321,7 @@ static struct resource stmpe_keypad_resources[] = {
>
> static struct mfd_cell stmpe_keypad_cell = {
> .name = "stmpe-keypad",
> + .of_compatible = "st,stmpe-keypad",
> .resources = stmpe_keypad_resources,
> .num_resources = ARRAY_SIZE(stmpe_keypad_resources),
> };
> --
> 1.7.9.5
>
--
Dmitry
--
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
