On Mon, Aug 5, 2019 at 9:06 AM Bin Meng <bmeng...@gmail.com> wrote: > > "linux,phandle" property is optional. Remove all instances in the > sifive_u and virt machine device tree. > > Signed-off-by: Bin Meng <bmeng...@gmail.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> Alistair > --- > > hw/riscv/sifive_u.c | 3 --- > hw/riscv/virt.c | 3 --- > 2 files changed, 6 deletions(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 71b8083..ef36948 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -125,7 +125,6 @@ static void create_fdt(SiFiveUState *s, const struct > MemmapEntry *memmap, > qemu_fdt_setprop_string(fdt, nodename, "device_type", "cpu"); > qemu_fdt_add_subnode(fdt, intc); > qemu_fdt_setprop_cell(fdt, intc, "phandle", cpu_phandle); > - qemu_fdt_setprop_cell(fdt, intc, "linux,phandle", cpu_phandle); > qemu_fdt_setprop_string(fdt, intc, "compatible", "riscv,cpu-intc"); > qemu_fdt_setprop(fdt, intc, "interrupt-controller", NULL, 0); > qemu_fdt_setprop_cell(fdt, intc, "#interrupt-cells", 1); > @@ -184,7 +183,6 @@ static void create_fdt(SiFiveUState *s, const struct > MemmapEntry *memmap, > qemu_fdt_setprop_cell(fdt, nodename, "riscv,max-priority", 7); > qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 0x35); > qemu_fdt_setprop_cells(fdt, nodename, "phandle", plic_phandle); > - qemu_fdt_setprop_cells(fdt, nodename, "linux,phandle", plic_phandle); > plic_phandle = qemu_fdt_get_phandle(fdt, nodename); > g_free(cells); > g_free(nodename); > @@ -197,7 +195,6 @@ static void create_fdt(SiFiveUState *s, const struct > MemmapEntry *memmap, > qemu_fdt_setprop_cell(fdt, nodename, "clock-frequency", > SIFIVE_U_GEM_CLOCK_FREQ); > qemu_fdt_setprop_cell(fdt, nodename, "phandle", ethclk_phandle); > - qemu_fdt_setprop_cell(fdt, nodename, "linux,phandle", ethclk_phandle); > ethclk_phandle = qemu_fdt_get_phandle(fdt, nodename); > g_free(nodename); > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 25faf3b..00be05a 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -170,11 +170,9 @@ static void *create_fdt(RISCVVirtState *s, const struct > MemmapEntry *memmap, > qemu_fdt_setprop_cell(fdt, nodename, "reg", cpu); > qemu_fdt_setprop_string(fdt, nodename, "device_type", "cpu"); > qemu_fdt_setprop_cell(fdt, nodename, "phandle", cpu_phandle); > - qemu_fdt_setprop_cell(fdt, nodename, "linux,phandle", cpu_phandle); > intc_phandle = phandle++; > qemu_fdt_add_subnode(fdt, intc); > qemu_fdt_setprop_cell(fdt, intc, "phandle", intc_phandle); > - qemu_fdt_setprop_cell(fdt, intc, "linux,phandle", intc_phandle); > qemu_fdt_setprop_string(fdt, intc, "compatible", "riscv,cpu-intc"); > qemu_fdt_setprop(fdt, intc, "interrupt-controller", NULL, 0); > qemu_fdt_setprop_cell(fdt, intc, "#interrupt-cells", 1); > @@ -250,7 +248,6 @@ static void *create_fdt(RISCVVirtState *s, const struct > MemmapEntry *memmap, > qemu_fdt_setprop_cell(fdt, nodename, "riscv,max-priority", 7); > qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", VIRTIO_NDEV); > qemu_fdt_setprop_cells(fdt, nodename, "phandle", plic_phandle); > - qemu_fdt_setprop_cells(fdt, nodename, "linux,phandle", plic_phandle); > plic_phandle = qemu_fdt_get_phandle(fdt, nodename); > g_free(cells); > g_free(nodename); > -- > 2.7.4 > >
