diff options
| author | Cristina Ciocan <cristina-mihaela.ciocan@nxp.com> | 2017-06-22 17:41:36 +0300 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | e48e8e1029c4854b121833522bb17a37190e1a94 (patch) | |
| tree | b1f693c243f215eebebed82d911521afeefcad3a /arch | |
| parent | a40d89dfbc7eb3dfa03c05844d36fdf005b56882 (diff) | |
MLK-15048-1: media: v4l: capture: Move mxc/subdev/ drivers to mxc/capture
All drivers in mxc/subdev are capture devices, so move them to their
rightful place, in mxc/capture to avoid confusion.
Two of the drivers, ov5640 and ov5640_mipi are in both locations, having
the same configs: CONFIG_MXC_CAMERA_OV5640 and CONFIG_MXC_CAMERA_OV5640_MIPI.
After moving all to mxc/capture/ directory, add a _v2 suffix to those
drivers moved from mxc/subdev to allow a clean compile process. As a next
step, the 2 versions of drivers should be merged, since they represent the
same device and functionality.
Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index a179765d6d2c..5ac3c03fefa1 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -245,17 +245,19 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y CONFIG_VIDEO_MXC_CAPTURE=m +CONFIG_VIDEO_MXC_CSI_CAMERA=m +CONFIG_MXC_VADC=m +CONFIG_MXC_MIPI_CSI=m CONFIG_MXC_CAMERA_OV5640=m +CONFIG_MXC_CAMERA_OV5640_V2=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m +CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m +CONFIG_MXC_CAMERA_OV5647_MIPI=m CONFIG_MXC_TVIN_ADV7180=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y -CONFIG_VIDEO_MXC_CSI_CAMERA=m -CONFIG_MXC_VADC=m -CONFIG_MXC_MIPI_CSI=m -CONFIG_MXC_CAMERA_OV5647_MIPI=m CONFIG_SOC_CAMERA=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=y |