diff options
| author | Oliver Brown <oliver.brown@freescale.com> | 2014-10-06 12:30:17 -0500 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-01-15 21:18:17 -0600 |
| commit | 772c2c93bbeff1c969d59565c00819c1f9e8fc60 (patch) | |
| tree | e4817cdb473bf01debdaf6dbfbd1c131f73a0454 /arch/arm/configs | |
| parent | 662dc32c45f38de62428bf2bb596d8083eb81526 (diff) | |
MLK-9661-3 [V4L2 Capture] Porting MXC V4L2 Capture from 3.10.y
Adding MXC V4L2 capture to kernel confguraiton.
Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 54b3c83ba55e..e4e63a9bed91 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -165,8 +165,8 @@ CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y CONFIG_SABRESD_MAX8903=y -CONFIG_SENSORS_MAG3110=y CONFIG_SENSORS_MAX17135=y +CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y @@ -176,16 +176,16 @@ CONFIG_IMX2_WDT=y CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_MC13XXX_SPI=y CONFIG_MFD_MC13XXX_I2C=y +CONFIG_MFD_MAX17135=y CONFIG_MFD_SI476X_CORE=y CONFIG_MFD_STMPE=y -CONFIG_MFD_MAX17135=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_DA9052=y +CONFIG_REGULATOR_MAX17135=y CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y -CONFIG_REGULATOR_MAX17135=y CONFIG_REGULATOR_PFUZE100=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y @@ -195,6 +195,14 @@ CONFIG_RC_DEVICES=y CONFIG_IR_GPIO_CIR=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y +CONFIG_VIDEO_MXC_CAPTURE=m +CONFIG_VIDEO_MXC_CSI_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_VADC=m +CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y CONFIG_SOC_CAMERA=y @@ -219,7 +227,6 @@ CONFIG_FB_MXC_MIPI_DSI=y CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y CONFIG_FB_MXC_HDMI=y CONFIG_FB_MXC_EINK_PANEL=y -# CONFIG_FB_MXC_EINK_AUTO_UPDATE_MODE is not set CONFIG_FB_MXS_SII902X=y CONFIG_FB_MXC_DCIC=m CONFIG_HANNSTAR_CABC=y |