system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 02:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

of: property: Fix fw_devlink handling of interrupts/interrupts-extended

Browse source 
Commit 4104ca776b ("of: property: Add fw_devlink support for interrupts")
was not taking interrupt-map into account. Fix that.

Fixes: 4104ca776b ("of: property: Add fw_devlink support for interrupts")
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20210209010439.3529036-1-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Saravana Kannan 2021-02-08 17:04:38 -08:00 committed by Greg Kroah-Hartman
parent ced2af4195
commit f265f06af1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/of/property.c
View file

@ -1245,8 +1245,6 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-cells")
DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells") DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells")
DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells") DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells")
DEFINE_SIMPLE_PROP(extcon, "extcon", NULL) 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(nvmem_cells, "nvmem-cells", NULL)
DEFINE_SIMPLE_PROP(phys, "phys", "#phy-cells") DEFINE_SIMPLE_PROP(phys, "phys", "#phy-cells")
DEFINE_SIMPLE_PROP(wakeup_parent, "wakeup-parent", NULL) DEFINE_SIMPLE_PROP(wakeup_parent, "wakeup-parent", NULL)
@ -1297,10 +1295,13 @@ static struct device_node *parse_gpio_compat(struct device_node *np,
static struct device_node *parse_interrupts(struct device_node *np, static struct device_node *parse_interrupts(struct device_node *np,
const char *prop_name, int index) 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 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[] = { static const struct supplier_bindings of_supplier_bindings[] = {
@ -1315,7 +1316,6 @@ static const struct supplier_bindings of_supplier_bindings[] = {
{ .parse_prop = parse_power_domains, }, { .parse_prop = parse_power_domains, },
{ .parse_prop = parse_hwlocks, }, { .parse_prop = parse_hwlocks, },
{ .parse_prop = parse_extcon, }, { .parse_prop = parse_extcon, },
{ .parse_prop = parse_interrupts_extended, },
{ .parse_prop = parse_nvmem_cells, }, { .parse_prop = parse_nvmem_cells, },
{ .parse_prop = parse_phys, }, { .parse_prop = parse_phys, },
{ .parse_prop = parse_wakeup_parent, }, { .parse_prop = parse_wakeup_parent, },