From: Steve Longerbeam <slongerbeam@gmail.com> To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com, linux@armlinux.org.uk, mchehab@kernel.org, hverkuil@xs4all.nl, nick@shmanahar.org, markus.heiser@darmarIT.de, p.zabel@pengutronix.de, laurent.pinchart+renesas@ideasonboard.com, bparrot@ti.com, geert@linux-m68k.org, arnd@arndb.de, sudipm.mukherjee@gmail.com, minghsiu.tsai@mediatek.com, tiffany.lin@mediatek.com, jean-christophe.trotin@st.com, horms+renesas@verge.net.au, niklas.soderlund+renesas@ragnatech.se, robert.jarzmik@free.fr, songjun.wu@microchip.com, andrew-ct.chen@mediatek.com, gregkh@linuxfoundation.org, shuah@kernel.org, sakari.ailus@linux.intel.com, pavel@ucw.cz Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Steve Longerbeam <steve_longerbeam@mentor.com> Subject: [PATCH v6 05/39] ARM: dts: imx6qdl: Add mipi_ipu1/2 multiplexers, mipi_csi, and their connections Date: Mon, 27 Mar 2017 17:40:22 -0700 [thread overview] Message-ID: <1490661656-10318-6-git-send-email-steve_longerbeam@mentor.com> (raw) In-Reply-To: <1490661656-10318-1-git-send-email-steve_longerbeam@mentor.com> From: Philipp Zabel <p.zabel@pengutronix.de> This patch adds the device tree graph connecting the input multiplexers to the IPU CSIs and the MIPI-CSI2 gasket on i.MX6. The MIPI_IPU multiplexers are added as children of the iomuxc-gpr syscon device node. On i.MX6Q/D two two-input multiplexers in front of IPU1 CSI0 and IPU2 CSI1 allow to select between CSI0/1 parallel input pads and the MIPI CSI-2 virtual channels 0/3. On i.MX6DL/S two five-input multiplexers in front of IPU1 CSI0 and IPU1 CSI1 allow to select between CSI0/1 parallel input pads and any of the four MIPI CSI-2 virtual channels. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> -- - Removed some dangling/unused endpoints (ipu2_csi0_from_csi2ipu) - Renamed the mipi virtual channel endpoint labels, from "mipi_csiX_..." to "mipi_vcX...". - Added input endpoint anchors to the video muxes for the connections from parallel sensors. Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> --- arch/arm/boot/dts/imx6dl.dtsi | 180 +++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6q.dtsi | 116 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx6qdl.dtsi | 10 ++- 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 7aa120f..8958c4a 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi @@ -181,6 +181,186 @@ "di0", "di1"; }; +&gpr { + ipu1_csi0_mux: ipu1_csi0_mux@34 { + compatible = "video-multiplexer"; + reg = <0x34>; + bit-mask = <0x7>; + bit-shift = <0>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port@0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi0_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu1_csi0_mux_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi0_mux>; + }; + }; + + port@2 { + reg = <2>; + + ipu1_csi0_mux_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu1_csi0_mux>; + }; + }; + + port@3 { + reg = <3>; + + ipu1_csi0_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu1_csi0_mux>; + }; + }; + + port@4 { + reg = <4>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint { + }; + }; + + port@5 { + reg = <5>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint = <&ipu1_csi0_from_ipu1_csi0_mux>; + }; + }; + }; + + ipu1_csi1_mux: ipu1_csi1_mux@34 { + compatible = "video-multiplexer"; + reg = <0x34>; + bit-mask = <0x7>; + bit-shift = <3>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port@0 { + reg = <0>; + + ipu1_csi1_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi1_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu1_csi1_mux_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1_mux>; + }; + }; + + port@2 { + reg = <2>; + + ipu1_csi1_mux_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu1_csi1_mux>; + }; + }; + + port@3 { + reg = <3>; + + ipu1_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu1_csi1_mux>; + }; + }; + + port@4 { + reg = <4>; + + ipu1_csi1_mux_from_parallel_sensor: endpoint { + }; + }; + + port@5 { + reg = <5>; + + ipu1_csi1_mux_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_ipu1_csi1_mux>; + }; + }; + }; +}; + +&ipu1_csi1 { + ipu1_csi1_from_ipu1_csi1_mux: endpoint { + remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>; + }; +}; + +&mipi_csi { + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint@0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; + }; + + mipi_vc0_to_ipu1_csi1_mux: endpoint@1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc0>; + }; + }; + + port@2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc1_to_ipu1_csi0_mux: endpoint@0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc1>; + }; + + mipi_vc1_to_ipu1_csi1_mux: endpoint@1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc1>; + }; + }; + + port@3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc2_to_ipu1_csi0_mux: endpoint@0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc2>; + }; + + mipi_vc2_to_ipu1_csi1_mux: endpoint@1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc2>; + }; + }; + + port@4 { + reg = <4>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc3_to_ipu1_csi0_mux: endpoint@0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc3>; + }; + + mipi_vc3_to_ipu1_csi1_mux: endpoint@1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc3>; + }; + }; +}; + &vpu { compatible = "fsl,imx6dl-vpu", "cnm,coda960"; }; diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index e9a5d0b..b833b0d 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -143,10 +143,18 @@ ipu2_csi0: port@0 { reg = <0>; + + ipu2_csi0_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu2_csi0>; + }; }; ipu2_csi1: port@1 { reg = <1>; + + ipu2_csi1_from_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_to_ipu2_csi1>; + }; }; ipu2_di0: port@2 { @@ -266,6 +274,80 @@ }; }; +&gpr { + ipu1_csi0_mux: ipu1_csi0_mux@4 { + compatible = "video-multiplexer"; + reg = <0x04>; + bit-mask = <1>; + bit-shift = <19>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port@0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi0_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint { + }; + }; + + port@2 { + reg = <2>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint = <&ipu1_csi0_from_ipu1_csi0_mux>; + }; + }; + }; + + ipu2_csi1_mux: ipu2_csi1_mux@4 { + compatible = "video-multiplexer"; + reg = <0x04>; + bit-mask = <1>; + bit-shift = <20>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port@0 { + reg = <0>; + + ipu2_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu2_csi1_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu2_csi1_mux_from_parallel_sensor: endpoint { + }; + }; + + port@2 { + reg = <2>; + + ipu2_csi1_mux_to_ipu2_csi1: endpoint { + remote-endpoint = <&ipu2_csi1_from_ipu2_csi1_mux>; + }; + }; + }; +}; + +&ipu1_csi1 { + ipu1_csi1_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1>; + }; +}; + &ldb { clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>, <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>, @@ -312,6 +394,40 @@ }; }; +&mipi_csi { + port@1 { + reg = <1>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; + }; + }; + + port@2 { + reg = <2>; + + mipi_vc1_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_mipi_vc1>; + }; + }; + + port@3 { + reg = <3>; + + mipi_vc2_to_ipu2_csi0: endpoint { + remote-endpoint = <&ipu2_csi0_from_mipi_vc2>; + }; + }; + + port@4 { + reg = <4>; + + mipi_vc3_to_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_from_mipi_vc3>; + }; + }; +}; + &mipi_dsi { ports { port@2 { diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index d28a413..194badd 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -807,8 +807,10 @@ }; gpr: iomuxc-gpr@020e0000 { - compatible = "fsl,imx6q-iomuxc-gpr", "syscon"; + compatible = "fsl,imx6q-iomuxc-gpr", "syscon", "simple-mfd"; reg = <0x020e0000 0x38>; + #address-cells = <1>; + #size-cells = <0>; }; iomuxc: iomuxc@020e0000 { @@ -1136,6 +1138,8 @@ mipi_csi: mipi@021dc000 { compatible = "fsl,imx6-mipi-csi2", "snps,dw-mipi-csi2"; reg = <0x021dc000 0x4000>; + #address-cells = <1>; + #size-cells = <0>; interrupts = <0 100 0x04>, <0 101 0x04>; clocks = <&clks IMX6QDL_CLK_HSI_TX>, <&clks IMX6QDL_CLK_VIDEO_27M>, @@ -1243,6 +1247,10 @@ ipu1_csi0: port@0 { reg = <0>; + + ipu1_csi0_from_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_to_ipu1_csi0>; + }; }; ipu1_csi1: port@1 { -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: slongerbeam@gmail.com (Steve Longerbeam) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 05/39] ARM: dts: imx6qdl: Add mipi_ipu1/2 multiplexers, mipi_csi, and their connections Date: Mon, 27 Mar 2017 17:40:22 -0700 [thread overview] Message-ID: <1490661656-10318-6-git-send-email-steve_longerbeam@mentor.com> (raw) In-Reply-To: <1490661656-10318-1-git-send-email-steve_longerbeam@mentor.com> From: Philipp Zabel <p.zabel@pengutronix.de> This patch adds the device tree graph connecting the input multiplexers to the IPU CSIs and the MIPI-CSI2 gasket on i.MX6. The MIPI_IPU multiplexers are added as children of the iomuxc-gpr syscon device node. On i.MX6Q/D two two-input multiplexers in front of IPU1 CSI0 and IPU2 CSI1 allow to select between CSI0/1 parallel input pads and the MIPI CSI-2 virtual channels 0/3. On i.MX6DL/S two five-input multiplexers in front of IPU1 CSI0 and IPU1 CSI1 allow to select between CSI0/1 parallel input pads and any of the four MIPI CSI-2 virtual channels. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> -- - Removed some dangling/unused endpoints (ipu2_csi0_from_csi2ipu) - Renamed the mipi virtual channel endpoint labels, from "mipi_csiX_..." to "mipi_vcX...". - Added input endpoint anchors to the video muxes for the connections from parallel sensors. Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> --- arch/arm/boot/dts/imx6dl.dtsi | 180 +++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6q.dtsi | 116 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx6qdl.dtsi | 10 ++- 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 7aa120f..8958c4a 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi @@ -181,6 +181,186 @@ "di0", "di1"; }; +&gpr { + ipu1_csi0_mux: ipu1_csi0_mux at 34 { + compatible = "video-multiplexer"; + reg = <0x34>; + bit-mask = <0x7>; + bit-shift = <0>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port at 0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi0_mux>; + }; + }; + + port at 1 { + reg = <1>; + + ipu1_csi0_mux_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi0_mux>; + }; + }; + + port at 2 { + reg = <2>; + + ipu1_csi0_mux_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu1_csi0_mux>; + }; + }; + + port at 3 { + reg = <3>; + + ipu1_csi0_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu1_csi0_mux>; + }; + }; + + port at 4 { + reg = <4>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint { + }; + }; + + port at 5 { + reg = <5>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint = <&ipu1_csi0_from_ipu1_csi0_mux>; + }; + }; + }; + + ipu1_csi1_mux: ipu1_csi1_mux at 34 { + compatible = "video-multiplexer"; + reg = <0x34>; + bit-mask = <0x7>; + bit-shift = <3>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port at 0 { + reg = <0>; + + ipu1_csi1_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi1_mux>; + }; + }; + + port at 1 { + reg = <1>; + + ipu1_csi1_mux_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1_mux>; + }; + }; + + port at 2 { + reg = <2>; + + ipu1_csi1_mux_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu1_csi1_mux>; + }; + }; + + port at 3 { + reg = <3>; + + ipu1_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu1_csi1_mux>; + }; + }; + + port at 4 { + reg = <4>; + + ipu1_csi1_mux_from_parallel_sensor: endpoint { + }; + }; + + port at 5 { + reg = <5>; + + ipu1_csi1_mux_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_ipu1_csi1_mux>; + }; + }; + }; +}; + +&ipu1_csi1 { + ipu1_csi1_from_ipu1_csi1_mux: endpoint { + remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>; + }; +}; + +&mipi_csi { + port at 1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint at 0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; + }; + + mipi_vc0_to_ipu1_csi1_mux: endpoint at 1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc0>; + }; + }; + + port at 2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc1_to_ipu1_csi0_mux: endpoint at 0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc1>; + }; + + mipi_vc1_to_ipu1_csi1_mux: endpoint at 1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc1>; + }; + }; + + port at 3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc2_to_ipu1_csi0_mux: endpoint at 0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc2>; + }; + + mipi_vc2_to_ipu1_csi1_mux: endpoint at 1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc2>; + }; + }; + + port at 4 { + reg = <4>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc3_to_ipu1_csi0_mux: endpoint at 0 { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc3>; + }; + + mipi_vc3_to_ipu1_csi1_mux: endpoint at 1 { + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc3>; + }; + }; +}; + &vpu { compatible = "fsl,imx6dl-vpu", "cnm,coda960"; }; diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index e9a5d0b..b833b0d 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -143,10 +143,18 @@ ipu2_csi0: port at 0 { reg = <0>; + + ipu2_csi0_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu2_csi0>; + }; }; ipu2_csi1: port at 1 { reg = <1>; + + ipu2_csi1_from_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_to_ipu2_csi1>; + }; }; ipu2_di0: port at 2 { @@ -266,6 +274,80 @@ }; }; +&gpr { + ipu1_csi0_mux: ipu1_csi0_mux at 4 { + compatible = "video-multiplexer"; + reg = <0x04>; + bit-mask = <1>; + bit-shift = <19>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port at 0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi0_mux>; + }; + }; + + port at 1 { + reg = <1>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint { + }; + }; + + port at 2 { + reg = <2>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint = <&ipu1_csi0_from_ipu1_csi0_mux>; + }; + }; + }; + + ipu2_csi1_mux: ipu2_csi1_mux at 4 { + compatible = "video-multiplexer"; + reg = <0x04>; + bit-mask = <1>; + bit-shift = <20>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port at 0 { + reg = <0>; + + ipu2_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu2_csi1_mux>; + }; + }; + + port at 1 { + reg = <1>; + + ipu2_csi1_mux_from_parallel_sensor: endpoint { + }; + }; + + port at 2 { + reg = <2>; + + ipu2_csi1_mux_to_ipu2_csi1: endpoint { + remote-endpoint = <&ipu2_csi1_from_ipu2_csi1_mux>; + }; + }; + }; +}; + +&ipu1_csi1 { + ipu1_csi1_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1>; + }; +}; + &ldb { clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>, <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>, @@ -312,6 +394,40 @@ }; }; +&mipi_csi { + port at 1 { + reg = <1>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; + }; + }; + + port at 2 { + reg = <2>; + + mipi_vc1_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_mipi_vc1>; + }; + }; + + port at 3 { + reg = <3>; + + mipi_vc2_to_ipu2_csi0: endpoint { + remote-endpoint = <&ipu2_csi0_from_mipi_vc2>; + }; + }; + + port at 4 { + reg = <4>; + + mipi_vc3_to_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_from_mipi_vc3>; + }; + }; +}; + &mipi_dsi { ports { port at 2 { diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index d28a413..194badd 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -807,8 +807,10 @@ }; gpr: iomuxc-gpr at 020e0000 { - compatible = "fsl,imx6q-iomuxc-gpr", "syscon"; + compatible = "fsl,imx6q-iomuxc-gpr", "syscon", "simple-mfd"; reg = <0x020e0000 0x38>; + #address-cells = <1>; + #size-cells = <0>; }; iomuxc: iomuxc at 020e0000 { @@ -1136,6 +1138,8 @@ mipi_csi: mipi at 021dc000 { compatible = "fsl,imx6-mipi-csi2", "snps,dw-mipi-csi2"; reg = <0x021dc000 0x4000>; + #address-cells = <1>; + #size-cells = <0>; interrupts = <0 100 0x04>, <0 101 0x04>; clocks = <&clks IMX6QDL_CLK_HSI_TX>, <&clks IMX6QDL_CLK_VIDEO_27M>, @@ -1243,6 +1247,10 @@ ipu1_csi0: port at 0 { reg = <0>; + + ipu1_csi0_from_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_to_ipu1_csi0>; + }; }; ipu1_csi1: port at 1 { -- 2.7.4
next prev parent reply other threads:[~2017-03-28 0:41 UTC|newest] Thread overview: 286+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-28 0:40 [PATCH v6 00/39] i.MX Media Driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 01/39] [media] dt-bindings: Add bindings for video-multiplexer device Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-04-03 14:14 ` Rob Herring 2017-04-03 14:14 ` Rob Herring 2017-04-03 14:14 ` Rob Herring 2017-03-28 0:40 ` [PATCH v6 02/39] [media] dt-bindings: Add bindings for i.MX media driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-29 0:21 ` Rob Herring 2017-03-29 0:21 ` Rob Herring 2017-03-29 0:21 ` Rob Herring 2017-03-29 0:35 ` Steve Longerbeam 2017-03-29 0:35 ` Steve Longerbeam 2017-03-29 0:35 ` Steve Longerbeam 2017-04-03 14:07 ` Rob Herring 2017-04-03 14:07 ` Rob Herring 2017-04-03 14:07 ` Rob Herring 2017-04-03 15:15 ` Russell King - ARM Linux 2017-04-03 15:15 ` Russell King - ARM Linux 2017-04-03 15:15 ` Russell King - ARM Linux 2017-03-29 8:39 ` Russell King - ARM Linux 2017-03-29 8:39 ` Russell King - ARM Linux 2017-03-29 8:39 ` Russell King - ARM Linux 2017-04-03 14:11 ` Rob Herring 2017-04-03 14:11 ` Rob Herring 2017-04-03 14:11 ` Rob Herring 2017-04-03 15:03 ` Russell King - ARM Linux 2017-04-03 15:03 ` Russell King - ARM Linux 2017-04-03 15:03 ` Russell King - ARM Linux 2017-03-28 0:40 ` [PATCH v6 03/39] [media] dt/bindings: Add bindings for OV5640 Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-04-03 14:15 ` Rob Herring 2017-04-03 14:15 ` Rob Herring 2017-04-03 14:15 ` Rob Herring 2017-03-28 0:40 ` [PATCH v6 04/39] ARM: dts: imx6qdl: Add compatible, clocks, irqs to MIPI CSI-2 node Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam [this message] 2017-03-28 0:40 ` [PATCH v6 05/39] ARM: dts: imx6qdl: Add mipi_ipu1/2 multiplexers, mipi_csi, and their connections Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 06/39] ARM: dts: imx6qdl: add capture-subsystem device Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 07/39] ARM: dts: imx6qdl-sabrelite: remove erratum ERR006687 workaround Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 08/39] ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 09/39] ARM: dts: imx6-sabresd: " Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 10/39] ARM: dts: imx6-sabreauto: create i2cmux for i2c3 Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 11/39] ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 12/39] ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 13/39] ARM: dts: imx6-sabreauto: add the ADV7180 video decoder Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 14/39] add mux and video interface bridge entity functions Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 15/39] [media] v4l2-mc: add a function to inherit controls from a pipeline Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 16/39] [media] add Omnivision OV5640 sensor driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 17/39] platform: add video-multiplexer subdevice driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 14:12 ` Vladimir Zapolskiy 2017-03-28 14:12 ` Vladimir Zapolskiy 2017-03-28 14:12 ` Vladimir Zapolskiy 2017-04-04 12:47 ` Sakari Ailus 2017-04-04 12:47 ` Sakari Ailus 2017-04-04 12:47 ` Sakari Ailus 2017-04-12 0:50 ` Steve Longerbeam 2017-04-12 0:50 ` Steve Longerbeam 2017-04-12 0:50 ` Steve Longerbeam 2017-04-12 9:09 ` Sakari Ailus 2017-04-12 9:09 ` Sakari Ailus 2017-04-12 9:09 ` Sakari Ailus 2017-04-13 13:52 ` Philipp Zabel 2017-04-13 13:52 ` Philipp Zabel 2017-04-13 13:52 ` Philipp Zabel 2017-04-14 20:32 ` Pavel Machek 2017-04-14 20:32 ` Pavel Machek 2017-04-14 20:32 ` Pavel Machek 2017-04-18 8:09 ` Philipp Zabel 2017-04-18 8:09 ` Philipp Zabel 2017-04-18 8:09 ` Philipp Zabel 2017-04-18 9:05 ` Pavel Machek 2017-04-18 9:05 ` Pavel Machek 2017-04-18 9:05 ` Pavel Machek 2017-04-05 11:18 ` Pavel Machek 2017-04-05 11:18 ` Pavel Machek 2017-04-05 11:18 ` Pavel Machek 2017-04-05 11:58 ` Lucas Stach 2017-04-05 11:58 ` Lucas Stach 2017-04-05 11:58 ` Lucas Stach 2017-04-05 18:05 ` Pavel Machek 2017-04-05 18:05 ` Pavel Machek 2017-04-05 18:05 ` Pavel Machek 2017-03-28 0:40 ` [PATCH v6 18/39] media: Add userspace header file for i.MX Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 19/39] media: Add i.MX media core driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-30 17:25 ` [RFC] [media] imx: assume MEDIA_ENT_F_ATV_DECODER entities output video on pad 1 Philipp Zabel 2017-03-30 17:25 ` Philipp Zabel 2017-04-04 22:11 ` Steve Longerbeam 2017-04-04 22:11 ` Steve Longerbeam 2017-04-04 22:11 ` Steve Longerbeam 2017-04-05 9:43 ` Philipp Zabel 2017-04-05 9:43 ` Philipp Zabel 2017-04-05 9:43 ` Philipp Zabel 2017-04-04 23:10 ` Russell King - ARM Linux 2017-04-04 23:10 ` Russell King - ARM Linux 2017-04-04 23:10 ` Russell King - ARM Linux 2017-04-05 0:40 ` Steve Longerbeam 2017-04-05 0:40 ` Steve Longerbeam 2017-04-05 0:40 ` Steve Longerbeam 2017-04-05 0:44 ` Steve Longerbeam 2017-04-05 0:44 ` Steve Longerbeam 2017-04-05 0:44 ` Steve Longerbeam 2017-04-05 8:21 ` Russell King - ARM Linux 2017-04-05 8:21 ` Russell King - ARM Linux 2017-04-05 8:21 ` Russell King - ARM Linux 2017-04-05 9:34 ` Philipp Zabel 2017-04-05 9:34 ` Philipp Zabel 2017-04-05 9:34 ` Philipp Zabel 2017-04-05 13:55 ` Javier Martinez Canillas 2017-04-05 13:55 ` Javier Martinez Canillas 2017-04-05 13:55 ` Javier Martinez Canillas 2017-04-05 13:55 ` Javier Martinez Canillas 2017-04-05 14:53 ` Mauro Carvalho Chehab 2017-04-05 14:53 ` Mauro Carvalho Chehab 2017-04-05 14:53 ` Mauro Carvalho Chehab 2017-04-05 15:39 ` Devin Heitmueller 2017-04-05 15:39 ` Devin Heitmueller 2017-04-05 15:39 ` Devin Heitmueller 2017-04-05 16:17 ` Mauro Carvalho Chehab 2017-04-05 16:17 ` Mauro Carvalho Chehab 2017-04-05 16:17 ` Mauro Carvalho Chehab 2017-04-05 17:02 ` Devin Heitmueller 2017-04-05 17:02 ` Devin Heitmueller 2017-04-05 17:02 ` Devin Heitmueller 2017-04-05 17:16 ` Mauro Carvalho Chehab 2017-04-05 17:16 ` Mauro Carvalho Chehab 2017-04-05 17:16 ` Mauro Carvalho Chehab 2017-04-06 9:57 ` Philipp Zabel 2017-04-06 9:57 ` Philipp Zabel 2017-04-06 9:57 ` Philipp Zabel 2017-04-05 11:32 ` [PATCH v6 19/39] media: Add i.MX media core driver Pavel Machek 2017-04-05 11:32 ` Pavel Machek 2017-04-05 11:32 ` Pavel Machek 2017-04-05 11:34 ` Pavel Machek 2017-04-05 11:34 ` Pavel Machek 2017-04-05 11:34 ` Pavel Machek 2017-04-06 9:43 ` Philipp Zabel 2017-04-06 9:43 ` Philipp Zabel 2017-04-06 9:43 ` Philipp Zabel 2017-04-06 23:51 ` Steve Longerbeam 2017-04-06 23:51 ` Steve Longerbeam 2017-04-06 23:51 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 20/39] media: imx: Add Capture Device Interface Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 21/39] media: imx: Add CSI subdev driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-04-06 13:55 ` [PATCH] [media] imx: csi: retain current field order and colorimetry setting as default Philipp Zabel 2017-04-06 13:55 ` Philipp Zabel 2017-04-06 13:55 ` Philipp Zabel 2017-04-06 14:05 ` Russell King - ARM Linux 2017-04-06 14:05 ` Russell King - ARM Linux 2017-04-06 14:05 ` Russell King - ARM Linux 2017-04-06 15:01 ` Philipp Zabel 2017-04-06 15:01 ` Philipp Zabel 2017-04-06 15:01 ` Philipp Zabel 2017-04-06 15:10 ` Russell King - ARM Linux 2017-04-06 15:10 ` Russell King - ARM Linux 2017-04-06 15:10 ` Russell King - ARM Linux 2017-04-06 15:25 ` Philipp Zabel 2017-04-06 15:25 ` Philipp Zabel 2017-04-06 15:25 ` Philipp Zabel 2017-04-13 0:33 ` Steve Longerbeam 2017-04-13 0:33 ` Steve Longerbeam 2017-04-13 0:33 ` Steve Longerbeam 2017-04-13 0:45 ` [PATCH 40/40] media: imx: set and propagate empty field, colorimetry params Steve Longerbeam 2017-04-13 10:09 ` Philipp Zabel 2017-04-13 16:40 ` Steve Longerbeam 2017-04-18 9:30 ` Philipp Zabel 2017-05-08 9:41 ` Philipp Zabel 2017-05-09 3:44 ` Steve Longerbeam 2017-04-06 14:20 ` [PATCH] [media] imx: csi: retain current field order and colorimetry setting as default Hans Verkuil 2017-04-06 14:20 ` Hans Verkuil 2017-04-06 14:20 ` Hans Verkuil 2017-04-06 14:38 ` Russell King - ARM Linux 2017-04-06 14:38 ` Russell King - ARM Linux 2017-04-06 14:38 ` Russell King - ARM Linux 2017-04-06 14:54 ` Philipp Zabel 2017-04-06 14:54 ` Philipp Zabel 2017-04-06 14:54 ` Philipp Zabel 2017-04-06 15:43 ` Hans Verkuil 2017-04-06 15:43 ` Hans Verkuil 2017-04-06 15:43 ` Hans Verkuil 2017-04-06 16:01 ` Philipp Zabel 2017-04-06 16:01 ` Philipp Zabel 2017-04-06 16:01 ` Philipp Zabel 2017-04-12 7:03 ` Hans Verkuil 2017-04-12 7:03 ` Hans Verkuil 2017-04-12 7:03 ` Hans Verkuil 2017-04-13 10:07 ` Philipp Zabel 2017-04-13 10:07 ` Philipp Zabel 2017-04-13 10:07 ` Philipp Zabel 2017-04-06 15:18 ` Philipp Zabel 2017-04-06 15:18 ` Philipp Zabel 2017-04-06 15:18 ` Philipp Zabel 2017-05-08 8:27 ` Hans Verkuil 2017-05-08 8:27 ` Hans Verkuil 2017-05-08 8:27 ` Hans Verkuil 2017-05-08 9:36 ` Philipp Zabel 2017-05-08 9:36 ` Philipp Zabel 2017-05-08 9:36 ` Philipp Zabel 2017-05-08 10:12 ` Hans Verkuil 2017-05-08 10:12 ` Hans Verkuil 2017-05-08 10:12 ` Hans Verkuil 2017-03-28 0:40 ` [PATCH v6 22/39] media: imx: Add VDIC subdev driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 23/39] media: imx: Add IC subdev drivers Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 24/39] media: imx: Add MIPI CSI-2 Receiver subdev driver Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 25/39] ARM: imx_v6_v7_defconfig: Enable staging video4linux drivers Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 26/39] media: imx: add support for bayer formats Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 27/39] media: imx: csi: " Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 28/39] media: imx: csi: fix crop rectangle changes in set_fmt Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 29/39] media: imx: csi: add __csi_get_fmt Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 30/39] media: imx: csi/fim: add support for frame intervals Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 31/39] media: imx: redo pixel format enumeration and negotiation Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 32/39] media: imx: csi: add frame skipping support Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 33/39] media: imx: csi: Avoid faulty sensor frames at stream start Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 34/39] media: imx: csi: fix crop rectangle reset in sink set_fmt Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 35/39] media: imx: propagate sink pad formats to source pads Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 36/39] media: imx: csi: add sink selection rectangles Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 37/39] media: imx-csi: add frame size/interval enumeration Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 38/39] media: imx-ic-prpencvf: add frame size enumeration Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-28 0:40 ` [PATCH v6 39/39] media: imx-media-capture: add frame sizes/interval enumeration Steve Longerbeam 2017-03-28 0:40 ` Steve Longerbeam 2017-03-30 11:02 ` [PATCH v6 00/39] i.MX Media Driver Russell King - ARM Linux 2017-03-30 11:02 ` Russell King - ARM Linux 2017-03-30 11:02 ` Russell King - ARM Linux 2017-03-30 16:12 ` Steve Longerbeam 2017-03-30 16:12 ` Steve Longerbeam 2017-03-30 16:12 ` Steve Longerbeam 2017-03-30 16:27 ` Russell King - ARM Linux 2017-03-30 16:27 ` Russell King - ARM Linux 2017-03-30 16:27 ` Russell King - ARM Linux
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1490661656-10318-6-git-send-email-steve_longerbeam@mentor.com \ --to=slongerbeam@gmail.com \ --cc=andrew-ct.chen@mediatek.com \ --cc=arnd@arndb.de \ --cc=bparrot@ti.com \ --cc=devel@driverdev.osuosl.org \ --cc=devicetree@vger.kernel.org \ --cc=fabio.estevam@nxp.com \ --cc=geert@linux-m68k.org \ --cc=gregkh@linuxfoundation.org \ --cc=horms+renesas@verge.net.au \ --cc=hverkuil@xs4all.nl \ --cc=jean-christophe.trotin@st.com \ --cc=kernel@pengutronix.de \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=markus.heiser@darmarIT.de \ --cc=mchehab@kernel.org \ --cc=minghsiu.tsai@mediatek.com \ --cc=nick@shmanahar.org \ --cc=niklas.soderlund+renesas@ragnatech.se \ --cc=p.zabel@pengutronix.de \ --cc=pavel@ucw.cz \ --cc=robert.jarzmik@free.fr \ --cc=robh+dt@kernel.org \ --cc=sakari.ailus@linux.intel.com \ --cc=shawnguo@kernel.org \ --cc=shuah@kernel.org \ --cc=songjun.wu@microchip.com \ --cc=steve_longerbeam@mentor.com \ --cc=sudipm.mukherjee@gmail.com \ --cc=tiffany.lin@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.