| Message ID | 20220809185639.750345-6-qemu@ben.fluff.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/6] device_tree: add qemu_fdt_setprop_strings() helper | expand |
On Tue, Aug 09, 2022 at 07:56:39PM +0100, Ben Dooks wrote: > Change to using qemu_fdt_setprop_strings() helper in hw/mips. > > Signed-off-by: Ben Dooks <qemu@ben.fluff.org> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/mips/boston.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/hw/mips/boston.c b/hw/mips/boston.c > index d2ab9da1a0..759f6daafe 100644 > --- a/hw/mips/boston.c > +++ b/hw/mips/boston.c > @@ -515,9 +515,6 @@ static const void *create_fdt(BostonState *s, > MachineState *mc = s->mach; > uint32_t platreg_ph, gic_ph, clk_ph; > char *name, *gic_name, *platreg_name, *stdout_name; > - static const char * const syscon_compat[2] = { > - "img,boston-platform-regs", "syscon" > - }; > > fdt = create_device_tree(dt_size); > if (!fdt) { > @@ -608,9 +605,8 @@ static const void *create_fdt(BostonState *s, > platreg_name = g_strdup_printf("/soc/system-controller@%" HWADDR_PRIx, > memmap[BOSTON_PLATREG].base); > qemu_fdt_add_subnode(fdt, platreg_name); > - qemu_fdt_setprop_string_array(fdt, platreg_name, "compatible", > - (char **)&syscon_compat, > - ARRAY_SIZE(syscon_compat)); > + qemu_fdt_setprop_strings(fdt, platreg_name, "compatible", > + "img,boston-platform-regs", "syscon"); > qemu_fdt_setprop_cells(fdt, platreg_name, "reg", > memmap[BOSTON_PLATREG].base, > memmap[BOSTON_PLATREG].size); > -- > 2.35.1 > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
On Wed, Aug 10, 2022 at 4:58 AM Ben Dooks <qemu@ben.fluff.org> wrote: > > Change to using qemu_fdt_setprop_strings() helper in hw/mips. > > Signed-off-by: Ben Dooks <qemu@ben.fluff.org> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/mips/boston.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/hw/mips/boston.c b/hw/mips/boston.c > index d2ab9da1a0..759f6daafe 100644 > --- a/hw/mips/boston.c > +++ b/hw/mips/boston.c > @@ -515,9 +515,6 @@ static const void *create_fdt(BostonState *s, > MachineState *mc = s->mach; > uint32_t platreg_ph, gic_ph, clk_ph; > char *name, *gic_name, *platreg_name, *stdout_name; > - static const char * const syscon_compat[2] = { > - "img,boston-platform-regs", "syscon" > - }; > > fdt = create_device_tree(dt_size); > if (!fdt) { > @@ -608,9 +605,8 @@ static const void *create_fdt(BostonState *s, > platreg_name = g_strdup_printf("/soc/system-controller@%" HWADDR_PRIx, > memmap[BOSTON_PLATREG].base); > qemu_fdt_add_subnode(fdt, platreg_name); > - qemu_fdt_setprop_string_array(fdt, platreg_name, "compatible", > - (char **)&syscon_compat, > - ARRAY_SIZE(syscon_compat)); > + qemu_fdt_setprop_strings(fdt, platreg_name, "compatible", > + "img,boston-platform-regs", "syscon"); > qemu_fdt_setprop_cells(fdt, platreg_name, "reg", > memmap[BOSTON_PLATREG].base, > memmap[BOSTON_PLATREG].size); > -- > 2.35.1 > >
diff --git a/hw/mips/boston.c b/hw/mips/boston.c index d2ab9da1a0..759f6daafe 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -515,9 +515,6 @@ static const void *create_fdt(BostonState *s, MachineState *mc = s->mach; uint32_t platreg_ph, gic_ph, clk_ph; char *name, *gic_name, *platreg_name, *stdout_name; - static const char * const syscon_compat[2] = { - "img,boston-platform-regs", "syscon" - }; fdt = create_device_tree(dt_size); if (!fdt) { @@ -608,9 +605,8 @@ static const void *create_fdt(BostonState *s, platreg_name = g_strdup_printf("/soc/system-controller@%" HWADDR_PRIx, memmap[BOSTON_PLATREG].base); qemu_fdt_add_subnode(fdt, platreg_name); - qemu_fdt_setprop_string_array(fdt, platreg_name, "compatible", - (char **)&syscon_compat, - ARRAY_SIZE(syscon_compat)); + qemu_fdt_setprop_strings(fdt, platreg_name, "compatible", + "img,boston-platform-regs", "syscon"); qemu_fdt_setprop_cells(fdt, platreg_name, "reg", memmap[BOSTON_PLATREG].base, memmap[BOSTON_PLATREG].size);