From: Ying Liu <gnuiyl@gmail.com>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: linux-media@vger.kernel.org,
Steve Longerbeam <steve_longerbeam@mentor.com>,
Marek Vasut <marex@denx.de>, Hans Verkuil <hverkuil@xs4all.nl>,
Gary Bisson <gary.bisson@boundarydevices.com>,
kernel@pengutronix.de
Subject: Re: [PATCH v2 13/21] ARM: dts: imx6qdl: Add mipi_ipu1/2 multiplexers, mipi_csi, and their connections
Date: Tue, 8 Nov 2016 16:23:34 +0800 [thread overview]
Message-ID: <CAOcKUNVUq8ATyhTBg5KYJ_MJCftCUkS6zR9p9S986nJ4jP9TEg@mail.gmail.com> (raw)
In-Reply-To: <1476466481-24030-14-git-send-email-p.zabel@pengutronix.de>
Hi Philipp,
On Sat, Oct 15, 2016 at 1:34 AM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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>
> ---
> arch/arm/boot/dts/imx6dl.dtsi | 182 +++++++++++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/imx6q.dtsi | 118 ++++++++++++++++++++++++++
> arch/arm/boot/dts/imx6qdl.dtsi | 10 ++-
> 3 files changed, 309 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
> index 3c817de..7ed4efd6f 100644
> --- a/arch/arm/boot/dts/imx6dl.dtsi
> +++ b/arch/arm/boot/dts/imx6dl.dtsi
> @@ -133,6 +133,188 @@
> "di0", "di1";
> };
>
> +&gpr {
> + ipu_csi0_mux {
> + compatible = "video-multiplexer";
> + reg = <0x34>;
> + bit-mask = <0x7>;
> + bit-shift = <0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> +
> + ipu_csi0_mux_from_mipi_csi0: endpoint {
> + remote-endpoint = <&mipi_csi0_to_ipu_csi0_mux>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> +
> + ipu_csi0_mux_from_mipi_csi1: endpoint {
> + remote-endpoint = <&mipi_csi1_to_ipu_csi0_mux>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> +
> + ipu_csi0_mux_from_mipi_csi2: endpoint {
> + remote-endpoint = <&mipi_csi2_to_ipu_csi0_mux>;
> + };
> + };
> +
> + port@3 {
> + reg = <3>;
> +
> + ipu_csi0_mux_from_mipi_csi3: endpoint {
> + remote-endpoint = <&mipi_csi3_to_ipu_csi0_mux>;
> + };
> + };
> +
> + csi0: port@4 {
> + reg = <4>;
> + };
> +
> + port@5 {
> + reg = <5>;
> +
> + ipu_csi0_mux_to_ipu1_csi0: endpoint {
> + remote-endpoint = <&ipu1_csi0_from_ipu_csi0_mux>;
> + };
> + };
> + };
> +
> + ipu_csi1_mux {
> + compatible = "video-multiplexer";
> + reg = <0x34>;
> + bit-mask = <0x7>;
> + bit-shift = <3>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> +
> + ipu_csi1_mux_from_mipi_csi0: endpoint {
> + remote-endpoint = <&mipi_csi0_to_ipu_csi1_mux>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> +
> + ipu_csi1_mux_from_mipi_csi1: endpoint {
> + remote-endpoint = <&mipi_csi1_to_ipu_csi1_mux>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> +
> + ipu_csi1_mux_from_mipi_csi2: endpoint {
> + remote-endpoint = <&mipi_csi2_to_ipu_csi1_mux>;
> + };
> + };
> +
> + port@3 {
> + reg = <3>;
> +
> + ipu_csi1_mux_from_mipi_csi3: endpoint {
> + remote-endpoint = <&mipi_csi3_to_ipu_csi1_mux>;
> + };
> + };
> +
> + csi1: port@4 {
> + reg = <4>;
> + };
> +
> + port@5 {
> + reg = <5>;
> +
> + ipu_csi1_mux_to_ipu1_csi1: endpoint {
> + remote-endpoint = <&ipu1_csi1_from_ipu_csi1_mux>;
> + };
> + };
> + };
> +};
> +
> +&ipu1_csi0 {
> + ipu1_csi0_from_ipu_csi0_mux: endpoint {
> + remote-endpoint = <&ipu_csi0_mux_to_ipu1_csi0>;
> + };
> +};
> +
> +&ipu1_csi1 {
> + ipu1_csi1_from_ipu_csi1_mux: endpoint {
> + remote-endpoint = <&ipu_csi1_mux_to_ipu1_csi1>;
> + };
> +};
> +
> +&mipi_csi {
> + port@0 {
> + reg = <0>;
> + };
> +
> + port@1 {
> + reg = <1>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + mipi_csi0_to_ipu_csi0_mux: endpoint@0 {
> + remote-endpoint = <&ipu_csi0_mux_from_mipi_csi0>;
> + };
> +
> + mipi_csi0_to_ipu_csi1_mux: endpoint@1 {
> + remote-endpoint = <&ipu_csi1_mux_from_mipi_csi0>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + mipi_csi1_to_ipu_csi0_mux: endpoint@0 {
> + remote-endpoint = <&ipu_csi0_mux_from_mipi_csi1>;
> + };
> +
> + mipi_csi1_to_ipu_csi1_mux: endpoint@1 {
> + remote-endpoint = <&ipu_csi1_mux_from_mipi_csi1>;
> + };
> + };
> +
> + port@3 {
> + reg = <3>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + mipi_csi2_to_ipu_csi0_mux: endpoint@0 {
> + remote-endpoint = <&ipu_csi0_mux_from_mipi_csi2>;
> + };
> +
> + mipi_csi2_to_ipu_csi1_mux: endpoint@1 {
> + remote-endpoint = <&ipu_csi1_mux_from_mipi_csi2>;
> + };
> + };
> +
> + port@4 {
> + reg = <4>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + mipi_csi3_to_ipu_csi0_mux: endpoint@0 {
> + remote-endpoint = <&ipu_csi0_mux_from_mipi_csi3>;
> + };
> +
> + mipi_csi3_to_ipu_csi1_mux: endpoint@1 {
> + remote-endpoint = <&ipu_csi1_mux_from_mipi_csi3>;
> + };
> + };
> +};
> +
> &vpu {
> compatible = "fsl,imx6dl-vpu", "cnm,coda960";
> };
> diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
> index 0c87a69..675723b 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_csi2ipu: endpoint {
> + remote-endpoint = <&csi2ipu_to_ipu2_csi0>;
Should be:
+ ipu2_csi0_from_mipi_csi2: endpoint {
+ remote-endpoint =
<&mipi_csi2_to_ipu2_csi0>;
> + };
> };
>
> ipu2_csi1: port@1 {
> reg = <1>;
> +
> + ipu2_csi1_from_mipi_ipu2_mux: endpoint {
> + remote-endpoint = <&mipi_ipu2_mux_to_ipu2_csi1>;
> + };
> };
>
> ipu2_di0: port@2 {
> @@ -234,6 +242,78 @@
> };
> };
>
> +&gpr {
> + mipi_ipu1_mux {
> + compatible = "video-multiplexer";
> + reg = <0x04>;
> + bit-mask = <1>;
> + bit-shift = <19>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> +
> + mipi_ipu1_mux_from_mipi_csi0: endpoint {
> + remote-endpoint = <&mipi_csi0_to_mipi_ipu1_mux>;
> + };
> + };
> +
> + csi0: port@1 {
> + reg = <1>;
> + };
> +
> + port@2 {
> + reg = <2>;
> +
> + mipi_ipu1_mux_to_ipu1_csi0: endpoint {
> + remote-endpoint = <&ipu1_csi0_from_mipi_ipu1_mux>;
> + };
> + };
> + };
> +
> + mipi_ipu2_mux {
> + compatible = "video-multiplexer";
> + reg = <0x04>;
> + bit-mask = <1>;
> + bit-shift = <20>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> +
> + mipi_ipu2_mux_from_mipi_csi3: endpoint {
> + remote-endpoint = <&mipi_csi3_to_mipi_ipu2_mux>;
> + };
> + };
> +
> + csi1: port@1 {
> + reg = <1>;
> + };
> +
> + port@2 {
> + reg = <2>;
> +
> + mipi_ipu2_mux_to_ipu2_csi1: endpoint {
> + remote-endpoint = <&ipu2_csi1_from_mipi_ipu2_mux>;
> + };
> + };
> + };
> +};
> +
Missing &ipu1_csi0 here.
> +&ipu1_csi1 {
> + ipu1_csi1_from_mipi_csi1: endpoint {
> + remote-endpoint = <&mipi_csi1_to_ipu1_csi1>;
> + };
> +};
> +
> +&ipu2_csi0 {
> + ipu2_csi0_from_mipi_csi2: endpoint {
> + remote-endpoint = <&mipi_csi2_to_ipu2_csi0>;
> + };
> +};
This is not needed as it was specified before.
> +
> &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>,
> @@ -280,6 +360,44 @@
> };
> };
>
> +&mipi_csi {
> + port@0 {
> + reg = <0>;
> + };
> +
> + port@1 {
> + reg = <1>;
> +
> + mipi_csi0_to_mipi_ipu1_mux: endpoint {
> + remote-endpoint = <&mipi_ipu1_mux_from_mipi_csi0>;
> + };
> + };
> +
> + port@2 {
> + reg = <2>;
> +
> + mipi_csi1_to_ipu1_csi1: endpoint {
> + remote-endpoint = <&ipu1_csi1_from_mipi_csi1>;
> + };
> + };
> +
> + port@3 {
> + reg = <3>;
> +
> + mipi_csi2_to_ipu2_csi0: endpoint {
> + remote-endpoint = <&ipu2_csi0_from_mipi_csi2>;
> + };
> + };
> +
> + port@4 {
> + reg = <4>;
> +
> + mipi_csi3_to_mipi_ipu2_mux: endpoint {
> + remote-endpoint = <&mipi_ipu2_mux_from_mipi_csi3>;
> + };
> + };
> +};
> +
> &mipi_dsi {
> ports {
> port@2 {
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index b13b0b2..cd325bd 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -798,8 +798,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 {
> @@ -1122,6 +1124,8 @@
>
> mipi_csi: mipi@021dc000 {
> reg = <0x021dc000 0x4000>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> };
>
> mipi_dsi: mipi@021e0000 {
> @@ -1221,6 +1225,10 @@
>
> ipu1_csi0: port@0 {
> reg = <0>;
> +
> + ipu1_csi0_from_mipi_ipu1_mux: endpoint {
> + remote-endpoint = <&mipi_ipu1_mux_to_ipu1_csi0>;
> + };
The endpoint should be different for i.mx6q and i.mx6dl.
So, add one for them respectively instead of adding
a common one in imx6qdl.dtsi.
Regards,
Liu Ying
> };
>
> ipu1_csi1: port@1 {
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-11-08 8:23 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 17:34 [PATCH v2 00/21] Basic i.MX IPUv3 capture support Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 01/21] [media] v4l2-async: move code out of v4l2_async_notifier_register into v4l2_async_test_nofity_all Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 02/21] [media] v4l2-async: allow subdevices to add further subdevices to the notifier waiting list Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 03/21] [media] v4l: of: add v4l2_of_subdev_registered Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 04/21] [media] v4l2-async: add new subdevices to the tail of subdev_list Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 05/21] [media] imx: Add i.MX SoC wide media device driver Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 06/21] [media] imx: Add IPUv3 media common code Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 07/21] [media] imx-ipu: Add i.MX IPUv3 CSI subdevice driver Philipp Zabel
2016-11-08 7:18 ` Ying Liu
2016-10-14 17:34 ` [PATCH v2 08/21] [media] imx: Add i.MX IPUv3 capture driver Philipp Zabel
2016-10-17 11:32 ` Jack Mitchell
2016-10-17 11:35 ` Marek Vasut
2016-10-17 11:40 ` Jack Mitchell
2016-10-17 12:12 ` Philipp Zabel
2016-10-19 16:22 ` Jack Mitchell
2016-10-19 19:25 ` Marek Vasut
2016-10-26 11:29 ` Jack Mitchell
2016-11-08 7:21 ` Ying Liu
2016-10-14 17:34 ` [PATCH v2 09/21] [media] platform: add video-multiplexer subdevice driver Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 10/21] [media] imx: Add i.MX MIPI CSI-2 " Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 11/21] [media] tc358743: put lanes in STOP state before starting streaming Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 12/21] ARM: dts: imx6qdl: Add capture-subsystem node Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 13/21] ARM: dts: imx6qdl: Add mipi_ipu1/2 multiplexers, mipi_csi, and their connections Philipp Zabel
2016-11-08 8:23 ` Ying Liu [this message]
2016-10-14 17:34 ` [PATCH v2 14/21] ARM: dts: imx6qdl: Add MIPI CSI-2 D-PHY compatible and clocks Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 15/21] ARM: dts: nitrogen6x: Add dtsi for BD_HDMI_MIPI HDMI to MIPI CSI-2 receiver board Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 16/21] gpu: ipuv3: add ipu_csi_set_downsize Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 17/21] [media] imx-ipuv3-csi: support downsizing Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 18/21] [media] add mux and video interface bridge entity functions Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 19/21] [media] video-multiplexer: set entity function to mux Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 20/21] [media] imx: Set i.MX MIPI CSI-2 entity function to bridge Philipp Zabel
2016-10-14 17:34 ` [PATCH v2 21/21] [media] tc358743: set entity function to video interface bridge Philipp Zabel
2016-10-17 10:18 ` [PATCH v2 00/21] Basic i.MX IPUv3 capture support Gary Bisson
2016-10-17 12:41 ` Philipp Zabel
2016-10-19 21:30 ` Sakari Ailus
[not found] ` <CAH-u=807nRYzza0kTfOMv1AiWazk6FGJyz6W5_bYw7v9nOrccA@mail.gmail.com>
2016-12-29 15:10 ` Jean-Michel Hautbois
2016-12-29 20:51 ` Robert Schwebel
2016-12-30 19:06 ` Marek Vasut
2016-12-30 20:26 ` Steve Longerbeam
2017-01-02 13:51 ` Jean-Michel Hautbois
2017-01-02 14:45 ` Hans Verkuil
2017-01-02 14:59 ` Jean-Michel Hautbois
2017-01-02 19:19 ` Fabio Estevam
2017-01-02 19:20 ` Steve Longerbeam
2017-01-02 17:04 ` Fabio Estevam
2017-01-02 19:17 ` Steve Longerbeam
2017-01-09 19:43 ` Philipp Zabel
2017-01-10 0:15 ` Steve Longerbeam
2017-01-10 23:52 ` Steve Longerbeam
2017-01-11 9:12 ` Jean-Michel Hautbois
2017-01-11 12:10 ` Philipp Zabel
2017-01-12 23:22 ` Steve Longerbeam
2017-01-12 23:43 ` Steve Longerbeam
2017-01-13 2:22 ` Steve Longerbeam
2017-01-13 11:18 ` Philipp Zabel
2017-01-13 11:04 ` Philipp Zabel
2017-01-13 11:05 ` Philipp Zabel
2017-01-14 20:26 ` Steve Longerbeam
2017-01-16 11:49 ` Philipp Zabel
2017-01-11 12:11 ` Philipp Zabel
2017-01-24 18:11 ` Philipp Zabel
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=CAOcKUNVUq8ATyhTBg5KYJ_MJCftCUkS6zR9p9S986nJ4jP9TEg@mail.gmail.com \
--to=gnuiyl@gmail.com \
--cc=gary.bisson@boundarydevices.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=marex@denx.de \
--cc=p.zabel@pengutronix.de \
--cc=steve_longerbeam@mentor.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: link
Be 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.