From patchwork Wed Nov 29 09:31:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13472526 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="H+GaGd/M" Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B972213F; Wed, 29 Nov 2023 01:31:43 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-135.catv02.itscom.jp [175.177.49.135]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 736FA2B6; Wed, 29 Nov 2023 10:30:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701250265; bh=Ivci0RIdZox1QiCzMM0eBouiiFmKKEtb5YIkQNAQ3HY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H+GaGd/Mvd577CKM47ZqEdGDKy7TtRBM1fO5smyYn1ulrdAlXRM531mw/N7Gtc6pO z5eq3XiCNsg/DCUIox2IIOncFaiDOOiEQyxZB3EIWMTRbct/whRTJSDTJmb0QTsGg6 V1c1Q5R+yo8ALwsM413vSDzzchnsk0di9AiaKJeI= From: Paul Elder To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Cc: kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Paul Elder , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Marek Vasut , Alexander Stein , Lucas Stach , Adam Ford , Laurent Pinchart , Frank Li , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] arm64: dts: imx8mp: Add DT nodes for the two ISPs Date: Wed, 29 Nov 2023 18:31:12 +0900 Message-Id: <20231129093113.255161-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129093113.255161-1-paul.elder@ideasonboard.com> References: <20231129093113.255161-1-paul.elder@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Reviewed-by: Alexander Stein --- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 50 +++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index c9a610ba4836..25579d4c58f2 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -1604,6 +1604,56 @@ 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"; + assigned-clocks = <&clk IMX8MP_CLK_MEDIA_ISP>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; + assigned-clock-rates = <500000000>; + 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"; + assigned-clocks = <&clk IMX8MP_CLK_MEDIA_ISP>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; + assigned-clock-rates = <500000000>; + 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>; From patchwork Wed Nov 29 09:31:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13472527 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="duQqJegx" Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D85E1FEE; Wed, 29 Nov 2023 01:31:58 -0800 (PST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-135.catv02.itscom.jp [175.177.49.135]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B58862B6; Wed, 29 Nov 2023 10:31:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1701250281; bh=mJ4UNX0sJTsJlj1KPGeUn8FdbosXEmT20xBZ0fX5pX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=duQqJegxA5ltyL5+sJyfwSIfVzIqTNLz+OKkqLm9ide36PPT8xVHacN4dMCVOf2In pTYGKFYC+aIxpbS4kuZurW4SKH4AWpxl9giTw8JquWA5GQKJEdmSApWwFvRKccfiRr qmivmYMYL33yKhAbxbQaHM+q8Spy/5CFpJkklQF0= From: Paul Elder To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Cc: kieran.bingham@ideasonboard.com, tomi.valkeinen@ideasonboard.com, umang.jain@ideasonboard.com, Laurent Pinchart , Paul Elder , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Tim Harvey , Philippe Schenker , Alexander Stein , Marek Vasut , Gregor Herburger , Marcel Ziswiler , linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCH 2/2] arm64: dts: imx8mp: Add overlays for ISP instances Date: Wed, 29 Nov 2023 18:31:13 +0900 Message-Id: <20231129093113.255161-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129093113.255161-1-paul.elder@ideasonboard.com> References: <20231129093113.255161-1-paul.elder@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Laurent Pinchart Add two overlay to enable each ISP instance. The ISP is wired directly to the CSIS for now, bypassing the ISI completely. Signed-off-by: Laurent Pinchart Signed-off-by: Paul Elder Tested-by: Alexander Stein --- arch/arm64/boot/dts/freescale/Makefile | 2 ++ .../arm64/boot/dts/freescale/imx8mp-isp1.dtso | 36 +++++++++++++++++++ .../arm64/boot/dts/freescale/imx8mp-isp2.dtso | 36 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-isp1.dtso create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-isp2.dtso diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 300049037eb0..f97dfac11189 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -113,6 +113,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk2.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk3.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb +dtb-$(CONFIG_ARCH_MXC) += imx8mp-isp1.dtbo +dtb-$(CONFIG_ARCH_MXC) += imx8mp-isp2.dtbo dtb-$(CONFIG_ARCH_MXC) += imx8mp-msc-sm2s-ep1.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-phyboard-pollux-rdk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl.dtb diff --git a/arch/arm64/boot/dts/freescale/imx8mp-isp1.dtso b/arch/arm64/boot/dts/freescale/imx8mp-isp1.dtso new file mode 100644 index 000000000000..cf394ed224ab --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8mp-isp1.dtso @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2022 Ideas on Board Oy + */ + +/dts-v1/; +/plugin/; + +#include + +&isi_0 { + status = "disabled"; + + ports { + port@0 { + /delete-node/ endpoint; + }; + }; +}; + +&isp_0 { + status = "okay"; + + ports { + port@1 { + isp0_in: endpoint { + bus-type = ; + remote-endpoint = <&mipi_csi_0_out>; + }; + }; + }; +}; + +&mipi_csi_0_out { + remote-endpoint = <&isp0_in>; +}; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-isp2.dtso b/arch/arm64/boot/dts/freescale/imx8mp-isp2.dtso new file mode 100644 index 000000000000..14e2e7b2617f --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8mp-isp2.dtso @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2022 Ideas on Board Oy + */ + +/dts-v1/; +/plugin/; + +#include + +&isi_0 { + status = "disabled"; + + ports { + port@1 { + /delete-node/ endpoint; + }; + }; +}; + +&isp_1 { + status = "okay"; + + ports { + port@1 { + isp1_in: endpoint { + bus-type = ; + remote-endpoint = <&mipi_csi_1_out>; + }; + }; + }; +}; + +&mipi_csi_1_out { + remote-endpoint = <&isp1_in>; +};