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 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 15E8EC25B0C for ; Mon, 8 Aug 2022 01:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oGfs/qVjaZRI5Bx/td9ryYTHJ2Of1D0rcLksSV8lY+8=; b=eU7pawO3EBlbUN 1vNd54oStR8nUOxEF4Bj3tiIGmKbJgY+SGGUcNMpOzpn1BqKX+A17AYv4uHX84S6liZT4niuBkZY2 4cTMJ3g8LctrZtBufsCBZjcBjdw/DOvbEJla/3mBilWmY8hQXo2qcEvkgWY4/zbOqk6exPpr6Nk9G PTEE2ZZDCDIfKI/XY5g9/D8PHvNI9zwVcG1pZLqMThWJ01HTLm1xBDemMVBrKaR6W/LJUP9HLM827 VHZsIWqpzVSdCSrq0UYI7razKn5z2gVUhHqzmGJtE6RPjBWo13pl3wWYlexC4YFKT62GkMu7v6jjl XeQUAhqnhH+Aecq56hmQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKrhu-007eMT-PU; Mon, 08 Aug 2022 01:37:27 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKrdP-007bmb-Jj for linux-arm-kernel@lists.infradead.org; Mon, 08 Aug 2022 01:32:49 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id 488A7B80E06; Mon, 8 Aug 2022 01:32:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E63BAC43141; Mon, 8 Aug 2022 01:32:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922364; bh=EixTL5yY3x6DpFjd9mtu7FvtvO6e++FT6rEJn0V1IyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pnXdgkmCT7CFQrAtW2eftXZQp3HK3o6/dGvQHl+QZ9JJqMBoivkeKKAh+OBTQMZ9w xKoQ64se7eSxVTBANuZhJRGVXMOx5h8SiJGY2zBOol336KsLGurKxJKAhPMqevb1Hx l/XEaKNOj74XZG570SaXkdR9ksb1Xhok9k6mPg1mc/rTSZ9uEUgrIKrF34Nq9QIan4 iBOAEgpFM3+co4G6TqeN+vA1UiaoBmnPXkyZvYDLi+0qkrbATVGwfM7sVobSGBzM+T CAr/kLVcWG0sdeCbs/ZmVzk83EE2cMjAhIyxQzxGko/ompIOs+Zp4ffn8Yf13xIOSZ BLp2BjbYMGMuQ== 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.19 26/58] ARM: dts: imx6ul: fix csi node compatible Date: Sun, 7 Aug 2022 21:30:44 -0400 Message-Id: <20220808013118.313965-26-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013118.313965-1-sashal@kernel.org> References: <20220808013118.313965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220807_183247_864016_B9A2D3A0 X-CRM114-Status: GOOD ( 11.81 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 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 { }; 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel