From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932877Ab2LFQlF (ORCPT ); Thu, 6 Dec 2012 11:41:05 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:38294 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932151Ab2LFQlB (ORCPT ); Thu, 6 Dec 2012 11:41:01 -0500 Date: Thu, 6 Dec 2012 16:40:54 +0000 From: Lee Jones To: Viresh Kumar Cc: sameo@linux.intel.com, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, spear-devel@list.st.com, Vipul Kumar Samar Subject: Re: [PATCH V6] mfd: stmpe: Update DT support for stmpe driver Message-ID: <20121206164054.GV2718@gmail.com> References: <3db3266122f4c54f624477b3fb6763e5821bd3d0.1354807084.git.viresh.kumar@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3db3266122f4c54f624477b3fb6763e5821bd3d0.1354807084.git.viresh.kumar@linaro.org> 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 On Thu, 06 Dec 2012, Viresh Kumar wrote: > From: Vipul Kumar Samar > > This patch extends existing DT support for stmpe devices. This updates: > - missing header files in stmpe.c > - stmpe_of_probe() with pwm, rotator and new bindings. > - Bindings are updated in binding document. > > Acked-by: Lee Jones > Signed-off-by: Vipul Kumar Samar > Signed-off-by: Viresh Kumar > --- > Hi Samuel, > > I have added acked by Lee as he earlier Acked this patch, most of the part is > still the same. And nothing new added. > > V5->V6: > - Removed of_devide_id tables from stmpe-i2c[spi].c > > Documentation/devicetree/bindings/mfd/stmpe.txt | 9 ++++++--- > drivers/mfd/stmpe.c | 27 +++++++++++++++++++------ > 2 files changed, 27 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, ^ the > +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.c b/drivers/mfd/stmpe.c > index 34408b4..bb2dfdb 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 > @@ -1019,6 +1022,14 @@ 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. > + */ I think the comment is unnecessary. > + pdata->id = -1; Perhaps PLATFORM_DEVID_AUTO would be better? > + pdata->irq_trigger = IRQF_TRIGGER_NONE; > + There's no need for this. It's guaranteed to be zero by: pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); > of_property_read_u32(np, "st,autosleep-timeout", > &pdata->autosleep_timeout); > > @@ -1027,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; > } > } > } > @@ -1106,6 +1118,9 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum) > return -ENODEV; > } > stmpe->variant = stmpe_noirq_variant_info[stmpe->partnum]; > + } else if (pdata->irq_trigger == IRQF_TRIGGER_NONE) { > + pdata->irq_trigger = > + irqd_get_trigger_type(irq_get_irq_data(stmpe->irq)); > } > > ret = stmpe_chip_init(stmpe); > -- > 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