From patchwork Wed Sep 1 12:28:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 505070 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp214851jai; Wed, 1 Sep 2021 05:40:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9/B/mi1UVhYJv8dc+AqY5zJBnmOw0PDy8TYXx1Eog0kCVqWt9p0usWnaDIiTUpV5nijFm X-Received: by 2002:a5d:9e09:: with SMTP id h9mr27207234ioh.164.1630500011117; Wed, 01 Sep 2021 05:40:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630500011; cv=none; d=google.com; s=arc-20160816; b=O00M1U/LdzI6roVO4iAPjQATb8e5DIY68OfxIu5XLDl5tc5ng9E/u0lBSQUXD5iYGD MSGapSfxaFaOn5kJDBsq7zzxF0/zEaVthFtKGdGhrOZtt7kMDxbYWP3hK1FS4D7i6fQR EDY/geaYw0HSMAjMY+hJTMNnUdbODZCRBYVCRhDLbWRWBAAWa6UA0NSAgM7tl0UWvrKI cxTNNJzb8mLdW7CjtvWQJtXt/+B+J/GOC9Xo2X4xKKL0+hxgeUlvNpl2/rMa3jF+L/PN tSyUUgZglqWr4I84q42hRy0nTimp8cEPdew+PLvHyJsZbGh/XNI0HVcwM3IbJf77UXjw 2Y4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eyPQewaFBaEtY+aeiq+jVKj/MtTjUca2SWnOeCPbT4Q=; b=RJiJR9DCiSfTBt688Oaq/eteoinenEWABWAL3VXwPwqpToFM9SqkOWYkenE6eB3oHn XLE0ELFedDYiXYJtnESNehTwI46Njvwi0xoAQ+jIHswXwS5SFQHFkwFR5JZUIvY3XoNG 4jBjs1Af+Lj0Fyh0B0yPCjzBH6h5OwExXipboDsq224snwIC5NnkDNhsjpbSbaoi7nYs +U/beJPj+EnWGidg0lluCelrkp5QhxoWb9oMBn6bSCNzhDC9h34oRTM31UXQL/DdFwuC 3+bLfhyNrem2vU50sOMTjg40UbZWHa6SQixLbxxFfOXO3M4IsfsR/5OQ8hbGHHmcjhRF gQjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nusIV7IK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j9si20349837ilr.97.2021.09.01.05.40.10; Wed, 01 Sep 2021 05:40:11 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nusIV7IK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345221AbhIAMkz (ORCPT + 11 others); Wed, 1 Sep 2021 08:40:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:44060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245748AbhIAMiz (ORCPT ); Wed, 1 Sep 2021 08:38:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B0C2E610E5; Wed, 1 Sep 2021 12:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630499700; bh=H6B1/1anDben9r72Mw4Uvx5sfAisxESMV/l5TUKvy+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nusIV7IKakvNA1G4Eh44rV+b57TyX2ke4P+vlWyjXkUKQMPsgAGbWyNj0uCU/seaz +JomofRAIqcIW4lMlgeaSCIbBiAMDCPNbrsA89IP/YUQcMaljHkxmb+R6cpivgoCNu 4j35pdZom/ox0tw/koYTwzBlXYNSlkmwGjyu2XeI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.10 051/103] dt-bindings: sifive-l2-cache: Fix select matching Date: Wed, 1 Sep 2021 14:28:01 +0200 Message-Id: <20210901122302.286571745@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122300.503008474@linuxfoundation.org> References: <20210901122300.503008474@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 1c8094e394bceb4f1880f9d539bdd255c130826e ] When the schema fixups are applied to 'select' the result is a single entry is required for a match, but that will never match as there should be 2 entries. Also, a 'select' schema should have the widest possible match, so use 'contains' which matches the compatible string(s) in any position and not just the first position. Fixes: 993dcfac64eb ("dt-bindings: riscv: sifive-l2-cache: convert bindings to json-schema") Signed-off-by: Rob Herring Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml index efc0198eeb74..5444be7667b6 100644 --- a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml +++ b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml @@ -24,9 +24,9 @@ allOf: select: properties: compatible: - items: - - enum: - - sifive,fu540-c000-ccache + contains: + enum: + - sifive,fu540-c000-ccache required: - compatible