From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v7 04/24] mfd: max77686: Make platform data over-rule DT Date: Fri, 18 Jul 2014 09:17:59 +0100 Message-ID: <20140718081759.GN30888@lee--X1> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Javier Martinez Canillas Cc: Alessandro Zummo , Krzysztof Kozlowski , Kukjin Kim , Mike Turquette , Tomeu Vizoso , devicetree@vger.kernel.org, Yadwinder Singh Brar , linux-kernel@vger.kernel.org, Liam Girdwood , Doug Anderson , Tushar Behera , Mark Brown , linux-samsung-soc@vger.kernel.org, Olof Johansson , Andreas Farber , linux-arm-kernel@lists.infradead.org List-Id: linux-samsung-soc@vger.kernel.org T24gRnJpLCAwNCBKdWwgMjAxNCwgSmF2aWVyIE1hcnRpbmV6IENhbmlsbGFzIHdyb3RlOgoKPiBU aGUgZnVuY3Rpb24gbWF4Nzc4MDJfaTJjX3BhcnNlX2R0X3BkYXRhKCkgc2hvdWxkIG9ubHkgYmUg Y2FsbGVkCj4gaWYgdGhlcmUgaXNuJ3QgYWxyZWFkeSBwbGF0Zm9ybSBkYXRhIGZvciB0aGUgZGV2 aWNlLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEphdmllciBNYXJ0aW5leiBDYW5pbGxhcyA8amF2aWVy Lm1hcnRpbmV6QGNvbGxhYm9yYS5jby51az4KPiAtLS0KPiAgZHJpdmVycy9tZmQvbWF4Nzc2ODYu YyB8IDIgKy0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0p CgpBcHBsaWVkIG5vdywgdGhhbmtzLgoKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZmQvbWF4Nzc2 ODYuYyBiL2RyaXZlcnMvbWZkL21heDc3Njg2LmMKPiBpbmRleCBkMWY5ZDA0Li4xMmQ0YzE3IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvbWZkL21heDc3Njg2LmMKPiArKysgYi9kcml2ZXJzL21mZC9t YXg3NzY4Ni5jCj4gQEAgLTEyNCw3ICsxMjQsNyBAQCBzdGF0aWMgaW50IG1heDc3Njg2X2kyY19w cm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqaTJjLAo+ICAJdW5zaWduZWQgaW50IGRhdGE7Cj4gIAlp bnQgcmV0ID0gMDsKPiAgCj4gLQlpZiAoSVNfRU5BQkxFRChDT05GSUdfT0YpICYmIGkyYy0+ZGV2 Lm9mX25vZGUpCj4gKwlpZiAoSVNfRU5BQkxFRChDT05GSUdfT0YpICYmIGkyYy0+ZGV2Lm9mX25v ZGUgJiYgIXBkYXRhKQo+ICAJCXBkYXRhID0gbWF4Nzc2ODZfaTJjX3BhcnNlX2R0X3BkYXRhKCZp MmMtPmRldik7Cj4gIAo+ICAJaWYgKCFwZGF0YSkgewoKLS0gCkxlZSBKb25lcwpMaW5hcm8gU1RN aWNyb2VsZWN0cm9uaWNzIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFyby5vcmcg4pSCIE9wZW4gc291 cmNlIHNvZnR3YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJvOiBGYWNlYm9vayB8IFR3aXR0 ZXIgfCBCbG9nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmlu ZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9s aW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Fri, 18 Jul 2014 09:17:59 +0100 Subject: [PATCH v7 04/24] mfd: max77686: Make platform data over-rule DT In-Reply-To: <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> Message-ID: <20140718081759.GN30888@lee--X1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > The function max77802_i2c_parse_dt_pdata() should only be called > if there isn't already platform data for the device. > > Signed-off-by: Javier Martinez Canillas > --- > drivers/mfd/max77686.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied now, thanks. > diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c > index d1f9d04..12d4c17 100644 > --- a/drivers/mfd/max77686.c > +++ b/drivers/mfd/max77686.c > @@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > unsigned int data; > int ret = 0; > > - if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) > + if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node && !pdata) > pdata = max77686_i2c_parse_dt_pdata(&i2c->dev); > > if (!pdata) { -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760723AbaGRIUf (ORCPT ); Fri, 18 Jul 2014 04:20:35 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:47939 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760692AbaGRISG (ORCPT ); Fri, 18 Jul 2014 04:18:06 -0400 Date: Fri, 18 Jul 2014 09:17:59 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: Mark Brown , Mike Turquette , Liam Girdwood , Alessandro Zummo , Kukjin Kim , Doug Anderson , Olof Johansson , Tomeu Vizoso , Krzysztof Kozlowski , Yadwinder Singh Brar , Tushar Behera , Andreas Farber , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 04/24] mfd: max77686: Make platform data over-rule DT Message-ID: <20140718081759.GN30888@lee--X1> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> 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 Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > The function max77802_i2c_parse_dt_pdata() should only be called > if there isn't already platform data for the device. > > Signed-off-by: Javier Martinez Canillas > --- > drivers/mfd/max77686.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied now, thanks. > diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c > index d1f9d04..12d4c17 100644 > --- a/drivers/mfd/max77686.c > +++ b/drivers/mfd/max77686.c > @@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > unsigned int data; > int ret = 0; > > - if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) > + if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node && !pdata) > pdata = max77686_i2c_parse_dt_pdata(&i2c->dev); > > if (!pdata) { -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog