From nobody Mon Sep 29 22:45:04 2025 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 A72EBC00140 for ; Mon, 15 Aug 2022 22:34:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348647AbiHOWep (ORCPT ); Mon, 15 Aug 2022 18:34:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351061AbiHOW1b (ORCPT ); Mon, 15 Aug 2022 18:27:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B91116CF7D; Mon, 15 Aug 2022 12:46:41 -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 58A976122C; Mon, 15 Aug 2022 19:46:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 436A4C433D6; Mon, 15 Aug 2022 19:46:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660592800; bh=EixTL5yY3x6DpFjd9mtu7FvtvO6e++FT6rEJn0V1IyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sau4JvbKwFvYa0BCrxcCjBz/heZBXnxcYtMToLbcgVrySPsDYRfAiTWu66XQeDF5M BnA3QRMRysw2vfdFAwWBfWUcLf+9JEq+XjuIIdvjPPlkvS0WNh7+dlM6s8ZnwVJiea HBJQ6bH1Un2M9oV/5m4DjeOyllTF2aDfkjOjvzsU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Stein , Shawn Guo , Sasha Levin Subject: [PATCH 5.19 0166/1157] ARM: dts: imx6ul: fix csi node compatible Date: Mon, 15 Aug 2022 19:52:02 +0200 Message-Id: <20220815180446.344176802@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 df8b4ad62418..367657a9a99f 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -999,7 +999,7 @@ cpu_speed_grade: speed-grade@10 { }; =20 csi: csi@21c4000 { - compatible =3D "fsl,imx6ul-csi", "fsl,imx7-csi"; + compatible =3D "fsl,imx6ul-csi"; reg =3D <0x021c4000 0x4000>; interrupts =3D ; clocks =3D <&clks IMX6UL_CLK_CSI>; --=20 2.35.1