From patchwork Wed Sep 18 14:55:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 11150567 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1FD014E5 for ; Wed, 18 Sep 2019 15:35:06 +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 923C3207FC for ; Wed, 18 Sep 2019 15:35:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 923C3207FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAbyy-0004vc-Kw for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Sep 2019 11:35:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAbrp-0006CS-IP for qemu-devel@nongnu.org; Wed, 18 Sep 2019 11:27:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAbro-0006Kz-0x for qemu-devel@nongnu.org; Wed, 18 Sep 2019 11:27:41 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:37065) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAbrn-0006Jw-RY for qemu-devel@nongnu.org; Wed, 18 Sep 2019 11:27:39 -0400 Received: by mail-pg1-f169.google.com with SMTP id c17so50640pgg.4 for ; Wed, 18 Sep 2019 08:27:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:cc:from:to; bh=0aUWUGKUdj74mYp5bqvI3cmVOmwPFCZNAshHhaO5kdk=; b=OtsslQwnikP4eIlc7fJAZK7Z/jrMp14RnDG/Cea8FCRcyZ7RUu441LISNOE24Ub3hv G0R4zJCZCp1OvUjo0DZrTjYdBFcwhgbAycOvwJp1r2XfPBjx/Ljh2FH15jrrghdIIczx MgZ0chkTEjirr0q20ZKy6FjBJtpiETn7EW22sk9jMphp8nGKiuBGnr3/h2P0WI6zMosa ZOPEsSxBPZF7Y1ujhY3SwDqd9yehS6csdzZgfWI6aV51jjXTdDrO1/LgXT+2CWFx7/0l 9X/bqdzVUwpYD9ohcgOEdfej3fIwU9xwG2mFUOZS/w97UxrmqAMVhZz8N54l3uVuXP5x nuBQ== X-Gm-Message-State: APjAAAXlRTPdAaDXsMFYypvRmNqCegpAgFdku09tXDwcheOiQI6AfmxV sJxKX0N2fbwVMC8Z43cjDtRZhg== X-Google-Smtp-Source: APXvYqwyOf8MyieLYw+12IjC53KH8Bzot9HsRMRORbDtWn8zLGWd/6I77RkM7n3AZkbEJT33Unrkew== X-Received: by 2002:a17:90a:3462:: with SMTP id o89mr4451651pjb.2.1568820458437; Wed, 18 Sep 2019 08:27:38 -0700 (PDT) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id cx22sm2843592pjb.19.2019.09.18.08.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 08:27:37 -0700 (PDT) Date: Wed, 18 Sep 2019 07:55:55 -0700 Message-Id: <20190918145640.17349-4-palmer@sifive.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190918145640.17349-1-palmer@sifive.com> References: <20190918145640.17349-1-palmer@sifive.com> MIME-Version: 1.0 From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.169 Subject: [Qemu-devel] [PULL 03/48] riscv: sifive_u: Fix clock-names property for ethernet node 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: , Cc: Alistair Francis , Palmer Dabbelt , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Guenter Roeck Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Guenter Roeck The correct property name is clock-names, not clocks-names. Without this patch, the Ethernet driver fails to instantiate with the following error. macb 100900fc.ethernet: failed to get macb_clk (-2) macb: probe of 100900fc.ethernet failed with error -2 Signed-off-by: Guenter Roeck Reviewed-by: Alistair Francis Signed-off-by: Palmer Dabbelt --- hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 8313f2605e..ae5a16e636 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -215,7 +215,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_cells(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ); qemu_fdt_setprop_cells(fdt, nodename, "clocks", ethclk_phandle, ethclk_phandle, ethclk_phandle); - qemu_fdt_setprop(fdt, nodename, "clocks-names", ethclk_names, + qemu_fdt_setprop(fdt, nodename, "clock-names", ethclk_names, sizeof(ethclk_names)); qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 1); qemu_fdt_setprop_cells(fdt, nodename, "#size-cells", 0);