From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Thu, 25 Jun 2015 11:19:16 +0100 Subject: [PATCH-v4 1/3] mfd: 88pm800: Add device tree support In-Reply-To: <1435217189-19578-2-git-send-email-vaibhav.hiremath@linaro.org> References: <1435217189-19578-1-git-send-email-vaibhav.hiremath@linaro.org> <1435217189-19578-2-git-send-email-vaibhav.hiremath@linaro.org> Message-ID: <20150625101916.GB15013@x1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, 25 Jun 2015, Vaibhav Hiremath wrote: > Add DT support to the 88pm800 driver, along with compatible > field for it's sub-devices (rtc, onkey and regulator) > > Signed-off-by: Chao Xie > Signed-off-by: Vaibhav Hiremath > --- > drivers/mfd/88pm800.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c > index 841717a..40fd014 100644 > --- a/drivers/mfd/88pm800.c > +++ b/drivers/mfd/88pm800.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > > /* Interrupt Registers */ > #define PM800_INT_STATUS1 (0x05) > @@ -121,6 +122,11 @@ static const struct i2c_device_id pm80x_id_table[] = { > }; > MODULE_DEVICE_TABLE(i2c, pm80x_id_table); > > +static const struct of_device_id pm80x_of_match_table[] = { > + { .compatible = "marvell,88pm800", }, > + {}, > +}; > + > static struct resource rtc_resources[] = { > { > .name = "88pm80x-rtc", > @@ -133,6 +139,7 @@ static struct resource rtc_resources[] = { > static struct mfd_cell rtc_devs[] = { > { > .name = "88pm80x-rtc", > + .of_compatible = "marvell,88pm80x-rtc", > .num_resources = ARRAY_SIZE(rtc_resources), > .resources = &rtc_resources[0], > .id = -1, > @@ -151,6 +158,7 @@ static struct resource onkey_resources[] = { > static const struct mfd_cell onkey_devs[] = { > { > .name = "88pm80x-onkey", > + .of_compatible = "marvell,88pm80x-onkey", > .num_resources = 1, > .resources = &onkey_resources[0], > .id = -1, > @@ -160,6 +168,7 @@ static const struct mfd_cell onkey_devs[] = { > static const struct mfd_cell regulator_devs[] = { > { > .name = "88pm80x-regulator", > + .of_compatible = "marvell,88pm80x-regulator", > .id = -1, > }, > }; > @@ -544,8 +553,21 @@ static int pm800_probe(struct i2c_client *client, > int ret = 0; > struct pm80x_chip *chip; > struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev); > + struct device_node *np = client->dev.of_node; > struct pm80x_subchip *subchip; > > + if (!pdata && !np) { > + dev_err(&client->dev, > + "pm80x requires platform data or of_node\n"); > + return -EINVAL; > + } > + > + if (!pdata) { > + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); > + if (!pdata) > + return -ENOMEM; > + } Why have you allocated data for pdata, then done nothing with it? > ret = pm80x_init(client); > if (ret) { > dev_err(&client->dev, "pm800_init fail\n"); > @@ -611,6 +633,7 @@ static struct i2c_driver pm800_driver = { > .name = "88PM800", > .owner = THIS_MODULE, > .pm = &pm80x_pm_ops, > + .of_match_table = pm80x_of_match_table, > }, > .probe = pm800_probe, > .remove = pm800_remove, -- 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 From: Lee Jones Subject: Re: [PATCH-v4 1/3] mfd: 88pm800: Add device tree support Date: Thu, 25 Jun 2015 11:19:16 +0100 Message-ID: <20150625101916.GB15013@x1> References: <1435217189-19578-1-git-send-email-vaibhav.hiremath@linaro.org> <1435217189-19578-2-git-send-email-vaibhav.hiremath@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: <1435217189-19578-2-git-send-email-vaibhav.hiremath@linaro.org> 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: Vaibhav Hiremath Cc: devicetree@vger.kernel.org, yizhang@marvell.com, linux-kernel@vger.kernel.org, Chao Xie , robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org T24gVGh1LCAyNSBKdW4gMjAxNSwgVmFpYmhhdiBIaXJlbWF0aCB3cm90ZToKCj4gQWRkIERUIHN1 cHBvcnQgdG8gdGhlIDg4cG04MDAgZHJpdmVyLCBhbG9uZyB3aXRoIGNvbXBhdGlibGUKPiBmaWVs ZCBmb3IgaXQncyBzdWItZGV2aWNlcyAocnRjLCBvbmtleSBhbmQgcmVndWxhdG9yKQo+IAo+IFNp Z25lZC1vZmYtYnk6IENoYW8gWGllIDxjaGFvLnhpZUBtYXJ2ZWxsLmNvbT4KPiBTaWduZWQtb2Zm LWJ5OiBWYWliaGF2IEhpcmVtYXRoIDx2YWliaGF2LmhpcmVtYXRoQGxpbmFyby5vcmc+Cj4gLS0t Cj4gIGRyaXZlcnMvbWZkLzg4cG04MDAuYyB8IDIzICsrKysrKysrKysrKysrKysrKysrKysrCj4g IDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvbWZkLzg4cG04MDAuYyBiL2RyaXZlcnMvbWZkLzg4cG04MDAuYwo+IGluZGV4IDg0MTcxN2Eu LjQwZmQwMTQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9tZmQvODhwbTgwMC5jCj4gKysrIGIvZHJp dmVycy9tZmQvODhwbTgwMC5jCj4gQEAgLTI3LDYgKzI3LDcgQEAKPiAgI2luY2x1ZGUgPGxpbnV4 L21mZC9jb3JlLmg+Cj4gICNpbmNsdWRlIDxsaW51eC9tZmQvODhwbTgweC5oPgo+ICAjaW5jbHVk ZSA8bGludXgvc2xhYi5oPgo+ICsjaW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+Cj4gIAo+ICAv KiBJbnRlcnJ1cHQgUmVnaXN0ZXJzICovCj4gICNkZWZpbmUgUE04MDBfSU5UX1NUQVRVUzEJCSgw eDA1KQo+IEBAIC0xMjEsNiArMTIyLDExIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaTJjX2Rldmlj ZV9pZCBwbTgweF9pZF90YWJsZVtdID0gewo+ICB9Owo+ICBNT0RVTEVfREVWSUNFX1RBQkxFKGky YywgcG04MHhfaWRfdGFibGUpOwo+ICAKPiArc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZpY2Vf aWQgcG04MHhfb2ZfbWF0Y2hfdGFibGVbXSA9IHsKPiArCXsgLmNvbXBhdGlibGUgPSAibWFydmVs bCw4OHBtODAwIiwgfSwKPiArCXt9LAo+ICt9Owo+ICsKPiAgc3RhdGljIHN0cnVjdCByZXNvdXJj ZSBydGNfcmVzb3VyY2VzW10gPSB7Cj4gIAl7Cj4gIAkgLm5hbWUgPSAiODhwbTgweC1ydGMiLAo+ IEBAIC0xMzMsNiArMTM5LDcgQEAgc3RhdGljIHN0cnVjdCByZXNvdXJjZSBydGNfcmVzb3VyY2Vz W10gPSB7Cj4gIHN0YXRpYyBzdHJ1Y3QgbWZkX2NlbGwgcnRjX2RldnNbXSA9IHsKPiAgCXsKPiAg CSAubmFtZSA9ICI4OHBtODB4LXJ0YyIsCj4gKwkgLm9mX2NvbXBhdGlibGUgPSAibWFydmVsbCw4 OHBtODB4LXJ0YyIsCj4gIAkgLm51bV9yZXNvdXJjZXMgPSBBUlJBWV9TSVpFKHJ0Y19yZXNvdXJj ZXMpLAo+ICAJIC5yZXNvdXJjZXMgPSAmcnRjX3Jlc291cmNlc1swXSwKPiAgCSAuaWQgPSAtMSwK PiBAQCAtMTUxLDYgKzE1OCw3IEBAIHN0YXRpYyBzdHJ1Y3QgcmVzb3VyY2Ugb25rZXlfcmVzb3Vy Y2VzW10gPSB7Cj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbWZkX2NlbGwgb25rZXlfZGV2c1tdID0g ewo+ICAJewo+ICAJIC5uYW1lID0gIjg4cG04MHgtb25rZXkiLAo+ICsJIC5vZl9jb21wYXRpYmxl ID0gIm1hcnZlbGwsODhwbTgweC1vbmtleSIsCj4gIAkgLm51bV9yZXNvdXJjZXMgPSAxLAo+ICAJ IC5yZXNvdXJjZXMgPSAmb25rZXlfcmVzb3VyY2VzWzBdLAo+ICAJIC5pZCA9IC0xLAo+IEBAIC0x NjAsNiArMTY4LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBtZmRfY2VsbCBvbmtleV9kZXZzW10g PSB7Cj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbWZkX2NlbGwgcmVndWxhdG9yX2RldnNbXSA9IHsK PiAgCXsKPiAgCSAubmFtZSA9ICI4OHBtODB4LXJlZ3VsYXRvciIsCj4gKwkgLm9mX2NvbXBhdGli bGUgPSAibWFydmVsbCw4OHBtODB4LXJlZ3VsYXRvciIsCj4gIAkgLmlkID0gLTEsCj4gIAl9LAo+ ICB9Owo+IEBAIC01NDQsOCArNTUzLDIxIEBAIHN0YXRpYyBpbnQgcG04MDBfcHJvYmUoc3RydWN0 IGkyY19jbGllbnQgKmNsaWVudCwKPiAgCWludCByZXQgPSAwOwo+ICAJc3RydWN0IHBtODB4X2No aXAgKmNoaXA7Cj4gIAlzdHJ1Y3QgcG04MHhfcGxhdGZvcm1fZGF0YSAqcGRhdGEgPSBkZXZfZ2V0 X3BsYXRkYXRhKCZjbGllbnQtPmRldik7Cj4gKwlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gY2xp ZW50LT5kZXYub2Zfbm9kZTsKPiAgCXN0cnVjdCBwbTgweF9zdWJjaGlwICpzdWJjaGlwOwo+ICAK PiArCWlmICghcGRhdGEgJiYgIW5wKSB7Cj4gKwkJZGV2X2VycigmY2xpZW50LT5kZXYsCj4gKwkJ CSJwbTgweCByZXF1aXJlcyBwbGF0Zm9ybSBkYXRhIG9yIG9mX25vZGVcbiIpOwo+ICsJCXJldHVy biAtRUlOVkFMOwo+ICsJfQo+ICsKPiArCWlmICghcGRhdGEpIHsKPiArCQlwZGF0YSA9IGRldm1f a3phbGxvYygmY2xpZW50LT5kZXYsIHNpemVvZigqcGRhdGEpLCBHRlBfS0VSTkVMKTsKPiArCQlp ZiAoIXBkYXRhKQo+ICsJCQlyZXR1cm4gLUVOT01FTTsKPiArCX0KCldoeSBoYXZlIHlvdSBhbGxv Y2F0ZWQgZGF0YSBmb3IgcGRhdGEsIHRoZW4gZG9uZSBub3RoaW5nIHdpdGggaXQ/Cgo+ICAJcmV0 ID0gcG04MHhfaW5pdChjbGllbnQpOwo+ICAJaWYgKHJldCkgewo+ICAJCWRldl9lcnIoJmNsaWVu dC0+ZGV2LCAicG04MDBfaW5pdCBmYWlsXG4iKTsKPiBAQCAtNjExLDYgKzYzMyw3IEBAIHN0YXRp YyBzdHJ1Y3QgaTJjX2RyaXZlciBwbTgwMF9kcml2ZXIgPSB7Cj4gIAkJLm5hbWUgPSAiODhQTTgw MCIsCj4gIAkJLm93bmVyID0gVEhJU19NT0RVTEUsCj4gIAkJLnBtID0gJnBtODB4X3BtX29wcywK PiArCQkub2ZfbWF0Y2hfdGFibGUJPSBwbTgweF9vZl9tYXRjaF90YWJsZSwKPiAgCQl9LAo+ICAJ LnByb2JlID0gcG04MDBfcHJvYmUsCj4gIAkucmVtb3ZlID0gcG04MDBfcmVtb3ZlLAoKLS0gCkxl ZSBKb25lcwpMaW5hcm8gU1RNaWNyb2VsZWN0cm9uaWNzIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFy by5vcmcg4pSCIE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJv OiBGYWNlYm9vayB8IFR3aXR0ZXIgfCBCbG9nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1h cm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcv bWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932380AbbFYKVn (ORCPT ); Thu, 25 Jun 2015 06:21:43 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:36754 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752899AbbFYKTW (ORCPT ); Thu, 25 Jun 2015 06:19:22 -0400 Date: Thu, 25 Jun 2015 11:19:16 +0100 From: Lee Jones To: Vaibhav Hiremath Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, yizhang@marvell.com, Chao Xie Subject: Re: [PATCH-v4 1/3] mfd: 88pm800: Add device tree support Message-ID: <20150625101916.GB15013@x1> References: <1435217189-19578-1-git-send-email-vaibhav.hiremath@linaro.org> <1435217189-19578-2-git-send-email-vaibhav.hiremath@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1435217189-19578-2-git-send-email-vaibhav.hiremath@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, 25 Jun 2015, Vaibhav Hiremath wrote: > Add DT support to the 88pm800 driver, along with compatible > field for it's sub-devices (rtc, onkey and regulator) > > Signed-off-by: Chao Xie > Signed-off-by: Vaibhav Hiremath > --- > drivers/mfd/88pm800.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c > index 841717a..40fd014 100644 > --- a/drivers/mfd/88pm800.c > +++ b/drivers/mfd/88pm800.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > > /* Interrupt Registers */ > #define PM800_INT_STATUS1 (0x05) > @@ -121,6 +122,11 @@ static const struct i2c_device_id pm80x_id_table[] = { > }; > MODULE_DEVICE_TABLE(i2c, pm80x_id_table); > > +static const struct of_device_id pm80x_of_match_table[] = { > + { .compatible = "marvell,88pm800", }, > + {}, > +}; > + > static struct resource rtc_resources[] = { > { > .name = "88pm80x-rtc", > @@ -133,6 +139,7 @@ static struct resource rtc_resources[] = { > static struct mfd_cell rtc_devs[] = { > { > .name = "88pm80x-rtc", > + .of_compatible = "marvell,88pm80x-rtc", > .num_resources = ARRAY_SIZE(rtc_resources), > .resources = &rtc_resources[0], > .id = -1, > @@ -151,6 +158,7 @@ static struct resource onkey_resources[] = { > static const struct mfd_cell onkey_devs[] = { > { > .name = "88pm80x-onkey", > + .of_compatible = "marvell,88pm80x-onkey", > .num_resources = 1, > .resources = &onkey_resources[0], > .id = -1, > @@ -160,6 +168,7 @@ static const struct mfd_cell onkey_devs[] = { > static const struct mfd_cell regulator_devs[] = { > { > .name = "88pm80x-regulator", > + .of_compatible = "marvell,88pm80x-regulator", > .id = -1, > }, > }; > @@ -544,8 +553,21 @@ static int pm800_probe(struct i2c_client *client, > int ret = 0; > struct pm80x_chip *chip; > struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev); > + struct device_node *np = client->dev.of_node; > struct pm80x_subchip *subchip; > > + if (!pdata && !np) { > + dev_err(&client->dev, > + "pm80x requires platform data or of_node\n"); > + return -EINVAL; > + } > + > + if (!pdata) { > + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); > + if (!pdata) > + return -ENOMEM; > + } Why have you allocated data for pdata, then done nothing with it? > ret = pm80x_init(client); > if (ret) { > dev_err(&client->dev, "pm800_init fail\n"); > @@ -611,6 +633,7 @@ static struct i2c_driver pm800_driver = { > .name = "88PM800", > .owner = THIS_MODULE, > .pm = &pm80x_pm_ops, > + .of_match_table = pm80x_of_match_table, > }, > .probe = pm800_probe, > .remove = pm800_remove, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog