diff options
| author | Sanchayan Maity <maitysanchayan@gmail.com> | 2016-05-18 18:37:46 +0530 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:13:25 +0100 |
| commit | e7795125f46cf8e398e1c530fa610f45e5ef9696 (patch) | |
| tree | a3c4c7c063576d489274cc0cb80d8fd971b5c4b6 /arch/arm | |
| parent | 7df8a0f4065f1085ec1765ddfc65b0106ba3faad (diff) | |
apalis_imx6/colibri_imx6: Enable ADV7280 decoder for iMX6 modules
Enable ADV7280 decoder for iMX6 modules. ADV7280 and ADV7180 have
same addresses viz. 0x21 respectively, changing the ADV7280 address
to 0x20 would result in a conflict with MAX9526. As a result enable
ADV7280 by default and disable ADV7180.
Signed-off-by: Sanchayan Maity <sanchayan.maity@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit b7798ad9dccd6b1f54a0c1bbbfa3290934dc5d9b)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi | 19 | ||||
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 1 |
4 files changed, 39 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts index b603bf7ce39f..daa096c769d7 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts @@ -159,6 +159,24 @@ compatible = "st,m41t00"; reg = <0x68>; }; + + adv7280: adv7280@21 { + compatible = "adv7280"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>; + clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; + AVDD-supply = <®_3p3v>; + DVDD-supply = <®_3p3v>; + PVDD-supply = <®_3p3v>; + csi_id = <1>; + mclk = <24000000>; + mclk_source = <1>; + status = "okay"; + }; + /* Video ADC on Analog Camera Module */ adv7180: adv7180@21 { compatible = "adv,adv7180"; @@ -175,7 +193,7 @@ mclk = <24000000>; mclk_source = <0>; cvbs = <1>; - status = "okay"; + status = "disabled"; }; max9526: max9526@20 { compatible = "maxim,max9526"; diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi index b022c3229cc9..2ac2a9f5c3b7 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi @@ -212,6 +212,23 @@ &i2c3 { status = "okay"; + adv7280: adv7280@21 { + compatible = "adv7280"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>; + clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; + AVDD-supply = <®_3p3v>; + DVDD-supply = <®_3p3v>; + PVDD-supply = <®_3p3v>; + csi_id = <0>; + mclk = <24000000>; + mclk_source = <1>; + status = "okay"; + }; + /* Video ADC on Analog Camera Module */ adv7180: adv7180@21 { compatible = "adv,adv7180"; @@ -228,7 +245,7 @@ mclk = <24000000>; mclk_source = <1>; cvbs = <1>; - status = "okay"; + status = "disabled"; }; max9526: max9526@20 { diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index be234fa52ef8..cb596a23fe5a 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -195,6 +195,7 @@ CONFIG_VIDEO_MXC_CAPTURE=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m +CONFIG_MXC_TVIN_ADV7280=m CONFIG_MXC_TVIN_ADV7180=m CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index 535f89aab937..beb14c6d3413 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -190,6 +190,7 @@ CONFIG_VIDEO_MXC_CAPTURE=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m +CONFIG_MXC_TVIN_ADV7280=m CONFIG_MXC_TVIN_ADV7180=m CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m |