From: Rui Miguel Silva <rui.silva@linaro.org>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
Steve Longerbeam <slongerbeam@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>
Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org,
Shawn Guo <shawnguo@kernel.org>,
Fabio Estevam <fabio.estevam@nxp.com>,
devicetree@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ryan Harkin <ryan.harkin@linaro.org>,
Rui Miguel Silva <rui.silva@linaro.org>
Subject: [PATCH v4 09/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections
Date: Thu, 17 May 2018 13:50:30 +0100 [thread overview]
Message-ID: <20180517125033.18050-10-rui.silva@linaro.org> (raw)
In-Reply-To: <20180517125033.18050-1-rui.silva@linaro.org>
This patch adds the device tree nodes for csi, video multiplexer and mipi-csi
besides the graph connecting the necessary endpoints to make the media capture
entities to work in imx7 Warp board.
Also add the pin control related with the mipi_csi in that board.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
arch/arm/boot/dts/imx7s-warp.dts | 51 ++++++++++++++++++++++++++++++++
arch/arm/boot/dts/imx7s.dtsi | 28 ++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 8a30b148534d..cb175ee2fc9d 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -310,6 +310,57 @@
status = "okay";
};
+&gpr {
+ csi_mux {
+ compatible = "video-mux";
+ mux-controls = <&mux 0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@1 {
+ reg = <1>;
+
+ csi_mux_from_mipi_vc0: endpoint {
+ remote-endpoint = <&mipi_vc0_to_csi_mux>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+
+ csi_mux_to_csi: endpoint {
+ remote-endpoint = <&csi_from_csi_mux>;
+ };
+ };
+ };
+};
+
+&csi {
+ status = "okay";
+
+ port {
+ csi_from_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_to_csi>;
+ };
+ };
+};
+
+&mipi_csi {
+ clock-frequency = <166000000>;
+ status = "okay";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ fsl,csis-hs-settle = <3>;
+
+ port@1 {
+ reg = <1>;
+
+ mipi_vc0_to_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_from_mipi_vc0>;
+ };
+ };
+};
+
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 3590dab529f9..0bae41f2944c 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -46,6 +46,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/imx7-reset.h>
#include "imx7d-pinfunc.h"
/ {
@@ -738,6 +739,17 @@
status = "disabled";
};
+ csi: csi@30710000 {
+ compatible = "fsl,imx7-csi";
+ reg = <0x30710000 0x10000>;
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX7D_CLK_DUMMY>,
+ <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
+ <&clks IMX7D_CLK_DUMMY>;
+ clock-names = "axi", "mclk", "dcic";
+ status = "disabled";
+ };
+
lcdif: lcdif@30730000 {
compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif";
reg = <0x30730000 0x10000>;
@@ -747,6 +759,22 @@
clock-names = "pix", "axi";
status = "disabled";
};
+
+ mipi_csi: mipi-csi@30750000 {
+ compatible = "fsl,imx7-mipi-csi2";
+ reg = <0x30750000 0x10000>;
+ interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX7D_IPG_ROOT_CLK>,
+ <&clks IMX7D_MIPI_CSI_ROOT_CLK>,
+ <&clks IMX7D_MIPI_DPHY_ROOT_CLK>;
+ clock-names = "pclk", "wrap", "phy";
+ power-domains = <&pgc_mipi_phy>;
+ phy-supply = <®_1p0d>;
+ resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
+ reset-names = "mrst";
+ bus-width = <2>;
+ status = "disabled";
+ };
};
aips3: aips-bus@30800000 {
--
2.17.0
next prev parent reply other threads:[~2018-05-17 12:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-17 12:50 [PATCH v4 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 01/12] media: staging/imx: refactor imx media device probe Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 02/12] media: staging/imx7: add imx7 CSI subdev driver Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 03/12] clk: imx7d: fix mipi dphy div parent Rui Miguel Silva
2018-05-17 18:05 ` Stephen Boyd
2018-05-18 8:30 ` Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 04/12] clk: imx7d: reset parent for mipi csi root Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 05/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 06/12] media: dt-bindings: add bindings for i.MX7 media driver Rui Miguel Silva
2018-05-18 6:58 ` Sakari Ailus
2018-05-18 8:27 ` Rui Miguel Silva
2018-05-18 22:13 ` Sakari Ailus
2018-05-22 13:19 ` Rui Miguel Silva
2018-05-22 14:08 ` Sakari Ailus
2019-03-10 21:48 ` Laurent Pinchart
2019-03-12 14:07 ` Rui Miguel Silva
2019-03-12 15:10 ` Laurent Pinchart
2019-03-12 15:37 ` Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 07/12] ARM: dts: imx7s: add mipi phy power domain Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 08/12] ARM: dts: imx7s: add multiplexer controls Rui Miguel Silva
2018-05-17 12:50 ` Rui Miguel Silva [this message]
2018-05-17 12:50 ` [PATCH v4 10/12] ARM: dts: imx7s-warp: add ov2680 sensor node Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 11/12] media: imx7.rst: add documentation for i.MX7 media driver Rui Miguel Silva
2018-05-17 12:50 ` [PATCH v4 12/12] media: staging/imx: add i.MX7 entries to TODO file Rui Miguel Silva
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=20180517125033.18050-10-rui.silva@linaro.org \
--to=rui.silva@linaro.org \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=ryan.harkin@linaro.org \
--cc=sakari.ailus@linux.intel.com \
--cc=shawnguo@kernel.org \
--cc=slongerbeam@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).