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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F7BEC19F2A for ; Mon, 8 Aug 2022 01:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243041AbiHHByK (ORCPT ); Sun, 7 Aug 2022 21:54:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243008AbiHHBwM (ORCPT ); Sun, 7 Aug 2022 21:52:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EBF91A838; Sun, 7 Aug 2022 18:38:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2BC0E60E06; Mon, 8 Aug 2022 01:38:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92115C433D6; Mon, 8 Aug 2022 01:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922732; bh=CHAfi8RG6Y3qlyffJKQm/h2oiI7oGKsjeZoVNgbZNX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IyJK4tJvb4I5sa1p6uC4PydOJsnpUWnEuIm8JMx46T5EwkTUL3FbDtHm4ufkKSovr TQ8qKwonD0Kj7Zj5DZ6jnVU18aDjBLR4eWQLagnMxoH4OSappWpqoi+pN7ABVcNhKs idArx82ZwTKf8rOxmdA3p1wgnuobPvTJX43zPt7d4pca04ksVV99g2zJJluVK0jhS+ ccORg85BhMePtqmakRUAVdFn8KutOODNFKuLu/QCKv1oZL6fNsONQy1s2wSQFsp2SL PkaI3gJh0twi7oXm/L5t30Wlz3aoNSNByUdQZZXxgiwvI7ddU1XiEYN0PaIlD2modd MtuRRD+PSkxFg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Stein , Shawn Guo , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 10/23] ARM: dts: imx6ul: fix csi node compatible Date: Sun, 7 Aug 2022 21:38:17 -0400 Message-Id: <20220808013832.316381-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013832.316381-1-sashal@kernel.org> References: <20220808013832.316381-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Alexander Stein [ Upstream commit e0aca931a2c7c29c88ebf37f9c3cd045e083483d ] "fsl,imx6ul-csi" was never listed as compatible to "fsl,imx7-csi", neither in yaml bindings, nor previous txt binding. Remove the imx7 part. Fixes the dt schema check warning: csi@21c4000: compatible: 'oneOf' conditional failed, one must be fixed: ['fsl,imx6ul-csi', 'fsl,imx7-csi'] is too long Additional items are not allowed ('fsl,imx7-csi' was unexpected) 'fsl,imx8mm-csi' was expected Signed-off-by: Alexander Stein Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx6ul.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index baf4a41a9aa9..3fd02e10170a 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -967,7 +967,7 @@ cpu_speed_grade: speed-grade@10 { }; csi: csi@21c4000 { - compatible = "fsl,imx6ul-csi", "fsl,imx7-csi"; + compatible = "fsl,imx6ul-csi"; reg = <0x021c4000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_CSI>; -- 2.35.1