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 1481DC32796 for ; Tue, 23 Aug 2022 11:21:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357580AbiHWLUe (ORCPT ); Tue, 23 Aug 2022 07:20:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357819AbiHWLQn (ORCPT ); Tue, 23 Aug 2022 07:16:43 -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 9E6F7BD1C4; Tue, 23 Aug 2022 02:20: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 6797660959; Tue, 23 Aug 2022 09:20:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38DC1C433C1; Tue, 23 Aug 2022 09:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661246412; bh=WcmIH+a533U14dlH39GJ7KubRDRkt0POYB71uaAxXzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xlYKMPf9CSDtRdqD/Joc8bX4zxMMdMyz+NpQGav5XA1dUILHoP5ABS5jDmMzVMAOv g+KhbQQJq3FiA2FHvj9JDn7ligJFsGi24nwakRRV1Cvm6TdVx1Fp9eLr2fIhBLIfdb aN7lENxNKVnsmLI/Pi2yVFMZwDvdmnsofYbRaW54= 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 061/389] ARM: dts: imx6ul: fix lcdif node compatible Date: Tue, 23 Aug 2022 10:22:19 +0200 Message-Id: <20220823080118.150392609@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 1a884d17ca324531634cce82e9f64c0302bdf7de ] In yaml binding "fsl,imx6ul-lcdif" is listed as compatible to imx6sx-lcdif, but not imx28-lcdif. Change the list accordingly. Fixes the dt_binding_check warning: lcdif@21c8000: compatible: 'oneOf' conditional failed, one must be fixed: ['fsl,imx6ul-lcdif', 'fsl,imx28-lcdif'] is too long Additional items are not allowed ('fsl,imx28-lcdif' was unexpected) 'fsl,imx6ul-lcdif' is not one of ['fsl,imx23-lcdif', 'fsl,imx28-lcdif', 'fsl,imx6sx-lcdif'] 'fsl,imx6sx-lcdif' 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 3fd02e10170a..58671c6e9f31 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -976,7 +976,7 @@ csi: csi@21c4000 { }; =20 lcdif: lcdif@21c8000 { - compatible =3D "fsl,imx6ul-lcdif", "fsl,imx28-lcdif"; + compatible =3D "fsl,imx6ul-lcdif", "fsl,imx6sx-lcdif"; reg =3D <0x021c8000 0x4000>; interrupts =3D ; clocks =3D <&clks IMX6UL_CLK_LCDIF_PIX>, --=20 2.35.1