Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602Ab2K2JXQ (ORCPT ); Thu, 29 Nov 2012 04:23:16 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:51876 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553Ab2K2JXO (ORCPT ); Thu, 29 Nov 2012 04:23:14 -0500 Date: Thu, 29 Nov 2012 09:23:08 +0000 From: Lee Jones To: Viresh Kumar Cc: sameo@linux.intel.com, grant.likely@secretlab.ca, rabin.vincent@stericsson.com, shiraz.hashim@st.com, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, spear-devel@list.st.com, linus.walleij@linaro.org, Vipul Kumar Samar Subject: Re: [PATCH V4 Resend 3/3] mfd: stmpe: Update DT support in stmpe driver Message-ID: <20121129092308.GT2013@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6880 Lines: 194 On Thu, 29 Nov 2012, Viresh Kumar wrote: > From: Vipul Kumar Samar > > This patch extends existing DT support for stmpe devices. This updates: > - DT support from stmpe SPI and I2C drivers > - missing header files in stmpe.c > - stmpe_of_probe() with pwm, rotator and new bindings. > - Bindings are updated in binding document. > > Signed-off-by: Vipul Kumar Samar > Signed-off-by: Viresh Kumar > --- > V3->V4: > - Remove need to pass irq type and polarity from DT. > - Remove need to pass id from platform data. > > Documentation/devicetree/bindings/mfd/stmpe.txt | 9 ++++++--- > drivers/mfd/stmpe-i2c.c | 15 +++++++++++++++ > drivers/mfd/stmpe-spi.c | 15 +++++++++++++++ > drivers/mfd/stmpe.c | 22 ++++++++++++++++------ > 4 files changed, 52 insertions(+), 9 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt > index 8f0aeda..d2d88d9 100644 > --- a/Documentation/devicetree/bindings/mfd/stmpe.txt > +++ b/Documentation/devicetree/bindings/mfd/stmpe.txt > @@ -1,8 +1,11 @@ > -* STMPE Multi-Functional Device > +* ST Microelectronics STMPE Multi-Functional Device > + > +STMPE is an MFD device which may expose following inbuilt devices: gpio, keypad, > +touchscreen, adc, pwm, rotator. > > Required properties: > - - compatible : "st,stmpe[811|1601|2401|2403]" > - - reg : I2C address of the device > + - compatible : "st,stmpe[610|801|811|1601|2401|2403]" > + - reg : I2C/SPI address of the device > > Optional properties: > - interrupts : The interrupt outputs from the controller > diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c > index c734dc3..003c49b 100644 > --- a/drivers/mfd/stmpe-i2c.c > +++ b/drivers/mfd/stmpe-i2c.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include "stmpe.h" > > @@ -81,6 +82,19 @@ static const struct i2c_device_id stmpe_i2c_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, stmpe_id); > > +#ifdef CONFIG_OF > +static const struct of_device_id stmpe_dt_ids[] = { > + { .compatible = "st,stmpe610", .data = &stmpe_i2c_id[0], }, > + { .compatible = "st,stmpe801", .data = &stmpe_i2c_id[1], }, > + { .compatible = "st,stmpe811", .data = &stmpe_i2c_id[2], }, > + { .compatible = "st,stmpe1601", .data = &stmpe_i2c_id[3], }, > + { .compatible = "st,stmpe2401", .data = &stmpe_i2c_id[4], }, > + { .compatible = "st,stmpe2403", .data = &stmpe_i2c_id[5], }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, stmpe_dt_ids); > +#endif > + > static struct i2c_driver stmpe_i2c_driver = { > .driver = { > .name = "stmpe-i2c", > @@ -88,6 +102,7 @@ static struct i2c_driver stmpe_i2c_driver = { > #ifdef CONFIG_PM > .pm = &stmpe_dev_pm_ops, > #endif > + .of_match_table = of_match_ptr(stmpe_dt_ids), > }, > .probe = stmpe_i2c_probe, > .remove = __devexit_p(stmpe_i2c_remove), > diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c > index 9edfe86..1e2bff0 100644 > --- a/drivers/mfd/stmpe-spi.c > +++ b/drivers/mfd/stmpe-spi.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include "stmpe.h" > > @@ -119,6 +120,19 @@ static const struct spi_device_id stmpe_spi_id[] = { > }; > MODULE_DEVICE_TABLE(spi, stmpe_id); > > +#ifdef CONFIG_OF > +static const struct of_device_id stmpe_dt_ids[] = { > + { .compatible = "st,stmpe610", .data = (void *)STMPE610, }, > + { .compatible = "st,stmpe801", .data = (void *)STMPE801, }, > + { .compatible = "st,stmpe811", .data = (void *)STMPE811, }, > + { .compatible = "st,stmpe1601", .data = (void *)STMPE1601, }, > + { .compatible = "st,stmpe2401", .data = (void *)STMPE2401, }, > + { .compatible = "st,stmpe2403", .data = (void *)STMPE2403, }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, stmpe_dt_ids); > +#endif > + > static struct spi_driver stmpe_spi_driver = { > .driver = { > .name = "stmpe-spi", > @@ -126,6 +140,7 @@ static struct spi_driver stmpe_spi_driver = { > #ifdef CONFIG_PM > .pm = &stmpe_dev_pm_ops, > #endif > + .of_match_table = of_match_ptr(stmpe_dt_ids), > }, > .probe = stmpe_spi_probe, > .remove = __devexit_p(stmpe_spi_remove), > diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c > index 10819e6..88cd8e5 100644 > --- a/drivers/mfd/stmpe.c > +++ b/drivers/mfd/stmpe.c > @@ -7,12 +7,15 @@ > * Author: Rabin Vincent for ST-Ericsson > */ > > +#include > #include > #include > #include > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -1021,6 +1024,12 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata, > { > struct device_node *child; > > + /* > + * Distinct names of same cell-type within multiple instances of stmpe > + * will be guaranteed by DT. > + */ > + pdata->id = -1; And what if we're not booting with DT? > of_property_read_u32(np, "st,autosleep-timeout", > &pdata->autosleep_timeout); > > @@ -1029,15 +1038,16 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata, > for_each_child_of_node(np, child) { > if (!strcmp(child->name, "stmpe_gpio")) { > pdata->blocks |= STMPE_BLOCK_GPIO; > - } > - if (!strcmp(child->name, "stmpe_keypad")) { > + } else if (!strcmp(child->name, "stmpe_keypad")) { > pdata->blocks |= STMPE_BLOCK_KEYPAD; > - } > - if (!strcmp(child->name, "stmpe_touchscreen")) { > + } else if (!strcmp(child->name, "stmpe_touchscreen")) { > pdata->blocks |= STMPE_BLOCK_TOUCHSCREEN; > - } > - if (!strcmp(child->name, "stmpe_adc")) { > + } else if (!strcmp(child->name, "stmpe_adc")) { > pdata->blocks |= STMPE_BLOCK_ADC; > + } else if (!strcmp(child->name, "stmpe_pwm")) { > + pdata->blocks |= STMPE_BLOCK_PWM; > + } else if (!strcmp(child->name, "stmpe_rotator")) { > + pdata->blocks |= STMPE_BLOCK_ROTATOR; > } > } > } > -- > 1.7.12.rc2.18.g61b472e > -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/