Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1i6Gyx-0004yn-J0 for mharc-qemu-riscv@gnu.org; Fri, 06 Sep 2019 12:21:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56766) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i6Gyr-0004qU-Sa for qemu-riscv@nongnu.org; Fri, 06 Sep 2019 12:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i6Gyp-0004am-7j for qemu-riscv@nongnu.org; Fri, 06 Sep 2019 12:21:01 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:42560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i6Gyg-0004VU-My; Fri, 06 Sep 2019 12:20:50 -0400 Received: by mail-pg1-x541.google.com with SMTP id p3so3757723pgb.9; Fri, 06 Sep 2019 09:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=9/ySomWg+Z4ySt+og5YyM/tsKZxkcZ99fNQuY84wo0Q=; b=f3Iy2fG28VTKLBUholGbNJBOtnWSXkpEQswTRMf0xY0hIfTO0tMRCWj3XgONIVm8E+ rN5J3b0AMRPL63f1eA1kYcdRUK9qit2z/3CThb+1Wz9pSaiGcQKV/7Dg/GKJpbLuKFRl 2sDFHJw+BvtZP57zbl72JkOEJbpXIBtw8tOo8c0ZB32U9nChwBBiLwboEKmT4+2HOR7I wv3WGYOZHGsvTpCrz3ysLflsTDlqS8c7VoLnsh2RkGFLjk0ncSd0Yp3iAPgbTL2QPqnR hKXELi+knIY699n/MPfASYfzblmPc2WPYFJoz6VOPuraElD1LHdlw1GJr/drhvdwbNbW cOUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9/ySomWg+Z4ySt+og5YyM/tsKZxkcZ99fNQuY84wo0Q=; b=DmZq2D/0RxMKaT10s20tGCGOxPz5ZBvUoMj8YCxnVr5MWTWFeAPypI3V0cZEk6mRZN 0NXxmUp6CBXfYACm5MsKhY+d1l5jjXt8Qj6jjYeABj6+yzhe7qy0yxtX8DzuDNEFglqV ks9My4tyaZ+RlVTTLYbFDoGdbqnsxZAzHKDQ7v0n7+TNwvcqQuZJkc/Qxjuf33CPXGJ4 PBsm5bMCwNS5HGLfzZooDQtvSst+x0gevh2ndvatc+PDo9bMIvVBigGElO4HaXmKtQZH 2MDfD68dmhFrQfvMiHe9+wsf6wjPBa3b6zOc3uzGqgaDwqk4doyDi6kggvQlKoxxib1a EJLw== X-Gm-Message-State: APjAAAVUBrNcKxMNC3F8FkXoOU+ysm5STy9fl1r3zxlMaHqAgpE6NfpD OoocBeMvE8cjffN6jhtGP+M= X-Google-Smtp-Source: APXvYqyHIW6yFmLVkV9o70Y4Vta0YS0VLnYVXumw937xH8tVRjJU/h5fNfjvSTPLNwtynY5wnCR/Dw== X-Received: by 2002:a62:f246:: with SMTP id y6mr11509113pfl.22.1567786849617; Fri, 06 Sep 2019 09:20:49 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f89sm11146228pje.20.2019.09.06.09.20.48 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 06 Sep 2019 09:20:49 -0700 (PDT) From: Bin Meng To: Alistair Francis , Palmer Dabbelt , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Fri, 6 Sep 2019 09:20:11 -0700 Message-Id: <1567786819-22142-25-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1567786819-22142-1-git-send-email-bmeng.cn@gmail.com> References: <1567786819-22142-1-git-send-email-bmeng.cn@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-riscv] [PATCH v8 24/32] riscv: sifive_u: Reference PRCI clocks in UART and ethernet nodes X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Sep 2019 16:21:06 -0000 Now that we have added a PRCI node, update existing UART and ethernet nodes to reference PRCI as their clock sources, to keep in sync with the Linux kernel device tree. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis --- Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None hw/riscv/sifive_u.c | 7 ++++--- include/hw/riscv/sifive_u_prci.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index ff2e28e..ea21095 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -78,7 +78,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, int cpu; uint32_t *cells; char *nodename; - char ethclk_names[] = "pclk\0hclk\0tx_clk"; + char ethclk_names[] = "pclk\0hclk"; uint32_t plic_phandle, prci_phandle, ethclk_phandle, phandle = 1; uint32_t uartclk_phandle; uint32_t hfclk_phandle, rtcclk_phandle; @@ -263,7 +263,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle); qemu_fdt_setprop_cell(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ); qemu_fdt_setprop_cells(fdt, nodename, "clocks", - ethclk_phandle, ethclk_phandle, ethclk_phandle); + 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_cell(fdt, nodename, "#address-cells", 1); @@ -293,7 +293,8 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0, memmap[SIFIVE_U_UART0].base, 0x0, memmap[SIFIVE_U_UART0].size); - qemu_fdt_setprop_cell(fdt, nodename, "clocks", uartclk_phandle); + qemu_fdt_setprop_cells(fdt, nodename, "clocks", + prci_phandle, PRCI_CLK_TLCLK); qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle); qemu_fdt_setprop_cell(fdt, nodename, "interrupts", SIFIVE_U_UART0_IRQ); diff --git a/include/hw/riscv/sifive_u_prci.h b/include/hw/riscv/sifive_u_prci.h index 60a2eab..0a531fd 100644 --- a/include/hw/riscv/sifive_u_prci.h +++ b/include/hw/riscv/sifive_u_prci.h @@ -78,4 +78,14 @@ typedef struct SiFiveUPRCIState { uint32_t clkmuxstatus; } SiFiveUPRCIState; +/* + * Clock indexes for use by Device Tree data and the PRCI driver. + * + * These values are from sifive-fu540-prci.h in the Linux kernel. + */ +#define PRCI_CLK_COREPLL 0 +#define PRCI_CLK_DDRPLL 1 +#define PRCI_CLK_GEMGXLPLL 2 +#define PRCI_CLK_TLCLK 3 + #endif /* HW_SIFIVE_U_PRCI_H */ -- 2.7.4