From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH V6] mfd: stmpe: Update DT support for stmpe driver Date: Thu, 6 Dec 2012 16:40:54 +0000 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-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <3db3266122f4c54f624477b3fb6763e5821bd3d0.1354807084.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: "devicetree-discuss" To: Viresh Kumar Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, spear-devel-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org, sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org T24gVGh1LCAwNiBEZWMgMjAxMiwgVmlyZXNoIEt1bWFyIHdyb3RlOgoKPiBGcm9tOiBWaXB1bCBL dW1hciBTYW1hciA8dmlwdWxrdW1hci5zYW1hckBzdC5jb20+Cj4gCj4gVGhpcyBwYXRjaCBleHRl bmRzIGV4aXN0aW5nIERUIHN1cHBvcnQgZm9yIHN0bXBlIGRldmljZXMuIFRoaXMgdXBkYXRlczoK PiAtIG1pc3NpbmcgaGVhZGVyIGZpbGVzIGluIHN0bXBlLmMKPiAtIHN0bXBlX29mX3Byb2JlKCkg d2l0aCBwd20sIHJvdGF0b3IgYW5kIG5ldyBiaW5kaW5ncy4KPiAtIEJpbmRpbmdzIGFyZSB1cGRh dGVkIGluIGJpbmRpbmcgZG9jdW1lbnQuCj4gCj4gQWNrZWQtYnk6IExlZSBKb25lcyA8bGVlLmpv bmVzQGxpbmFyby5vcmc+Cj4gU2lnbmVkLW9mZi1ieTogVmlwdWwgS3VtYXIgU2FtYXIgPHZpcHVs a3VtYXIuc2FtYXJAc3QuY29tPgo+IFNpZ25lZC1vZmYtYnk6IFZpcmVzaCBLdW1hciA8dmlyZXNo Lmt1bWFyQGxpbmFyby5vcmc+Cj4gLS0tCj4gSGkgU2FtdWVsLAo+IAo+IEkgaGF2ZSBhZGRlZCBh Y2tlZCBieSBMZWUgYXMgaGUgZWFybGllciBBY2tlZCB0aGlzIHBhdGNoLCBtb3N0IG9mIHRoZSBw YXJ0IGlzCj4gc3RpbGwgdGhlIHNhbWUuIEFuZCBub3RoaW5nIG5ldyBhZGRlZC4KPiAKPiBWNS0+ VjY6Cj4gLSBSZW1vdmVkIG9mX2RldmlkZV9pZCB0YWJsZXMgZnJvbSBzdG1wZS1pMmNbc3BpXS5j Cj4gCj4gIERvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9tZmQvc3RtcGUudHh0IHwg IDkgKysrKysrLS0tCj4gIGRyaXZlcnMvbWZkL3N0bXBlLmMgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgMjcgKysrKysrKysrKysrKysrKysrKy0tLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQs IDI3IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL0RvY3Vt ZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9tZmQvc3RtcGUudHh0IGIvRG9jdW1lbnRhdGlv bi9kZXZpY2V0cmVlL2JpbmRpbmdzL21mZC9zdG1wZS50eHQKPiBpbmRleCA4ZjBhZWRhLi5kMmQ4 OGQ5IDEwMDY0NAo+IC0tLSBhL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9tZmQv c3RtcGUudHh0Cj4gKysrIGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL21mZC9z dG1wZS50eHQKPiBAQCAtMSw4ICsxLDExIEBACj4gLSogU1RNUEUgTXVsdGktRnVuY3Rpb25hbCBE ZXZpY2UKPiArKiBTVCBNaWNyb2VsZWN0cm9uaWNzIFNUTVBFIE11bHRpLUZ1bmN0aW9uYWwgRGV2 aWNlCj4gKwo+ICtTVE1QRSBpcyBhbiBNRkQgZGV2aWNlIHdoaWNoIG1heSBleHBvc2UgZm9sbG93 aW5nIGluYnVpbHQgZGV2aWNlczogZ3Bpbywga2V5cGFkLAoKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXiB0aGUKCj4gK3RvdWNoc2NyZWVuLCBhZGMsIHB3bSwgcm90 YXRvci4KPiAgCj4gIFJlcXVpcmVkIHByb3BlcnRpZXM6Cj4gLSAtIGNvbXBhdGlibGUgICAgICAg ICAgICAgICAgICAgOiAic3Qsc3RtcGVbODExfDE2MDF8MjQwMXwyNDAzXSIKPiAtIC0gcmVnICAg ICAgICAgICAgICAgICAgICAgICAgICA6IEkyQyBhZGRyZXNzIG9mIHRoZSBkZXZpY2UKPiArIC0g Y29tcGF0aWJsZSAgICAgICAgICAgICAgICAgICA6ICJzdCxzdG1wZVs2MTB8ODAxfDgxMXwxNjAx fDI0MDF8MjQwM10iCj4gKyAtIHJlZyAgICAgICAgICAgICAgICAgICAgICAgICAgOiBJMkMvU1BJ IGFkZHJlc3Mgb2YgdGhlIGRldmljZQo+ICAKPiAgT3B0aW9uYWwgcHJvcGVydGllczoKPiAgIC0g aW50ZXJydXB0cyAgICAgICAgICAgICAgICAgICA6IFRoZSBpbnRlcnJ1cHQgb3V0cHV0cyBmcm9t IHRoZSBjb250cm9sbGVyCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWZkL3N0bXBlLmMgYi9kcml2 ZXJzL21mZC9zdG1wZS5jCj4gaW5kZXggMzQ0MDhiNC4uYmIyZGZkYiAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL21mZC9zdG1wZS5jCj4gKysrIGIvZHJpdmVycy9tZmQvc3RtcGUuYwo+IEBAIC03LDEy ICs3LDE1IEBACj4gICAqIEF1dGhvcjogUmFiaW4gVmluY2VudCA8cmFiaW4udmluY2VudEBzdGVy aWNzc29uLmNvbT4gZm9yIFNULUVyaWNzc29uCj4gICAqLwo+ICAKPiArI2luY2x1ZGUgPGxpbnV4 L2Vyci5oPgo+ICAjaW5jbHVkZSA8bGludXgvZ3Bpby5oPgo+ICAjaW5jbHVkZSA8bGludXgvZXhw b3J0Lmg+Cj4gICNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L2lu dGVycnVwdC5oPgo+ICAjaW5jbHVkZSA8bGludXgvaXJxLmg+Cj4gICNpbmNsdWRlIDxsaW51eC9p cnFkb21haW4uaD4KPiArI2luY2x1ZGUgPGxpbnV4L29mLmg+Cj4gKyNpbmNsdWRlIDxsaW51eC9v Zl9ncGlvLmg+Cj4gICNpbmNsdWRlIDxsaW51eC9wbS5oPgo+ICAjaW5jbHVkZSA8bGludXgvc2xh Yi5oPgo+ICAjaW5jbHVkZSA8bGludXgvbWZkL2NvcmUuaD4KPiBAQCAtMTAxOSw2ICsxMDIyLDE0 IEBAIHZvaWQgX19kZXZpbml0IHN0bXBlX29mX3Byb2JlKHN0cnVjdCBzdG1wZV9wbGF0Zm9ybV9k YXRhICpwZGF0YSwKPiAgewo+ICAJc3RydWN0IGRldmljZV9ub2RlICpjaGlsZDsKPiAgCj4gKwkv Kgo+ICsJICogRGlzdGluY3QgbmFtZXMgb2Ygc2FtZSBjZWxsLXR5cGUgd2l0aGluIG11bHRpcGxl IGluc3RhbmNlcyBvZiBzdG1wZQo+ICsJICogd2lsbCBiZSBndWFyYW50ZWVkIGJ5IERULgo+ICsJ ICovCgpJIHRoaW5rIHRoZSBjb21tZW50IGlzIHVubmVjZXNzYXJ5LgoKPiArCXBkYXRhLT5pZCA9 IC0xOwoKUGVyaGFwcyBQTEFURk9STV9ERVZJRF9BVVRPIHdvdWxkIGJlIGJldHRlcj8KCj4gKwlw ZGF0YS0+aXJxX3RyaWdnZXIgPSBJUlFGX1RSSUdHRVJfTk9ORTsKPiArCgpUaGVyZSdzIG5vIG5l ZWQgZm9yIHRoaXMuIEl0J3MgZ3VhcmFudGVlZCB0byBiZSB6ZXJvIGJ5OgoKICBwZGF0YSA9IGt6 YWxsb2Moc2l6ZW9mKCpwZGF0YSksIEdGUF9LRVJORUwpOwoKPiAgCW9mX3Byb3BlcnR5X3JlYWRf dTMyKG5wLCAic3QsYXV0b3NsZWVwLXRpbWVvdXQiLAo+ICAJCQkmcGRhdGEtPmF1dG9zbGVlcF90 aW1lb3V0KTsKPiAgCj4gQEAgLTEwMjcsMTUgKzEwMzgsMTYgQEAgdm9pZCBfX2RldmluaXQgc3Rt cGVfb2ZfcHJvYmUoc3RydWN0IHN0bXBlX3BsYXRmb3JtX2RhdGEgKnBkYXRhLAo+ICAJZm9yX2Vh Y2hfY2hpbGRfb2Zfbm9kZShucCwgY2hpbGQpIHsKPiAgCQlpZiAoIXN0cmNtcChjaGlsZC0+bmFt ZSwgInN0bXBlX2dwaW8iKSkgewo+ICAJCQlwZGF0YS0+YmxvY2tzIHw9IFNUTVBFX0JMT0NLX0dQ SU87Cj4gLQkJfQo+IC0JCWlmICghc3RyY21wKGNoaWxkLT5uYW1lLCAic3RtcGVfa2V5cGFkIikp IHsKPiArCQl9IGVsc2UgaWYgKCFzdHJjbXAoY2hpbGQtPm5hbWUsICJzdG1wZV9rZXlwYWQiKSkg ewo+ICAJCQlwZGF0YS0+YmxvY2tzIHw9IFNUTVBFX0JMT0NLX0tFWVBBRDsKPiAtCQl9Cj4gLQkJ aWYgKCFzdHJjbXAoY2hpbGQtPm5hbWUsICJzdG1wZV90b3VjaHNjcmVlbiIpKSB7Cj4gKwkJfSBl bHNlIGlmICghc3RyY21wKGNoaWxkLT5uYW1lLCAic3RtcGVfdG91Y2hzY3JlZW4iKSkgewo+ICAJ CQlwZGF0YS0+YmxvY2tzIHw9IFNUTVBFX0JMT0NLX1RPVUNIU0NSRUVOOwo+IC0JCX0KPiAtCQlp ZiAoIXN0cmNtcChjaGlsZC0+bmFtZSwgInN0bXBlX2FkYyIpKSB7Cj4gKwkJfSBlbHNlIGlmICgh c3RyY21wKGNoaWxkLT5uYW1lLCAic3RtcGVfYWRjIikpIHsKPiAgCQkJcGRhdGEtPmJsb2NrcyB8 PSBTVE1QRV9CTE9DS19BREM7Cj4gKwkJfSBlbHNlIGlmICghc3RyY21wKGNoaWxkLT5uYW1lLCAi c3RtcGVfcHdtIikpIHsKPiArCQkJcGRhdGEtPmJsb2NrcyB8PSBTVE1QRV9CTE9DS19QV007Cj4g KwkJfSBlbHNlIGlmICghc3RyY21wKGNoaWxkLT5uYW1lLCAic3RtcGVfcm90YXRvciIpKSB7Cj4g KwkJCXBkYXRhLT5ibG9ja3MgfD0gU1RNUEVfQkxPQ0tfUk9UQVRPUjsKPiAgCQl9Cj4gIAl9Cj4g IH0KPiBAQCAtMTEwNiw2ICsxMTE4LDkgQEAgaW50IF9fZGV2aW5pdCBzdG1wZV9wcm9iZShzdHJ1 Y3Qgc3RtcGVfY2xpZW50X2luZm8gKmNpLCBpbnQgcGFydG51bSkKPiAgCQkJcmV0dXJuIC1FTk9E RVY7Cj4gIAkJfQo+ICAJCXN0bXBlLT52YXJpYW50ID0gc3RtcGVfbm9pcnFfdmFyaWFudF9pbmZv W3N0bXBlLT5wYXJ0bnVtXTsKPiArCX0gZWxzZSBpZiAocGRhdGEtPmlycV90cmlnZ2VyID09IElS UUZfVFJJR0dFUl9OT05FKSB7Cj4gKwkJcGRhdGEtPmlycV90cmlnZ2VyID0KPiArCQkJaXJxZF9n ZXRfdHJpZ2dlcl90eXBlKGlycV9nZXRfaXJxX2RhdGEoc3RtcGUtPmlycSkpOwo+ICAJfQo+ICAK PiAgCXJldCA9IHN0bXBlX2NoaXBfaW5pdChzdG1wZSk7Cj4gLS0gCj4gMS43LjEyLnJjMi4xOC5n NjFiNDcyZQo+IAoKLS0gCkxlZSBKb25lcwpMaW5hcm8gU1QtRXJpY3Nzb24gTGFuZGluZyBUZWFt IExlYWQKTGluYXJvLm9yZyDilIIgT3BlbiBzb3VyY2Ugc29mdHdhcmUgZm9yIEFSTSBTb0NzCkZv bGxvdyBMaW5hcm86IEZhY2Vib29rIHwgVHdpdHRlciB8IEJsb2cKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZGV2aWNldHJlZS1kaXNjdXNzIG1haWxpbmcg bGlzdApkZXZpY2V0cmVlLWRpc2N1c3NAbGlzdHMub3psYWJzLm9yZwpodHRwczovL2xpc3RzLm96 bGFicy5vcmcvbGlzdGluZm8vZGV2aWNldHJlZS1kaXNjdXNzCg== 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