From patchwork Tue Sep 24 19:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11159505 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 79B191747 for ; Tue, 24 Sep 2019 19:47:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 56DE82146E for ; Tue, 24 Sep 2019 19:47:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mZG4lwo4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56DE82146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=R1gaQzGZe2T1NgTrw0a26+SkJ43wGFgb/3VRxQLEKp0=; b=mZG4lwo4NwJNhB cFw2V8iEeB/lVJsFz334XpJ1BbUuJTAzOCAhOJzhjOzXdjyhtN/qa6puL0h6IpEVi86+notrg2wiV MCO63jQbKUu3scDqTtzBsBckhr4/mSzxrk9YjRjfLoA6kTshv63Q1xMro93dA+O08N1yf+HvfPkSe jOMtV4f2O1PrPW0I/Q/I9jVNAMZcNu7sFz7xB6yuNwv/VqcHB8jgGHpC+4q89PwMfTIZxK+mvKe+W YCh86EAVhCXzShTI8CIA3Z1D947/ep6JxNjL/NQw4J5n0/syC8Jc7stkX95bpt65lbqj6bGsSH6A3 q7sLrJ6CeuUDsntnA6Qw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCqmF-0000RK-Kj; Tue, 24 Sep 2019 19:47:11 +0000 Received: from mail-ot1-f67.google.com ([209.85.210.67]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCqmD-0000Qv-9g for linux-riscv@lists.infradead.org; Tue, 24 Sep 2019 19:47:10 +0000 Received: by mail-ot1-f67.google.com with SMTP id f21so2577281otl.13 for ; Tue, 24 Sep 2019 12:47:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZHPQMpVO9op7Vu0vGkUhBj5SViO1WuLEbRF6XVcQOi4=; b=NYj2ew4B6e+l8jNYV1Oj7HyiqNImCM/b745kXKSJyGYHCWpOuBKh1ynZA52Yxw0HfW qcYMMDAktkM8KGmP8nDwGAKv6qWRIje1xCAGNJiNq0WsAVG8vHrHa9nQxdGyG0dpZsqU Jr41DZcZ5wwa9mUsScpz/dCodRAJ5ltPCzz1g5+zYHiS/gpVids5Ga9p0tOvHjwGJRKS s1nckSSVClL6gSJkx9WnW2o7W/3GM7REoJyNXVrG3635qdf+MjKJAOJHTkMn6NA6FhD5 H+cTMcr9UAtAGvjcKxZkeMyR6Bb/F50huOVjZDfwSsND+fID052LfeXzCoVsmkBJrPli goUQ== X-Gm-Message-State: APjAAAUycymzoKAJbowHNRSw69ba51HnEH+ISYszoXmLKxy3udB3XcBC P4ET1FilDUOQWa2942dhzg== X-Google-Smtp-Source: APXvYqzq/V8n0w/j43BKO8sETLatIuXKrfBSN9UzNEGxdt2zAohbFjRF2fosDLt5LIb+wo7rpBbC2w== X-Received: by 2002:a9d:6405:: with SMTP id h5mr839756otl.115.1569354427442; Tue, 24 Sep 2019 12:47:07 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id e18sm868660oib.57.2019.09.24.12.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 12:47:06 -0700 (PDT) From: Rob Herring To: Paul Walmsley Subject: [PATCH] dt-bindings: riscv: Fix CPU schema errors Date: Tue, 24 Sep 2019 14:47:05 -0500 Message-Id: <20190924194705.32240-1-robh@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190924_124709_340126_E85B355C X-CRM114-Status: UNSURE ( 9.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.5 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.210.67 listed in list.dnswl.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.210.67 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, Palmer Dabbelt , linux-kernel@vger.kernel.org, Albert Ou Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org Fix the errors in the RiscV CPU DT schema: Documentation/devicetree/bindings/riscv/cpus.example.dt.yaml: cpu@0: 'timebase-frequency' is a required property Documentation/devicetree/bindings/riscv/cpus.example.dt.yaml: cpu@1: 'timebase-frequency' is a required property Documentation/devicetree/bindings/riscv/cpus.example.dt.yaml: cpu@0: compatible:0: 'riscv' is not one of ['sifive,rocket0', 'sifive,e5', 'sifive,e51', 'sifive,u54-mc', 'sifive,u54', 'sifive,u5'] Documentation/devicetree/bindings/riscv/cpus.example.dt.yaml: cpu@0: compatible: ['riscv'] is too short Documentation/devicetree/bindings/riscv/cpus.example.dt.yaml: cpu@0: 'timebase-frequency' is a required property Fixes: 4fd669a8c487 ("dt-bindings: riscv: convert cpu binding to json-schema") Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: linux-riscv@lists.infradead.org Signed-off-by: Rob Herring --- .../devicetree/bindings/riscv/cpus.yaml | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/riscv/cpus.yaml b/Documentation/devicetree/bindings/riscv/cpus.yaml index c899111aa5e3..e7321688f7b9 100644 --- a/Documentation/devicetree/bindings/riscv/cpus.yaml +++ b/Documentation/devicetree/bindings/riscv/cpus.yaml @@ -12,15 +12,17 @@ maintainers: properties: compatible: - items: - - enum: - - sifive,rocket0 - - sifive,e5 - - sifive,e51 - - sifive,u54-mc - - sifive,u54 - - sifive,u5 - - const: riscv + oneOf: + - items: + - enum: + - sifive,rocket0 + - sifive,e5 + - sifive,e51 + - sifive,u54-mc + - sifive,u54 + - sifive,u5 + - const: riscv + - const: riscv # Simulator only description: Identifies that the hart uses the RISC-V instruction set and identifies the type of the hart. @@ -51,8 +53,6 @@ properties: https://riscv.org/specifications/ timebase-frequency: - type: integer - minimum: 1 description: Specifies the clock frequency of the system timer in Hz. This value is common to all harts on a single system image. @@ -86,9 +86,9 @@ examples: cpus { #address-cells = <1>; #size-cells = <0>; - timebase-frequency = <1000000>; cpu@0 { clock-frequency = <0>; + timebase-frequency = <1000000>; compatible = "sifive,rocket0", "riscv"; device_type = "cpu"; i-cache-block-size = <64>; @@ -104,6 +104,7 @@ examples: }; cpu@1 { clock-frequency = <0>; + timebase-frequency = <1000000>; compatible = "sifive,rocket0", "riscv"; d-cache-block-size = <64>; d-cache-sets = <64>;