From a47c5d50760d973fae6206169d8bf3ff038c647b Mon Sep 17 00:00:00 2001 From: Lakshmi Narayana Kalavala Date: Mon, 8 Feb 2016 17:31:03 -0800 Subject: msm: camera: Update camera drivers Add changes to update camera drivers to: 1. Update necessary Kconfig files to support camera driver compilation. 2. Support minor changes to V4L framework. 3. Export uapi headers to header_install export location. Signed-off-by: Seemanta Dutta Signed-off-by: Lakshmi Narayana Kalavala --- include/soc/qcom/camera2.h | 2 +- include/uapi/Kbuild | 1 + include/uapi/media/Kbuild | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/soc/qcom/camera2.h b/include/soc/qcom/camera2.h index 7124fa69b4d5..03c0d34ab746 100644 --- a/include/soc/qcom/camera2.h +++ b/include/soc/qcom/camera2.h @@ -68,7 +68,7 @@ struct msm_cam_clk_setting { }; struct v4l2_subdev_info { - enum v4l2_mbus_pixelcode code; + uint32_t code; enum v4l2_colorspace colorspace; uint16_t fmt; uint16_t order; diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild index 245aa6e05e6a..aeb3366db4fc 100644 --- a/include/uapi/Kbuild +++ b/include/uapi/Kbuild @@ -13,3 +13,4 @@ header-y += drm/ header-y += xen/ header-y += scsi/ header-y += misc/ +header-y += media/ diff --git a/include/uapi/media/Kbuild b/include/uapi/media/Kbuild index a13645e1d8c7..ec4f06a98d72 100644 --- a/include/uapi/media/Kbuild +++ b/include/uapi/media/Kbuild @@ -7,14 +7,10 @@ header-y += msm_gestures.h header-y += msm_isp.h header-y += msm_jpeg.h header-y += msm_jpeg_dma.h -header-y += msm_media_info.h header-y += msm_mercury.h -header-y += msm_vidc.h header-y += msm_vpu.h header-y += msmb_camera.h header-y += msmb_generic_buf_mgr.h header-y += msmb_isp.h header-y += msmb_ispif.h header-y += msmb_pproc.h -header-y += radio-iris.h -header-y += radio-iris-commands.h -- cgit v1.2.3