From: Lee Jones <lee.jones@linaro.org>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, arnd@arndb.de,
linus.walleij@stericsson.com, linux-input@vger.kernel.org
Subject: Re: [PATCH 07/10] input: Enable STMPE keypad driver for Device Tree
Date: Thu, 11 Oct 2012 09:10:21 +0100 [thread overview]
Message-ID: <20121011081021.GT9707@gmail.com> (raw)
In-Reply-To: <20121010165004.GE19335@core.coreip.homeip.net>
On Wed, 10 Oct 2012, Dmitry Torokhov wrote:
> 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;
> }
> }
> }
Looks like it could work. I have a quite a long TODO list at the
moment, but I will add testing this to it.
> BTW, am I supposed to merge it or ack it?
If you Ack it, I can carry it for you no problem.
> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > Cc: linux-input@vger.kernel.org
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> > 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
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2012-10-11 8:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 15:31 [PATCH 00/10] Platform data clean-up and UIB device enablement Lee Jones
2012-10-05 15:31 ` [PATCH 01/10] mfd: Prevent STMPE from abusing mfd_add_devices' irq_base parameter Lee Jones
2012-10-05 15:31 ` [PATCH 02/10] mfd: Provide the STMPE driver with its own IRQ domain Lee Jones
2012-10-05 15:31 ` [PATCH 03/10] mfd: Correct copy and paste mistake in stmpe Lee Jones
2012-10-05 15:31 ` [PATCH 04/10] of/i2c: Add support for I2C_CLIENT_WAKE when booting with Device Tree Lee Jones
2012-10-05 18:13 ` Rob Herring
2012-10-08 7:32 ` Lee Jones
2012-10-05 18:56 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-05 15:31 ` [PATCH 05/10] mfd: Enable the STMPE MFD for " Lee Jones
2012-10-05 15:31 ` [PATCH 06/10] Documentation: Describe bindings for STMPE Multi-Functional Device driver Lee Jones
2012-10-05 15:31 ` [PATCH 07/10] input: Enable STMPE keypad driver for Device Tree Lee Jones
2012-10-10 16:50 ` Dmitry Torokhov
2012-10-11 8:10 ` Lee Jones [this message]
2012-10-05 15:31 ` [PATCH 08/10] Documentation: Describe bindings for STMPE Keypad driver Lee Jones
2012-10-05 15:31 ` [PATCH 09/10] ARM: ux500: Apply a Device Tree node for the STMPE MFD Lee Jones
2012-10-05 15:31 ` [PATCH 10/10] ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT Lee Jones
2012-10-05 19:53 ` [PATCH 00/10] Platform data clean-up and UIB device enablement Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121011081021.GT9707@gmail.com \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).