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 38834C25B0D for ; Mon, 8 Aug 2022 01:57:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243733AbiHHBzx (ORCPT ); Sun, 7 Aug 2022 21:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243428AbiHHBxK (ORCPT ); Sun, 7 Aug 2022 21:53:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F190C1ADAD; Sun, 7 Aug 2022 18:38:56 -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 ams.source.kernel.org (Postfix) with ESMTPS id 4DEC7B80E15; Mon, 8 Aug 2022 01:38:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 099FBC433C1; Mon, 8 Aug 2022 01:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922734; bh=WcmIH+a533U14dlH39GJ7KubRDRkt0POYB71uaAxXzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMphOm63u5k8E9xf5V3LM/VFXPts7XCAfEaIlgWZk8Aa7FNLZV+/eMNFAd/HCcgYN GBaAYRCtl339aHo9+Xk+3Pto+EgEyr8CHbmZBoE2o3Yy2hE8YccRUG/CLieKKCs0h+ 8FiTXbgUCMJo1sgzZSlyFGton0iQQqPAfiBWlCzBRK458V4QiNCT3O6qU+3myuB7Gm GOoXBudrZ/r2ig5gFCl5hNvKRRy3ocagr+m4kn2ieo2fops+7lQQoE3BFqfMh+M1JH WeUUeBzcDjLFrbKaAlwy1QpmbrLt1+MPLENAcfEIRsR0k4QEVpHDyMG3NztqwVc3Z7 vwECy3VD6zG5A== 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 11/23] ARM: dts: imx6ul: fix lcdif node compatible Date: Sun, 7 Aug 2022 21:38:18 -0400 Message-Id: <20220808013832.316381-11-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: linux-kernel@vger.kernel.org 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 { }; lcdif: lcdif@21c8000 { - compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif"; + compatible = "fsl,imx6ul-lcdif", "fsl,imx6sx-lcdif"; reg = <0x021c8000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_LCDIF_PIX>, -- 2.35.1