From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48667C3A59F for ; Mon, 19 Aug 2019 05:25:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 112C021872 for ; Mon, 19 Aug 2019 05:25:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nIANLv9R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 112C021872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzaAH-0003kV-4U for qemu-devel@archiver.kernel.org; Mon, 19 Aug 2019 01:25:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43769) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzZy6-0005Gr-AY for qemu-devel@nongnu.org; Mon, 19 Aug 2019 01:12:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzZy4-0008JH-94 for qemu-devel@nongnu.org; Mon, 19 Aug 2019 01:12:33 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:42465) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hzZy4-00087D-0p; Mon, 19 Aug 2019 01:12:32 -0400 Received: by mail-pl1-x642.google.com with SMTP id y1so375421plp.9; Sun, 18 Aug 2019 22:12:29 -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=jRYXKkN9ELAFkYvShcEjA7QCCZhniz6CotBm9Ne6778=; b=nIANLv9R91M78C/isUfZ4OGAwF4AUNDIeDuUl6HbRaw+opxRgj/ayGjue/px6nr9pW zvPrQbixiy8iAShFOyQhQyjiY5Zpu2SyE0cGg4nYx2zohanrI0R3dp6DtB1f/9E6Pfsr 7ySz7IqHSoJNlHpo1mTkPdYNAvXgja3Y2Ca4BTwDJ7MTi73j6Zw44c+ywVV7qusEe3s3 JUaouZlAEOcEOvUCE1DedAWgLMSh8sjurST61fLUypTQkCQA7ZE6XUTbebiH7rITsoVS D1c0ZJTztlsOp8soNsxfwbAFf1yVYLbNwBQXyhORy1Ayfj2X20xsqvbpYficU/H9CIgg F12w== 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=jRYXKkN9ELAFkYvShcEjA7QCCZhniz6CotBm9Ne6778=; b=DmLZOsqPeUxOs8J8bFc7f7b0uIOxpUAAn5tkz7Z2i/t8OIY8MvYtILPSTy4MsjrDCO vAbap1tS4fufQOmnYd78eLvmAPQRMjDz9w7b5nHlyYekKgAkURr27qMOHhjbRR7ZFP+n 4gUZebByyW3V1IASWuETONaFAoEooKc7ovosSlt+KGowoz1w3LhS7LavORzNj+j0cZdf Iv3hpmSgHwm3jOj3L5IEGkTYbfJV4zaBz2rDpGjlvYzDhi0UEaytK8IFWDbmXjsDm1KV h4e8OIW17z4D0BFJ61OMqZ9FKphfAg5+X4Qxp8NYAo7GKYk6rNZLpG86+iXdhtn11Xa1 A2Eg== X-Gm-Message-State: APjAAAV39FGxkS73Ra6+WEYEWAdDnkybRsLFnqIGCPBMEEVIGcL7RsY6 bYyzdaQdTwRayRudxumdMKo= X-Google-Smtp-Source: APXvYqy7+bzqKMvX21R3AtVHU3OiB7E9TlCWy5SZrLa+RA3JIMp9U/73jGa9P4WlCG0VtNBQplZNeA== X-Received: by 2002:a17:902:8d95:: with SMTP id v21mr21151017plo.267.1566191548620; Sun, 18 Aug 2019 22:12:28 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id q13sm15464986pfl.124.2019.08.18.22.12.27 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 18 Aug 2019 22:12:28 -0700 (PDT) From: Bin Meng To: Alistair Francis , Palmer Dabbelt , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Sun, 18 Aug 2019 22:11:53 -0700 Message-Id: <1566191521-7820-21-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1566191521-7820-1-git-send-email-bmeng.cn@gmail.com> References: <1566191521-7820-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::642 Subject: [Qemu-devel] [PATCH v4 20/28] riscv: sifive_u: Reference PRCI clocks in UART and ethernet nodes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 bd5551c..8818fd6 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -80,7 +80,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; @@ -265,7 +265,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); @@ -295,7 +295,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 66eacb5..cdf1d33 100644 --- a/include/hw/riscv/sifive_u_prci.h +++ b/include/hw/riscv/sifive_u_prci.h @@ -87,4 +87,14 @@ typedef struct SiFiveUPRCIState { DeviceState *sifive_u_prci_create(hwaddr addr); +/* + * 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