From 543fbe1deb6a708ffb1d22616502b25a0c0452a0 Mon Sep 17 00:00:00 2001 From: Oliver Brown Date: Sun, 8 Sep 2013 11:01:49 -0500 Subject: [PATCH] ENGR00278663-3 [ARM]: dts add IPU v4l2 capture driver Add V4L2 Capture support to device tree for SabreSD and SabreAuto Boards. Signed-off-by: Oliver Brown --- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 39 +++++++++++------------- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 16 ++++++++++ 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 50c3fb6e1903..f105d361842c 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -50,22 +50,6 @@ default-brightness-level = <7>; status = "okay"; }; -}; - -&ecspi1 { - fsl,spi-num-chipselects = <1>; - cs-gpios = <&gpio3 19 0>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; - status = "disabled"; /* pin conflict with WEIM NOR */ - - flash: m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p32"; - spi-max-frequency = <20000000>; - reg = <0>; - }; mxcfb1: fb@0 { compatible = "fsl,mxc_sdc_fb"; @@ -121,13 +105,26 @@ status = "okay"; }; - backlight { - compatible = "pwm-backlight"; - pwms = <&pwm3 0 5000000>; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <7>; + v4l2_cap_0 { + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <0>; + mclk_source = <0>; + status = "okay"; }; + v4l2_cap_1 { + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <1>; + mclk_source = <0>; + status = "okay"; + }; + + v4l2_out { + compatible = "fsl,mxc_v4l2_output"; + status = "okay"; + }; }; &ecspi1 { diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index ebe28394727c..7d1c79ff2422 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -140,6 +140,22 @@ mux-ext-port = <3>; }; + v4l2_cap_0 { + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <0>; + mclk_source = <0>; + status = "okay"; + }; + + v4l2_cap_1 { + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <1>; + mclk_source = <0>; + status = "okay"; + }; + v4l2_out { compatible = "fsl,mxc_v4l2_output"; status = "okay"; -- 2.39.2