Message ID | 20220805155405.1504081-3-mail@conchuod.ie (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | QEMU: Fix RISC-V virt & spike machines' dtbs | expand |
On Sat, Aug 6, 2022 at 2:01 AM Conor Dooley <mail@conchuod.ie> wrote: > > From: Conor Dooley <conor.dooley@microchip.com> > > "uart" is not a node name that complies with the dt-schema. > Change the node name to "serial" to ix warnings seen during > dt-validate on a dtbdump of the virt machine such as: > /stuff/qemu/qemu.dtb: uart@10000000: $nodename:0: 'uart@10000000' does not match '^serial(@.*)?$' > From schema: /stuff/linux/Documentation/devicetree/bindings/serial/8250.yaml > > Reported-by: Rob Herring <robh@kernel.org> > Link: https://lore.kernel.org/linux-riscv/20220803170552.GA2250266-robh@kernel.org/ > Fixes: 04331d0b56 ("RISC-V VirtIO Machine") > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/riscv/virt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index bc424dd2f5..6c61a406c4 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -917,7 +917,7 @@ static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap, > char *name; > MachineState *mc = MACHINE(s); > > - name = g_strdup_printf("/soc/uart@%lx", (long)memmap[VIRT_UART0].base); > + name = g_strdup_printf("/soc/serial@%lx", (long)memmap[VIRT_UART0].base); > qemu_fdt_add_subnode(mc->fdt, name); > qemu_fdt_setprop_string(mc->fdt, name, "compatible", "ns16550a"); > qemu_fdt_setprop_cells(mc->fdt, name, "reg", > -- > 2.37.1 > >
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index bc424dd2f5..6c61a406c4 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -917,7 +917,7 @@ static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap, char *name; MachineState *mc = MACHINE(s); - name = g_strdup_printf("/soc/uart@%lx", (long)memmap[VIRT_UART0].base); + name = g_strdup_printf("/soc/serial@%lx", (long)memmap[VIRT_UART0].base); qemu_fdt_add_subnode(mc->fdt, name); qemu_fdt_setprop_string(mc->fdt, name, "compatible", "ns16550a"); qemu_fdt_setprop_cells(mc->fdt, name, "reg",