diff options
| author | Oliver Brown <oliver.brown@freescale.com> | 2013-06-19 15:32:22 -0500 |
|---|---|---|
| committer | Oliver Brown <oliver.brown@freescale.com> | 2013-06-21 09:27:16 -0500 |
| commit | 497cbca300c10e0b5d9f204be910e68961fc0051 (patch) | |
| tree | 7c5382b5d08a6482b6d527fc1527009aa1143b1b | |
| parent | 4d3aae52286dcc25b9cb752e90b7aef65ae95281 (diff) | |
ENGR00267896-3 - MX6 TVENC: Port ADV7180 to L3.5.7 Kernel
Added ADV7180 to Sabre Auto device tree.
Added ADV7180 to kernel config.
Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 34 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 64adb37f452e..d9391ce52eab 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -373,6 +373,24 @@ gpio-controller; #gpio-cells = <2>; }; + + adv7180: adv7180@21 { + compatible = "fsl,adv7180"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0_1>; + clocks = <&clks 169>; + clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; /* 3.3v, enabled via 2.8 VGEN6 */ + AVDD-supply = <®_3p3v>; /* 1.8v */ + DVDD-supply = <®_3p3v>; /* 1.8v */ + PVDD-supply = <®_3p3v>; /* 1.8v */ + pwn-gpios = <&max7310_2 2 0>; + csi_id = <0>; + mclk = <24000000>; + mclk_source = <0>; + cvbs = <1>; + }; }; }; @@ -426,6 +444,22 @@ status = "disabled"; }; + 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"; diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 4330a7d992ea..32ea9fd75b0a 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -197,6 +197,7 @@ CONFIG_VIDEO_MXC_CAMERA=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m +CONFIG_MXC_TVIN_ADV7180=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_I2C_SI4763=y CONFIG_FB=y |