RE: [PATCH v2 2/4] rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi Geert,

Thanks for the feedback.

Subject: Re: [PATCH v2 2/4] rtc: pcf85363: Add support for NXP pcf85263 rtc

Hi Biju,

On Thu, Nov 29, 2018 at 6:03 PM Biju Das [off-list ref] wrote:

quoted

Add support for NXP pcf85263 real-time clock. pcf85263 rtc is
compatible with pcf85363,except that pcf85363 has additional 64 bytes of

RAM.

quoted

1 byte of nvmem is supported and exposed in sysfs (# is the instance
number,starting with 0): /sys/bus/nvmem/devices/pcf85x63-#/nvmem

Signed-off-by: Biju Das <redacted>
---
 V1-->V2 Incorporated Alexandre and Geert's review comment.

Thanks for the update!

quoted

--- a/drivers/rtc/rtc-pcf85363.c
+++ b/drivers/rtc/rtc-pcf85363.c

quoted

@@ -321,15 +344,25 @@ static int pcf85363_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)  {
        struct pcf85363 *pcf85363;
-       struct nvmem_config nvmem_cfg = {
-               .name = "pcf85363-",
-               .word_size = 1,
-               .stride = 1,
-               .size = NVRAM_SIZE,
-               .reg_read = pcf85363_nvram_read,
-               .reg_write = pcf85363_nvram_write,
+       const struct regmap_config *regmap_config =

&pcf_85363_regmap_config;

quoted

+       struct nvmem_config nvmem_cfg[] = {

static?

Although the nvmem_config is copied, and thus static is not needed, I guess
using static will decrease kernel size.

quoted

+               {
+                       .name = "pcf85x63-",
+                       .word_size = 1,
+                       .stride = 1,
+                       .size = 1,
+                       .reg_read = pcf85x63_nvram_read,
+                       .reg_write = pcf85x63_nvram_write,
+               }, {
+                       .name = "pcf85363-",
+                       .word_size = 1,
+                       .stride = 1,
+                       .size = NVRAM_SIZE,
+                       .reg_read = pcf85363_nvram_read,
+                       .reg_write = pcf85363_nvram_write,
+               },
        };
-       int ret;
+       int ret, i, num_nvmem = 2;

        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
                return -ENODEV;

@@ -339,7 +372,13 @@ static int pcf85363_probe(struct i2c_client *client,
        if (!pcf85363)
                return -ENOMEM;

-       pcf85363->regmap = devm_regmap_init_i2c(client, &regmap_config);
+       if (of_device_get_match_data(&client->dev) ==
+                                       &pcf_85263_regmap_config) {
+               regmap_config = &pcf_85263_regmap_config;
+               num_nvmem = 1;

I think it's cleaner if you store the full config (regmap_config + num_nvmem)
in of_device_id.data, instead of just the regmap_config, using

    struct pcf85x63_config {
            struct regmap_config regmap;
            unsigned int num_nvram;
    };

    static const struct pcf85x63_config pcf85263_config = { ... };
    static const struct pcf85x63_config pcf85363_config = { ... };

    static const struct of_device_id dev_ids[] = {
            { .compatible = "nxp,pcf85263", .data = &pcf_85263_config },
            { .compatible = "nxp,pcf85363", .data = &pcf_85363_config },
            { /* sentinel */ }
    };

Then you can just do

        struct pcf85x63_config *config = &pcf85363_config; /* default for non-DT
*/
        void *data = of_device_get_match_data(&client->dev);
        if (data)
                config = data;

quoted

+       }

Will send V3 with above changes.

Regards,
Biju


[https://www2.renesas.eu/media/email/unicef.jpg]

This Christmas, instead of sending out cards, Renesas Electronics Europe have decided to support Unicef with a donation. For further details click here<https://www.unicef.org/> to find out about the valuable work they do, helping children all over the world.
We would like to take this opportunity to wish you a Merry Christmas and a prosperous New Year.



Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.