| Message ID | 20180226101718.5353-1-marek.vasut+renesas@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Marek, On Mon, Feb 26, 2018 at 11:17 AM, Marek Vasut <marek.vasut@gmail.com> wrote: > Rather than hard-coding the quirk topology, which stopped scaling, > parse the information from DT. The code looks for all compatible > PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied > to the same pin. If so, the code sends a matching sequence to the > PMIC to deassert the IRQ. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Thanks for your patch! At first sight, the probing part looks good to me. I'll have a closer look, and will give it a try later. A few early comment below. > --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > @@ -88,17 +103,21 @@ static int regulator_quirk_notify(struct notifier_block *nb, > client = to_i2c_client(dev); > dev_dbg(dev, "Detected %s\n", client->name); > > - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || > - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || > - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { > - int ret, len; > + list_for_each_entry(pos, &quirk_list, list) { > + if (pos->i2c_msg.addr != client->addr) > + continue; > > - /* There are two DA9210 on Stout, one on the other boards. */ > - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; > + if (!of_device_is_compatible(dev->of_node, pos->id->compatible)) > + continue; > > - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); > - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); > - if (ret != ARRAY_SIZE(da9xxx_msgs)) > + if (!pos->shared) > + continue; > + > + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", > + pos->id->compatible, pos->i2c_msg.addr); > + > + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); > + if (ret != 1) > dev_err(&client->dev, "i2c error %d\n", ret); > } The loop above sents a clear message to a single device only, right? That won't work, as that will clear the interrupt for that single device only. All other devices may still have their interrupts asserted. Next step in probing will be binding the da9210 or da9063 driver, which will enable the shared irq, and boom! Upon detecting the first affected device, you really have to send clear messages to all devices in the list for which shared == true. > @@ -122,7 +146,14 @@ static struct notifier_block regulator_quirk_nb = { > > static int __init rcar_gen2_regulator_quirk(void) > { > - u32 mon; > + struct device_node *np; > + const struct of_device_id *id; > + struct regulator_quirk *quirk; > + struct regulator_quirk *pos; > + struct of_phandle_args *argsa, *argsb; > + u32 mon, addr, i; > + bool match; > + int ret; > > if (!of_machine_is_compatible("renesas,koelsch") && > !of_machine_is_compatible("renesas,lager") && > @@ -130,6 +161,51 @@ static int __init rcar_gen2_regulator_quirk(void) > !of_machine_is_compatible("renesas,gose")) > return -ENODEV; We might drop the checks above, to handle other platforms based on the Renesas reference designs. > > + for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) { > + if(!np || !of_device_is_available(np)) > + break; > + > + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); > + > + argsa = &quirk->irq_args; > + memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); > + > + ret = of_property_read_u32(np, "reg", &addr); > + if (ret) > + return ret; > + > + quirk->id = id; > + quirk->i2c_msg.addr = addr; > + quirk->shared = false; > + > + ret = of_irq_parse_one(np, 0, &quirk->irq_args); > + if (ret) > + return ret; > + > + list_for_each_entry(pos, &quirk_list, list) { > + argsa = &quirk->irq_args; > + argsb = &pos->irq_args; > + > + if (argsa->args_count != argsb->args_count) > + continue; > + > + match = true; > + for (i = 0; i < argsa->args_count; i++) { > + if (argsa->args[i] != argsb->args[i]) { > + match = false; > + break; > + } > + } > + > + if (match) { The loop and check above can be replaced by if (!memcmp(argsa->args, argsb->args, argsa->args_count * sizeof(argsa->args[0])) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Marek, please include linux-renesas-soc@vger.kernel.org on the CC list.
Hi Marek, On Mon, Feb 26, 2018 at 11:17 AM, Marek Vasut <marek.vasut@gmail.com> wrote: > Rather than hard-coding the quirk topology, which stopped scaling, > parse the information from DT. The code looks for all compatible > PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied > to the same pin. If so, the code sends a matching sequence to the > PMIC to deassert the IRQ. Note that not all R-Car Gen2 boards have all regulators described in DT yet. E.g. gose lacks da9210. So that has to be fixed first. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 02/28/2018 09:43 AM, Geert Uytterhoeven wrote: > Hi Marek, > > On Mon, Feb 26, 2018 at 11:17 AM, Marek Vasut <marek.vasut@gmail.com> wrote: >> Rather than hard-coding the quirk topology, which stopped scaling, >> parse the information from DT. The code looks for all compatible >> PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied >> to the same pin. If so, the code sends a matching sequence to the >> PMIC to deassert the IRQ. > > Note that not all R-Car Gen2 boards have all regulators described in DT yet. > E.g. gose lacks da9210. So that has to be fixed first. Argh, yes.
On 02/26/2018 11:39 AM, Geert Uytterhoeven wrote: > Hi Marek, Hi, > On Mon, Feb 26, 2018 at 11:17 AM, Marek Vasut <marek.vasut@gmail.com> wrote: >> Rather than hard-coding the quirk topology, which stopped scaling, >> parse the information from DT. The code looks for all compatible >> PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied >> to the same pin. If so, the code sends a matching sequence to the >> PMIC to deassert the IRQ. >> >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > > Thanks for your patch! > > At first sight, the probing part looks good to me. I'll have a closer look, > and will give it a try later. > > A few early comment below. > >> --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c >> +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > >> @@ -88,17 +103,21 @@ static int regulator_quirk_notify(struct notifier_block *nb, >> client = to_i2c_client(dev); >> dev_dbg(dev, "Detected %s\n", client->name); >> >> - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || >> - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || >> - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { >> - int ret, len; >> + list_for_each_entry(pos, &quirk_list, list) { >> + if (pos->i2c_msg.addr != client->addr) >> + continue; >> >> - /* There are two DA9210 on Stout, one on the other boards. */ >> - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; >> + if (!of_device_is_compatible(dev->of_node, pos->id->compatible)) >> + continue; >> >> - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); >> - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); >> - if (ret != ARRAY_SIZE(da9xxx_msgs)) >> + if (!pos->shared) >> + continue; >> + >> + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", >> + pos->id->compatible, pos->i2c_msg.addr); >> + >> + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); >> + if (ret != 1) >> dev_err(&client->dev, "i2c error %d\n", ret); >> } > > The loop above sents a clear message to a single device only, right? > That won't work, as that will clear the interrupt for that single device only. > All other devices may still have their interrupts asserted. > Next step in probing will be binding the da9210 or da9063 driver, which will > enable the shared irq, and boom! > > Upon detecting the first affected device, you really have to send clear > messages to all devices in the list for which shared == true. This is even worse, the single-device part can be easily fixed. But what if the devices are on different i2c bus ? Do we care about that case or do we assume they are on the same bus (they are in the configurations we know of). >> @@ -122,7 +146,14 @@ static struct notifier_block regulator_quirk_nb = { >> >> static int __init rcar_gen2_regulator_quirk(void) >> { >> - u32 mon; >> + struct device_node *np; >> + const struct of_device_id *id; >> + struct regulator_quirk *quirk; >> + struct regulator_quirk *pos; >> + struct of_phandle_args *argsa, *argsb; >> + u32 mon, addr, i; >> + bool match; >> + int ret; >> >> if (!of_machine_is_compatible("renesas,koelsch") && >> !of_machine_is_compatible("renesas,lager") && > >> @@ -130,6 +161,51 @@ static int __init rcar_gen2_regulator_quirk(void) >> !of_machine_is_compatible("renesas,gose")) >> return -ENODEV; > > We might drop the checks above, to handle other platforms based on the > Renesas reference designs. Are you sure that's a good idea ? >> >> + for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) { >> + if(!np || !of_device_is_available(np)) >> + break; >> + >> + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); >> + >> + argsa = &quirk->irq_args; >> + memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); >> + >> + ret = of_property_read_u32(np, "reg", &addr); >> + if (ret) >> + return ret; >> + >> + quirk->id = id; >> + quirk->i2c_msg.addr = addr; >> + quirk->shared = false; >> + >> + ret = of_irq_parse_one(np, 0, &quirk->irq_args); >> + if (ret) >> + return ret; >> + >> + list_for_each_entry(pos, &quirk_list, list) { >> + argsa = &quirk->irq_args; >> + argsb = &pos->irq_args; >> + >> + if (argsa->args_count != argsb->args_count) >> + continue; >> + >> + match = true; >> + for (i = 0; i < argsa->args_count; i++) { >> + if (argsa->args[i] != argsb->args[i]) { >> + match = false; >> + break; >> + } >> + } >> + >> + if (match) { > > The loop and check above can be replaced by > > if (!memcmp(argsa->args, argsb->args, argsa->args_count * > sizeof(argsa->args[0])) Fixed
Hi Marek, On Fri, May 25, 2018 at 2:30 AM, Marek Vasut <marek.vasut@gmail.com> wrote: > On 02/26/2018 11:39 AM, Geert Uytterhoeven wrote: >> On Mon, Feb 26, 2018 at 11:17 AM, Marek Vasut <marek.vasut@gmail.com> wrote: >>> Rather than hard-coding the quirk topology, which stopped scaling, >>> parse the information from DT. The code looks for all compatible >>> PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied >>> to the same pin. If so, the code sends a matching sequence to the >>> PMIC to deassert the IRQ. >>> >>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >> >> Thanks for your patch! >> >> At first sight, the probing part looks good to me. I'll have a closer look, >> and will give it a try later. >> >> A few early comment below. >> >>> --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c >>> +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c >> >>> @@ -88,17 +103,21 @@ static int regulator_quirk_notify(struct notifier_block *nb, >>> client = to_i2c_client(dev); >>> dev_dbg(dev, "Detected %s\n", client->name); >>> >>> - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || >>> - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || >>> - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { >>> - int ret, len; >>> + list_for_each_entry(pos, &quirk_list, list) { >>> + if (pos->i2c_msg.addr != client->addr) >>> + continue; >>> >>> - /* There are two DA9210 on Stout, one on the other boards. */ >>> - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; >>> + if (!of_device_is_compatible(dev->of_node, pos->id->compatible)) >>> + continue; >>> >>> - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); >>> - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); >>> - if (ret != ARRAY_SIZE(da9xxx_msgs)) >>> + if (!pos->shared) >>> + continue; >>> + >>> + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", >>> + pos->id->compatible, pos->i2c_msg.addr); >>> + >>> + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); >>> + if (ret != 1) >>> dev_err(&client->dev, "i2c error %d\n", ret); >>> } >> >> The loop above sents a clear message to a single device only, right? >> That won't work, as that will clear the interrupt for that single device only. >> All other devices may still have their interrupts asserted. >> Next step in probing will be binding the da9210 or da9063 driver, which will >> enable the shared irq, and boom! >> >> Upon detecting the first affected device, you really have to send clear >> messages to all devices in the list for which shared == true. > > This is even worse, the single-device part can be easily fixed. But what > if the devices are on different i2c bus ? Do we care about that case or > do we assume they are on the same bus (they are in the configurations we > know of). Until we have to support boards where the offenders are on different buses, we can limit it to the same bus. >>> @@ -122,7 +146,14 @@ static struct notifier_block regulator_quirk_nb = { >>> >>> static int __init rcar_gen2_regulator_quirk(void) >>> { >>> - u32 mon; >>> + struct device_node *np; >>> + const struct of_device_id *id; >>> + struct regulator_quirk *quirk; >>> + struct regulator_quirk *pos; >>> + struct of_phandle_args *argsa, *argsb; >>> + u32 mon, addr, i; >>> + bool match; >>> + int ret; >>> >>> if (!of_machine_is_compatible("renesas,koelsch") && >>> !of_machine_is_compatible("renesas,lager") && >> >>> @@ -130,6 +161,51 @@ static int __init rcar_gen2_regulator_quirk(void) >>> !of_machine_is_compatible("renesas,gose")) >>> return -ENODEV; >> >> We might drop the checks above, to handle other platforms based on the >> Renesas reference designs. > > Are you sure that's a good idea ? Why not? Would it hurt? Gr{oetje,eeting}s, Geert
On 05/25/2018 09:40 AM, Geert Uytterhoeven wrote: > Hi Marek, Hi, > On Fri, May 25, 2018 at 2:30 AM, Marek Vasut <marek.vasut@gmail.com> wrote: >> On 02/26/2018 11:39 AM, Geert Uytterhoeven wrote: >>> On Mon, Feb 26, 2018 at 11:17 AM, Marek Vasut <marek.vasut@gmail.com> wrote: >>>> Rather than hard-coding the quirk topology, which stopped scaling, >>>> parse the information from DT. The code looks for all compatible >>>> PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied >>>> to the same pin. If so, the code sends a matching sequence to the >>>> PMIC to deassert the IRQ. >>>> >>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >>> >>> Thanks for your patch! >>> >>> At first sight, the probing part looks good to me. I'll have a closer look, >>> and will give it a try later. >>> >>> A few early comment below. >>> >>>> --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c >>>> +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c >>> >>>> @@ -88,17 +103,21 @@ static int regulator_quirk_notify(struct notifier_block *nb, >>>> client = to_i2c_client(dev); >>>> dev_dbg(dev, "Detected %s\n", client->name); >>>> >>>> - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || >>>> - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || >>>> - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { >>>> - int ret, len; >>>> + list_for_each_entry(pos, &quirk_list, list) { >>>> + if (pos->i2c_msg.addr != client->addr) >>>> + continue; >>>> >>>> - /* There are two DA9210 on Stout, one on the other boards. */ >>>> - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; >>>> + if (!of_device_is_compatible(dev->of_node, pos->id->compatible)) >>>> + continue; >>>> >>>> - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); >>>> - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); >>>> - if (ret != ARRAY_SIZE(da9xxx_msgs)) >>>> + if (!pos->shared) >>>> + continue; >>>> + >>>> + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", >>>> + pos->id->compatible, pos->i2c_msg.addr); >>>> + >>>> + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); >>>> + if (ret != 1) >>>> dev_err(&client->dev, "i2c error %d\n", ret); >>>> } >>> >>> The loop above sents a clear message to a single device only, right? >>> That won't work, as that will clear the interrupt for that single device only. >>> All other devices may still have their interrupts asserted. >>> Next step in probing will be binding the da9210 or da9063 driver, which will >>> enable the shared irq, and boom! >>> >>> Upon detecting the first affected device, you really have to send clear >>> messages to all devices in the list for which shared == true. >> >> This is even worse, the single-device part can be easily fixed. But what >> if the devices are on different i2c bus ? Do we care about that case or >> do we assume they are on the same bus (they are in the configurations we >> know of). > > Until we have to support boards where the offenders are on different buses, > we can limit it to the same bus. Let's add comment about that. >>>> @@ -122,7 +146,14 @@ static struct notifier_block regulator_quirk_nb = { >>>> >>>> static int __init rcar_gen2_regulator_quirk(void) >>>> { >>>> - u32 mon; >>>> + struct device_node *np; >>>> + const struct of_device_id *id; >>>> + struct regulator_quirk *quirk; >>>> + struct regulator_quirk *pos; >>>> + struct of_phandle_args *argsa, *argsb; >>>> + u32 mon, addr, i; >>>> + bool match; >>>> + int ret; >>>> >>>> if (!of_machine_is_compatible("renesas,koelsch") && >>>> !of_machine_is_compatible("renesas,lager") && >>> >>>> @@ -130,6 +161,51 @@ static int __init rcar_gen2_regulator_quirk(void) >>>> !of_machine_is_compatible("renesas,gose")) >>>> return -ENODEV; >>> >>> We might drop the checks above, to handle other platforms based on the >>> Renesas reference designs. >> >> Are you sure that's a good idea ? > > Why not? Would it hurt? If someone were to design a board which has DA9xxx PMICs on different I2C busses, sharing the same IRQ line, this quirk won't work. I think I'd like to have better control over when/where this quirk is applied.
diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c index 27fb3a5ec73e..85e98cb0655a 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -31,8 +31,10 @@ #include <linux/i2c.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/list.h> #include <linux/notifier.h> #include <linux/of.h> +#include <linux/of_irq.h> #include <linux/mfd/da9063/registers.h> @@ -44,34 +46,47 @@ /* start of DA9210 System Control and Event Registers */ #define DA9210_REG_MASK_A 0x54 +struct regulator_quirk { + struct list_head list; + const struct of_device_id *id; + struct of_phandle_args irq_args; + struct i2c_msg i2c_msg; + bool shared; /* IRQ line is shared */ +}; + +static LIST_HEAD(quirk_list); static void __iomem *irqc; /* first byte sets the memory pointer, following are consecutive reg values */ static u8 da9063_irq_clr[] = { DA9063_REG_IRQ_MASK_A, 0xff, 0xff, 0xff, 0xff }; static u8 da9210_irq_clr[] = { DA9210_REG_MASK_A, 0xff, 0xff }; -static struct i2c_msg da9xxx_msgs[3] = { - { - .addr = 0x58, - .len = ARRAY_SIZE(da9063_irq_clr), - .buf = da9063_irq_clr, - }, { - .addr = 0x68, - .len = ARRAY_SIZE(da9210_irq_clr), - .buf = da9210_irq_clr, - }, { - .addr = 0x70, - .len = ARRAY_SIZE(da9210_irq_clr), - .buf = da9210_irq_clr, - }, +static struct i2c_msg da9063_msgs = { + .addr = 0x00, + .len = ARRAY_SIZE(da9063_irq_clr), + .buf = da9063_irq_clr, +}; + +static struct i2c_msg da9210_msgs = { + .addr = 0x00, + .len = ARRAY_SIZE(da9210_irq_clr), + .buf = da9210_irq_clr, +}; + +static const struct of_device_id rcar_gen2_quirk_match[] = { + { .compatible = "dlg,da9063", .data = &da9063_msgs }, + { .compatible = "dlg,da9210", .data = &da9210_msgs }, + {}, }; static int regulator_quirk_notify(struct notifier_block *nb, unsigned long action, void *data) { + struct regulator_quirk *pos, *tmp; struct device *dev = data; struct i2c_client *client; static bool done; + int ret; u32 mon; if (done) @@ -88,17 +103,21 @@ static int regulator_quirk_notify(struct notifier_block *nb, client = to_i2c_client(dev); dev_dbg(dev, "Detected %s\n", client->name); - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { - int ret, len; + list_for_each_entry(pos, &quirk_list, list) { + if (pos->i2c_msg.addr != client->addr) + continue; - /* There are two DA9210 on Stout, one on the other boards. */ - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; + if (!of_device_is_compatible(dev->of_node, pos->id->compatible)) + continue; - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); - if (ret != ARRAY_SIZE(da9xxx_msgs)) + if (!pos->shared) + continue; + + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", + pos->id->compatible, pos->i2c_msg.addr); + + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); + if (ret != 1) dev_err(&client->dev, "i2c error %d\n", ret); } @@ -111,6 +130,11 @@ static int regulator_quirk_notify(struct notifier_block *nb, remove: dev_info(dev, "IRQ2 is not asserted, removing quirk\n"); + list_for_each_entry_safe(pos, tmp, &quirk_list, list) { + list_del(&pos->list); + kfree(pos); + } + done = true; iounmap(irqc); return 0; @@ -122,7 +146,14 @@ static struct notifier_block regulator_quirk_nb = { static int __init rcar_gen2_regulator_quirk(void) { - u32 mon; + struct device_node *np; + const struct of_device_id *id; + struct regulator_quirk *quirk; + struct regulator_quirk *pos; + struct of_phandle_args *argsa, *argsb; + u32 mon, addr, i; + bool match; + int ret; if (!of_machine_is_compatible("renesas,koelsch") && !of_machine_is_compatible("renesas,lager") && @@ -130,6 +161,51 @@ static int __init rcar_gen2_regulator_quirk(void) !of_machine_is_compatible("renesas,gose")) return -ENODEV; + for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) { + if(!np || !of_device_is_available(np)) + break; + + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); + + argsa = &quirk->irq_args; + memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); + + ret = of_property_read_u32(np, "reg", &addr); + if (ret) + return ret; + + quirk->id = id; + quirk->i2c_msg.addr = addr; + quirk->shared = false; + + ret = of_irq_parse_one(np, 0, &quirk->irq_args); + if (ret) + return ret; + + list_for_each_entry(pos, &quirk_list, list) { + argsa = &quirk->irq_args; + argsb = &pos->irq_args; + + if (argsa->args_count != argsb->args_count) + continue; + + match = true; + for (i = 0; i < argsa->args_count; i++) { + if (argsa->args[i] != argsb->args[i]) { + match = false; + break; + } + } + + if (match) { + pos->shared = true; + quirk->shared = true; + } + } + + list_add_tail(&quirk->list, &quirk_list); + } + irqc = ioremap(IRQC_BASE, PAGE_SIZE); if (!irqc) return -ENOMEM;
Rather than hard-coding the quirk topology, which stopped scaling, parse the information from DT. The code looks for all compatible PMICs -- da9036 and da9210 -- and checks if their IRQ line is tied to the same pin. If so, the code sends a matching sequence to the PMIC to deassert the IRQ. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Simon Horman <horms+renesas@verge.net.au> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> --- arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 124 +++++++++++++++++---- 1 file changed, 100 insertions(+), 24 deletions(-)