of: property: Fix fw_devlink handling of interrupts/interrupts-extended
PATCH 1/1 of: property: Fix fw_devlink handling of interrupts/interrupts-extended
Commit 4104ca776ba3 ("of: property: Add fw_devlink support for interrupts") was not taking interrupt-map into account. Fix that.
Reported-by Marek Szyprowski <[email protected]>
Fixes 4104ca776ba3 ("of: property: Add fw_devlink support for interrupts")
Signed-off-by Saravana Kannan <[email protected]>
Tested-by Marek Szyprowski <[email protected]>
---
Greg,
This needs to go into driver-core as the "Fixes" commit is only in driver-core if I'm not mistaken.
-Saravana
drivers/of/property.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/of/property.c +5 -5
@@ -1248,8 +1248,6 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-cells") DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells") DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells") DEFINE_SIMPLE_PROP(extcon, "extcon", NULL) -DEFINE_SIMPLE_PROP (interrupts_extended,"interrupts-extended" , - "#interrupt-cells") DEFINE_SIMPLE_PROP(nvmem_cells, "nvmem-cells", NULL) DEFINE_SIMPLE_PROP(phys, "phys", "#phy-cells")DEFINE_SIMPLE_PROP (wakeup_parent,"wakeup-parent" ,NULL )
@@ -1300,10 +1298,13 @@ static struct device_node *parse_gpio_compat(struct device_node *np,static struct device_node *parse_interrupts (struct device_node *np,const char *prop_name,int index) { -if (strcmp (prop_name,"interrupts" ) || index) +struct of_phandle_args sup_args; + +if (strcmp (prop_name,"interrupts" ) && +strcmp (prop_name,"interrupts-extended" ))return NULL ; -return of_irq_find_parent (np); +return of_irq_parse_one (np, index, &sup_args) ?NULL : sup_args.np; }static const struct supplier_bindings of_supplier_bindings[] = {
@@ -1318,7 +1319,6 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_power_domains, }, { .parse_prop = parse_hwlocks, }, { .parse_prop = parse_extcon, }, - { .parse_prop = parse_interrupts_extended, }, { .parse_prop = parse_nvmem_cells, }, { .parse_prop = parse_phys, }, { .parse_prop = parse_wakeup_parent, },
Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 11 lines · Saravana Kannan
Commit
4104ca776ba3("of: property: Addfw_devlinksupport for interrupts") was not taking interrupt-map into account. Fix that.Reported-by Marek Szyprowski <[email protected]>Fixes 4104ca776ba3 ("of: property: Add fw_devlink support for interrupts")Signed-off-by Saravana Kannan <[email protected]>Tested-by Marek Szyprowski <[email protected]>---
Greg,
Quoted 7 lines
This needs to go into driver-core as the "Fixes" commit is only in driver-core if I'm not mistaken.
-Saravana
drivers/of/property.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Acked-by Rob Herring <[email protected]>