[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string
From: |
Bin Meng |
Subject: |
[PATCH v2 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper |
Date: |
Fri, 30 Apr 2021 15:12:55 +0800 |
From: Bin Meng <bin.meng@windriver.com>
Since commit 78da6a1bca22 ("device_tree: add qemu_fdt_setprop_string_array
helper"),
we can use the new helper to set the clock name for the ethernet
controller node.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
Changes in v2:
- use "static const char * const" for ethclk_names
hw/riscv/sifive_u.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 7b59942369..1b8af0c07a 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -96,9 +96,9 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry
*memmap,
int cpu;
uint32_t *cells;
char *nodename;
- char ethclk_names[] = "pclk\0hclk";
uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle = 1;
uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle;
+ static const char * const ethclk_names[2] = { "pclk", "hclk" };
if (ms->dtb) {
fdt = s->fdt = load_device_tree(ms->dtb, &s->fdt_size);
@@ -413,8 +413,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry
*memmap,
qemu_fdt_setprop_cell(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ);
qemu_fdt_setprop_cells(fdt, nodename, "clocks",
prci_phandle, PRCI_CLK_GEMGXLPLL, prci_phandle, PRCI_CLK_GEMGXLPLL);
- qemu_fdt_setprop(fdt, nodename, "clock-names", ethclk_names,
- sizeof(ethclk_names));
+ qemu_fdt_setprop_string_array(fdt, nodename, "clock-names",
+ (char **)ðclk_names, ARRAY_SIZE(ethclk_names));
qemu_fdt_setprop(fdt, nodename, "local-mac-address",
s->soc.gem.conf.macaddr.a, ETH_ALEN);
qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1);
--
2.25.1
- [PATCH v2 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper,
Bin Meng <=
- [PATCH v2 2/8] hw/riscv: virt: Switch to use qemu_fdt_setprop_string_array() helper, Bin Meng, 2021/04/30
- [PATCH v2 3/8] hw/riscv: Support the official CLINT DT bindings, Bin Meng, 2021/04/30
- [PATCH v2 4/8] hw/riscv: Support the official PLIC DT bindings, Bin Meng, 2021/04/30
- [PATCH v2 5/8] docs/system/riscv: Correct the indentation level of supported devices, Bin Meng, 2021/04/30
- [PATCH v2 6/8] docs/system/riscv: sifive_u: Document '-dtb' usage, Bin Meng, 2021/04/30
- [PATCH v2 7/8] hw/riscv: Use macros for BIOS image names, Bin Meng, 2021/04/30
- [PATCH v2 8/8] hw/riscv: microchip_pfsoc: Support direct kernel boot, Bin Meng, 2021/04/30