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 2BFABC3DA4A for ; Mon, 19 Aug 2024 12:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To: Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KDWbV9V6t7wg2pHmJNGXv9cvcC96LcjS2aQUpNg6Q0U=; b=1VVaeZGzaW6JViq5NAlXzwLh38 umlR6e0f29tqrjDu/Q0K4rD/MNySGT+FzHiuoqaQ//qjco/Up8c9Gh7AoPtn/AEWDzbOErKS1lal+ vMDstX57ZsCZioZtKRRwO+TQkxu4UaoR7R/6CSM4fcL5fJMkZEmC1B9Yl64o5lt6Ld0aIIP/qygQo mBhBtBuudIIilX+Ej5yoKL6d6FeP304O3fsorXYy1Ws1eCaDtqQR+NOy247JjAqCbRHk3q8lL23eF rCOL0pi7v9yvzaKmGNDQXX9sSM266BYjz8VlcZmKH3++rbNqnj5/zeqWlU45zcx+GhqBcfT41Ly9r oPwBbePg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg13A-00000001KKw-0kRW; Mon, 19 Aug 2024 11:59:52 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg0yX-00000001JDQ-3mjD for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 11:55:07 +0000 Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 926615A5; Mon, 19 Aug 2024 13:54:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1724068441; bh=ADWXrDlK2TOC5ed5aHz13xfeLULR1CvNY44felqqWPg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VVt7sf+/OjCJ4gDuztQSjs7CK3kSDFyG7ygZDiFtlt8bE2xkzbYauPGAv5fleXH8j jwmsHviZSqkMzZLMfjdyZp9vWSweRtLhRNcoiiZcJU5YsDvRKhiAxmj7rIvQV4TuUG N4vt3+bXvMyZAQ2XUeSLs8ujDga2MrTHwB8IYIkQ= Date: Mon, 19 Aug 2024 14:54:35 +0300 From: Laurent Pinchart To: Adam Ford Cc: Alexander Stein , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Paul Elder , Conor Dooley , Fabio Estevam , Krzysztof Kozlowski , Marek Vasut , Peng Fan , Rob Herring , Sascha Hauer , Shawn Guo , Pengutronix Kernel Team , devicetree@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [PATCH v4] arm64: dts: imx8mp: Add DT nodes for the two ISPs Message-ID: <20240819115435.GA13022@pendragon.ideasonboard.com> References: <20240814161451.32119-1-laurent.pinchart@ideasonboard.com> <13578505.uLZWGnKmhe@steina-w> <20240817182546.GC29320@pendragon.ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_045506_137661_FC201CEE X-CRM114-Status: GOOD ( 38.01 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Adam, On Sun, Aug 18, 2024 at 01:33:26PM -0500, Adam Ford wrote: > On Sat, Aug 17, 2024 at 1:26 PM Laurent Pinchart wrote: > > On Thu, Aug 15, 2024 at 02:05:39PM +0200, Alexander Stein wrote: > > > Am Mittwoch, 14. August 2024, 18:14:51 CEST schrieb Laurent Pinchart: > > > > From: Paul Elder > > > > > > > > The ISP supports both CSI and parallel interfaces, where port 0 > > > > corresponds to the former and port 1 corresponds to the latter. Since > > > > the i.MX8MP's ISPs are connected by the parallel interface to the CSI > > > > receiver, set them both to port 1. > > > > > > > > Signed-off-by: Paul Elder > > > > Signed-off-by: Laurent Pinchart > > > > --- > > > > Changes since v3: > > > > > > > > - Add comment regarding the IMX8MP_CLK_MEDIA_ISP clock rate > > > > - Fix assigned-clock-rates > > > > - Dropping Tested-by as the clock configuration has changed > > > > > > > > Changes since v2: > > > > > > > > - Assign clock parent and frequency in blk-ctrl > > > > > > > > Changes since v1: > > > > > > > > - Fix clock ordering > > > > - Add #address-cells and #size-cells to ports nodes > > > > --- > > > > arch/arm64/boot/dts/freescale/imx8mp.dtsi | 57 ++++++++++++++++++++++- > > > > 1 file changed, 55 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi > > > > index d9b5c40f6460..f3531cfb0d79 100644 > > > > --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi > > > > +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi > > > > @@ -1673,6 +1673,50 @@ isi_in_1: endpoint { > > > > }; > > > > }; > > > > > > > > + isp_0: isp@32e10000 { > > > > + compatible = "fsl,imx8mp-isp"; > > > > + reg = <0x32e10000 0x10000>; > > > > + interrupts = ; > > > > + clocks = <&clk IMX8MP_CLK_MEDIA_ISP_ROOT>, > > > > + <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>, > > > > + <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; > > > > + clock-names = "isp", "aclk", "hclk"; > > > > + power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_ISP>; > > > > + fsl,blk-ctrl = <&media_blk_ctrl 0>; > > > > + status = "disabled"; > > > > + > > > > + ports { > > > > + #address-cells = <1>; > > > > + #size-cells = <0>; > > > > + > > > > + port@1 { > > > > + reg = <1>; > > > > + }; > > > > + }; > > > > + }; > > > > + > > > > + isp_1: isp@32e20000 { > > > > + compatible = "fsl,imx8mp-isp"; > > > > + reg = <0x32e20000 0x10000>; > > > > + interrupts = ; > > > > + clocks = <&clk IMX8MP_CLK_MEDIA_ISP_ROOT>, > > > > + <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>, > > > > + <&clk IMX8MP_CLK_MEDIA_APB_ROOT>; > > > > + clock-names = "isp", "aclk", "hclk"; > > > > + power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_ISP>; > > > > + fsl,blk-ctrl = <&media_blk_ctrl 1>; > > > > + status = "disabled"; > > > > + > > > > + ports { > > > > + #address-cells = <1>; > > > > + #size-cells = <0>; > > > > + > > > > + port@1 { > > > > + reg = <1>; > > > > + }; > > > > + }; > > > > + }; > > > > + > > > > dewarp: dwe@32e30000 { > > > > compatible = "nxp,imx8mp-dw100"; > > > > reg = <0x32e30000 0x10000>; > > > > @@ -1869,17 +1913,26 @@ media_blk_ctrl: blk-ctrl@32ec0000 { > > > > clock-names = "apb", "axi", "cam1", "cam2", > > > > "disp1", "disp2", "isp", "phy"; > > > > > > > > + /* > > > > + * The ISP maximum frequency is 400MHz in normal mode > > > > + * and 500MHz in overdrive mode. The 400MHz operating > > > > + * point hasn't been successfully tested yet, so set > > > > + * IMX8MP_CLK_MEDIA_ISP to 500MHz for the time being. > > > > + */ > > > > assigned-clocks = <&clk IMX8MP_CLK_MEDIA_AXI>, > > > > <&clk IMX8MP_CLK_MEDIA_APB>, > > > > <&clk IMX8MP_CLK_MEDIA_DISP1_PIX>, > > > > <&clk IMX8MP_CLK_MEDIA_DISP2_PIX>, > > > > + <&clk IMX8MP_CLK_MEDIA_ISP>, > > > > <&clk IMX8MP_VIDEO_PLL1>; > > > > assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>, > > > > <&clk IMX8MP_SYS_PLL1_800M>, > > > > <&clk IMX8MP_VIDEO_PLL1_OUT>, > > > > - <&clk IMX8MP_VIDEO_PLL1_OUT>; > > > > + <&clk IMX8MP_VIDEO_PLL1_OUT>, > > > > + <&clk IMX8MP_SYS_PLL2_500M>; > > > > assigned-clock-rates = <500000000>, <200000000>, > > > > - <0>, <0>, <1039500000>; > > > > + <0>, <0>, <500000000>, > > > > + <1039500000>; > > > > > > Unfortunately for some reason this reparenting doesn't work (on my platform). > > > 'media_isp' is still below IMX8MP_CLK_24M. > > > $ grep -B1 media_isp /sys/kernel/debug/clk/clk_summary > > > mipi_dsi_esc_rx 0 0 0 24000000 0 0 50000 N deviceless no_connection_id > > > media_isp 0 0 0 24000000 0 0 50000 N deviceless no_connection_id > > > media_isp_root_clk 0 0 0 24000000 0 0 50000 N 32e10000.isp isp > > > > Hmmm... I get > > > > sys_pll2_500m 3 3 0 500000000 0 0 50000 Y deviceless no_connection_id > > media_isp 0 0 0 500000000 0 0 50000 N deviceless no_connection_id > > media_isp_root_clk 0 0 0 500000000 0 0 50000 N 32e10000.isp isp > > > > > I have to add this diff for isp_0 (and isp_1 if you use it): > > > --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi > > > +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi > > > @@ -1683,6 +1683,9 @@ isp_0: isp@32e10000 { > > > clock-names = "isp", "aclk", "hclk"; > > > power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_ISP>; > > > fsl,blk-ctrl = <&media_blk_ctrl 0>; > > > + assigned-clocks = <&clk IMX8MP_CLK_MEDIA_ISP>; > > > + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; > > > + assigned-clock-rates = <500000000>; > > > status = "disabled"; > > > > > > ports { > > > > > > Now clock is setup properly: > > > $ grep -B1 media_isp /sys/kernel/debug/clk/clk_summary > > > sys_pll2_500m 3 3 0 500000000 0 0 50000 Y deviceless no_connection_id > > > media_isp 0 0 0 500000000 0 0 50000 N deviceless no_connection_id > > > media_isp_root_clk 0 0 0 500000000 0 0 50000 N 32e10000.isp isp > > > > I'm not sure why that's the case, I don't have assigned-clock* > > properties in the ISP nodes in my device tree and things still work > > properly. Would you be able to investigate ? > > For what it's worth, when I remove the extra <0> clock reference on my > board like: > > --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi > @@ -1927,7 +1927,7 @@ media_blk_ctrl: blk-ctrl@32ec0000 { > <&clk IMX8MP_VIDEO_PLL1_OUT>, > <&clk IMX8MP_SYS_PLL2_500M>; > assigned-clock-rates = <500000000>, <200000000>, > - <0>, <0>, <0>, <500000000>, > + <0>, <0>, <500000000>, You're looking at v3, v4 doesn't have the extra 0. > <1039500000>; > #power-domain-cells = <1>; > > > I am able to get: > > sys_pll2_500m 1 1 0 > 500000000 0 0 50000 Y deviceless > no_connection_id > media_isp 0 0 0 > 500000000 0 0 50000 N > deviceless no_connection_id > media_isp_root_clk 0 0 0 > 500000000 0 0 50000 N > 32e10000.isp isp > > > The video pll is also set to 1039500000 > > > > > #power-domain-cells = <1>; > > > > > > > > lvds_bridge: bridge@5c { > > > > > > > > base-commit: 7c626ce4bae1ac14f60076d00eafe71af30450ba > > > > prerequisite-patch-id: ad2bbccf3b0f27415fb14851cec52c431ccb354f -- Regards, Laurent Pinchart