From patchwork Wed Aug 7 22:59:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13756834 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E1CF5C52D6F for ; Wed, 7 Aug 2024 23:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=jEfnM48W1m58J7CGuGX6GM+4Jnqzc/92bfGCA6UEfHs=; b=uzx+krc0gEwVWvhdSrl8k1YQ2P PHNSOjZx8ZbVyeygT90feCoSPCgDrlAJPqat2uTL3NMopNj79rySPfQqRrL+fJuLAEv+iJPYbVNZz bp+CyiFrw7fxHBNEqfISXDPFVi1B3fM0mIua6HbuKN1lGlQx6Ym6QrPkZTaJPETH+2SfotzK//39N 4Yb7QbiBohoI/T0l+xd+lHmxtsRihS1CCyGhn09RUrtTnerdZkTsfRAVME0HBZOUQuA062Gyz9lRC gqaSLoj+gR4BJFHXh2OaS7qV6BRP4BRtpeu/OdCwzmAgQIzbPMdnIl/ZCLtUVVtUTv+YQXjW83ak7 tyXdqxvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbpeB-00000006VRR-0cC1; Wed, 07 Aug 2024 23:00:47 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbpdb-00000006VLc-40Tq for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2024 23:00:13 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AB730614BF; Wed, 7 Aug 2024 23:00:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26D10C32781; Wed, 7 Aug 2024 23:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723071610; bh=QkTkuaRVDpA9vzbecEbJkM5kfVkcV8lY4WmiXV2vYms=; h=From:To:Cc:Subject:Date:From; b=ffZTSfCoDbtCNtiXHJ7CHdKILWGULYytRJHcEK5vAdHnfXz12aKyDkHF7Lqw+sxbb 1Vdfm3Tf2rIpdrLgiY2FYkcvSEKw2BI9ktzQBllhC9FJKWglqpM4/0sk9weDmh1NGV JUvHwfLn3XU1ZLowzRNyQUI6ktWYMAlDU1XU4YxlkjceWyupyhaY9IBLQ+IzXf8Rbf DceZX5LPflrtELRyOYmgelguz9fMyb20XuEgxusezmof+bc7GeZexe5nYfJ6s6XK+h AOVaAFX2FRWNLTkJWRsvNiQWTTCv7Qn0y+IokLKZEUTXVAr1V3kmPLtO7QSeLyLUk9 +8INAVjg89xng== From: "Rob Herring (Arm)" To: Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH] dt-bindings: memory-controllers: fsl,imx-weim: Fix "fsl,weim-cs-timing" schema Date: Wed, 7 Aug 2024 16:59:58 -0600 Message-ID: <20240807225959.3343093-1-robh@kernel.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240807_160012_082685_10DF7BB0 X-CRM114-Status: UNSURE ( 7.61 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The "fsl,weim-cs-timing" property is an array, but the constraints in the if/then schema are for a matrix. That worked fine when all properties were decoded into a matrix, but now dtschema decodes properties into scalars and arrays based on their type. Signed-off-by: Rob Herring (Arm) Acked-by: Peng Fan --- .../memory-controllers/fsl/fsl,imx-weim.yaml | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml b/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml index 3f40ca5b13f6..ce4ec94a561c 100644 --- a/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml @@ -134,9 +134,8 @@ allOf: properties: fsl,weim-cs-timing: items: - items: - - description: CSxU - - description: CSxL + - description: CSxU + - description: CSxL - if: properties: compatible: @@ -151,10 +150,9 @@ allOf: properties: fsl,weim-cs-timing: items: - items: - - description: CSCRxU - - description: CSCRxL - - description: CSCRxA + - description: CSCRxU + - description: CSCRxL + - description: CSCRxA - if: properties: compatible: @@ -171,13 +169,12 @@ allOf: properties: fsl,weim-cs-timing: items: - items: - - description: CSxGCR1 - - description: CSxGCR2 - - description: CSxRCR1 - - description: CSxRCR2 - - description: CSxWCR1 - - description: CSxWCR2 + - description: CSxGCR1 + - description: CSxGCR2 + - description: CSxRCR1 + - description: CSxRCR2 + - description: CSxWCR1 + - description: CSxWCR2 additionalProperties: false