of/irq: Refactor interrupt-map parsing
All the users of of_irq_parse_raw pass in a raw interrupt specifier from the device tree and expect it to be returned (possibly modified) in an of_phandle_args structure. However, the primary function of of_irq_parse_raw() is to check for translations due to the presence of one or more interrupt-map properties. The actual placing of the data into an of_phandle_args structure is trivial. If it is refactored to accept an of_phandle_args structure directly, then it becomes possible to consume of_phandle_args from other sources. This is important for an upcoming patch that allows a device to be connected to more than one interrupt parent. It also simplifies the code a bit. The biggest complication with this patch is that the old version works on the interrupt specifiers in __be32 form, but the of_phandle_args structure is intended to carry it in the cpu-native version. A bit of churn was required to make this work. In the end it results in tighter code, so the churn is worth it. Signed-off-by: Grant Likely <grant.likely@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
@@ -322,7 +322,6 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
|
||||
struct pci_controller *hose = pci_bus_to_host(dev->bus);
|
||||
struct device_node *hosenode = hose ? hose->dn : NULL;
|
||||
struct of_phandle_args oirq;
|
||||
int pin = 2;
|
||||
u32 laddr[3];
|
||||
|
||||
if (!machine_is(mpc86xx_hpcd))
|
||||
@@ -331,9 +330,12 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
|
||||
if (!hosenode)
|
||||
return;
|
||||
|
||||
oirq.np = hosenode;
|
||||
oirq.args[0] = 2;
|
||||
oirq.args_count = 1;
|
||||
laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(31, 0) << 8);
|
||||
laddr[1] = laddr[2] = 0;
|
||||
of_irq_parse_raw(hosenode, &pin, 1, laddr, &oirq);
|
||||
of_irq_parse_raw(laddr, &oirq);
|
||||
dev->irq = irq_create_of_mapping(&oirq);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user