[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/7] hw/ppc/pnv: Determine ns16550's IRQ number from QOM prope
From: |
Bernhard Beschow |
Subject: |
[PATCH v3 5/7] hw/ppc/pnv: Determine ns16550's IRQ number from QOM property |
Date: |
Tue, 1 Mar 2022 23:00:35 +0100 |
Determine the IRQ number in the same way as for pnv_dt_ipmi_bt(). This
resolves one usage of ISADevice::isairq[] which allows it to be removed
eventually.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/ppc/pnv.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 837146a2fb..441bf958ca 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -380,9 +380,12 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int
lpc_off)
cpu_to_be32(io_base),
cpu_to_be32(8)
};
+ uint32_t irq;
char *name;
int node;
+ irq = object_property_get_uint(OBJECT(d), "irq", &error_fatal);
+
name = g_strdup_printf("%s@i%x", qdev_fw_name(DEVICE(d)), io_base);
node = fdt_add_subnode(fdt, lpc_off, name);
_FDT(node);
@@ -394,7 +397,7 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int
lpc_off)
_FDT((fdt_setprop_cell(fdt, node, "clock-frequency", 1843200)));
_FDT((fdt_setprop_cell(fdt, node, "current-speed", 115200)));
- _FDT((fdt_setprop_cell(fdt, node, "interrupts", d->isairq[0])));
+ _FDT((fdt_setprop_cell(fdt, node, "interrupts", irq)));
_FDT((fdt_setprop_cell(fdt, node, "interrupt-parent",
fdt_get_phandle(fdt, lpc_off))));
--
2.35.1
- [PATCH v3 0/7] isa: Resolve unneeded IRQ attributes from ISADevice, Bernhard Beschow, 2022/03/01
- [PATCH v3 1/7] hw/rtc/mc146818rtc: QOM'ify IRQ number, Bernhard Beschow, 2022/03/01
- [PATCH v3 4/7] hw/isa/isa-bus: Remove isabus_dev_print(), Bernhard Beschow, 2022/03/01
- [PATCH v3 5/7] hw/ppc/pnv: Determine ns16550's IRQ number from QOM property,
Bernhard Beschow <=
- [PATCH v3 2/7] hw/rtc/m48t59-isa: QOM'ify IRQ number, Bernhard Beschow, 2022/03/01
- [PATCH v3 3/7] hw/input/pckbd: QOM'ify IRQ numbers, Bernhard Beschow, 2022/03/01
- [PATCH v3 7/7] isa: Inline and remove one-line isa_init_irq(), Bernhard Beschow, 2022/03/01
- [PATCH v3 6/7] isa: Drop unused attributes from ISADevice, Bernhard Beschow, 2022/03/01
- Re: [PATCH v3 0/7] isa: Resolve unneeded IRQ attributes from ISADevice, Philippe Mathieu-Daudé, 2022/03/06