diff options
| author | Lakshmi Narayana Kalavala <lkalaval@codeaurora.org> | 2016-02-08 17:31:03 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:22:47 -0700 |
| commit | e29112a1f720d8c0e1f5d13d1f5bf8cae640868e (patch) | |
| tree | 46924245b1e8776db64eaacaab149728dbd7ce33 /include | |
| parent | 8d9a297fc5f2eef6d528a7f204a82f9908c82273 (diff) | |
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 <seemanta@codeaurora.org>
Signed-off-by: Lakshmi Narayana Kalavala <lkalaval@codeaurora.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/qcom/camera2.h | 2 | ||||
| -rw-r--r-- | include/uapi/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/media/Kbuild | 3 |
3 files changed, 2 insertions, 4 deletions
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 83177391c4fd..b9472dd4d2c1 100644 --- a/include/uapi/media/Kbuild +++ b/include/uapi/media/Kbuild @@ -9,7 +9,6 @@ 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 @@ -17,5 +16,3 @@ header-y += msmb_isp.h header-y += msmb_ispif.h header-y += msmb_pproc.h header-y += msm_media_info.h -header-y += radio-iris.h -header-y += radio-iris-commands.h |