Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx53.dtsi

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 9b672ed2486d12b87872d4b355a109c54c5320ef..ed341cfd9d097a4298f219be355c67c8fc02328e 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -31,6 +31,7 @@
                i2c0 = &i2c1;
                i2c1 = &i2c2;
                i2c2 = &i2c3;
+               ipu0 = &ipu;
                mmc0 = &esdhc1;
                mmc1 = &esdhc2;
                mmc2 = &esdhc3;
@@ -71,6 +72,11 @@
                ports = <&ipu_di0>, <&ipu_di1>;
        };
 
+       capture_subsystem {
+               compatible = "fsl,imx-capture-subsystem";
+               ports = <&ipu_csi0>, <&ipu_csi1>;
+       };
+
        tzic: tz-interrupt-controller@fffc000 {
                compatible = "fsl,imx53-tzic", "fsl,tzic";
                interrupt-controller;
@@ -158,10 +164,16 @@
 
                        ipu_csi0: port@0 {
                                reg = <0>;
+
+                               ipu_csi0_from_parallel_sensor: endpoint {
+                               };
                        };
 
                        ipu_csi1: port@1 {
                                reg = <1>;
+
+                               ipu_csi1_from_parallel_sensor: endpoint {
+                               };
                        };
 
                        ipu_di0: port@2 {