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 BFCF0C47077 for ; Tue, 16 Jan 2024 20:02:19 +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=JvPS1hCWTI+x2tiSrZ0Hj7atUCt0x3XhgMYT4bWH7Ls=; b=QSGWteqyh1Rxv9 08NSYi5384bg391FHx2CU76VLe7AMufVB3CWoR+BuXih4Jc6zfPSiFhXIwi2zlhthu+1sm6fDAWGb CiCY17EtP0td/C91ujegKCJ9pweFSV0HzHXkPP/+1C9F+EB45XPjDphqvEuNP1vMvtebTy08eLhfW gyGicrVGPsHzE/czG1+KdvYf/eMQRFisGt0OqzgzDrWo5SZsY6nq+vHtq8TzSiIDPv1107OOHY8Or 5kjL9AR32Hw32zCjGRY608bH9BIxbmqrELPxVjmDiJviyyiJFGI4kkEyDDRbwwmxxBgAvV9/rVkr+ N1VNJGSZD38S0ZtC0xbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPpd7-00DKCD-2W; Tue, 16 Jan 2024 20:01:49 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rPpd1-00DK8j-0v for linux-arm-kernel@lists.infradead.org; Tue, 16 Jan 2024 20:01:44 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id BB9F4611AD; Tue, 16 Jan 2024 20:01:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68292C433F1; Tue, 16 Jan 2024 20:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435272; bh=fGprZBy3+nxeed8ydxo3YYBwrhSwqEY2nnUHhL1DVcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dYPsQhj5OZ4luDzPUHcBNCd/a1aKj4b/d6QtIJtI9EMT23FE7E6Tm5HVCmEPPXwZ8 6T6KXBf1bjpznSvoHiIeySgK7+USnbBL6PXov34MEXn0p/1yeo0O+fPRTYDhdLNr7P 3MQKbV/yHRWKPPX8x44tYEq5QEdLs+hb6+xCFrSpnkfuuMONnpmKbsLtPsiVPxfxOd 6+4bCPB3qmzrbRefeTtiIUTlNW/6+N9KOgwezXwCN2Gb55Bom6tAqhSlRRAMc3NuXJ Uvq2DWXxZhsiszrSVx3MrYeJdey6merf/tuUf62wbrQkKW+yx84t9kyOJAcnWktAmW hH42X3PngKS2A== 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, conor+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 10/44] ARM: dts: imx7s: Fix lcdif compatible Date: Tue, 16 Jan 2024 14:59:39 -0500 Message-ID: <20240116200044.258335-10-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116200044.258335-1-sashal@kernel.org> References: <20240116200044.258335-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.208 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240116_120143_364220_AFF6D221 X-CRM114-Status: GOOD ( 10.33 ) 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 5f55da4cc37051cda600ea870ce8cf29f1297715 ] imx7d-lcdif is compatible to imx6sx-lcdif. MXSFB_V6 supports overlay by using LCDC_AS_CTRL register. This registers used by overlay plane: * LCDC_AS_CTRL * LCDC_AS_BUF * LCDC_AS_NEXT_BUF are listed in i.MX7D RM as well. Signed-off-by: Alexander Stein Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx7s.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 622c60bd8b75..31ccf65d159b 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -773,7 +773,7 @@ csi_from_csi_mux: endpoint { }; lcdif: lcdif@30730000 { - compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif"; + compatible = "fsl,imx7d-lcdif", "fsl,imx6sx-lcdif"; reg = <0x30730000 0x10000>; interrupts = ; clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>, -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel