summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Brown <oliver.brown@freescale.com>2013-09-09 13:58:14 -0500
committerOliver Brown <oliver.brown@freescale.com>2013-09-09 22:55:14 -0500
commit450e03aaf1b06b158fc11cfd76a053b8f81ee73c (patch)
treefb554b7c1fde4f534232c4317d10b3c913fe16ad
parent6cabc50f365562ed6667bccb7e6a6ace31669f0d (diff)
ENGR00278652-2 [ARM]: dts add MIPI CSI support for sabresd and sabreauto
Added MIPI CIS2 Device Tree support for SabreSD and SabreAuto. Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabreauto.dtsi8
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabresd.dtsi8
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi12
3 files changed, 27 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index be687817d3a7..cc614e47dc5c 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -515,6 +515,14 @@
status = "okay";
};
+&mipi {
+ status = "okay";
+ ipu_id = <0>;
+ csi_id = <1>;
+ v_channel = <0>;
+ lanes = <1>;
+};
+
&pcie {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 000283a96710..a990454f8ccd 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -542,6 +542,14 @@
status = "okay";
};
+&mipi_csi {
+ status = "okay";
+ ipu_id = <0>;
+ csi_id = <1>;
+ v_channel = <0>;
+ lanes = <2>;
+};
+
&mipi_dsi {
dev_id = <0>;
disp_id = <0>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index d0bccecbbc04..16ca740b8c1e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -899,8 +899,18 @@
status = "disabled";
};
- mipi@021dc000 { /* MIPI-CSI */
+ mipi_csi: mipi_csi@021dc000 {
+ compatible = "fsl,imx6q-mipi-csi2";
reg = <0x021dc000 0x4000>;
+ interrupts = <0 100 0x04>, <0 101 0x04>;
+ clocks = <&clks 138>, <&clks 53>;
+ /* Note: clks 138 is hsi_tx, however, the dphy_c
+ * hsi_tx and pll_refclk use the same clk gate.
+ * In current clk driver, open/close clk gate do
+ * use hsi_tx for a temporary debug purpose.
+ */
+ clock-names = "dphy_clk", "pixel_clk";
+ status = "disabled";
};
vdoa@021e4000 {