From nobody Fri Sep 5 20:25:38 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 F1A80C32772 for ; Tue, 23 Aug 2022 11:14:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243563AbiHWLO1 (ORCPT ); Tue, 23 Aug 2022 07:14:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357248AbiHWLNz (ORCPT ); Tue, 23 Aug 2022 07:13:55 -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 C6F841CD; Tue, 23 Aug 2022 02:18:13 -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 DCCDF61181; Tue, 23 Aug 2022 09:18:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E50C7C433D6; Tue, 23 Aug 2022 09:18:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661246288; bh=CHAfi8RG6Y3qlyffJKQm/h2oiI7oGKsjeZoVNgbZNX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dhhU5hefmxfR/y1eOhDL1k5kz01alBX+FhyIeecPQhGO6FN/W321HQcA1U1hRj7uP /TMe8652F3xhXnl6AVy3SIBW7kDF97L7Sh+ZVDec1+Euq0+7sP+35z7zLjfoC0fLmu nmMxQ8sc9FjCfICfV42a1SVdVI7ye3yfCJr/w4Yo= 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.4 060/389] ARM: dts: imx6ul: fix csi node compatible Date: Tue, 23 Aug 2022 10:22:18 +0200 Message-Id: <20220823080118.109809955@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@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 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 { }; =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