diff options
| author | Patrick Tjin <pattjin@google.com> | 2015-04-02 10:15:34 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2015-04-02 10:15:34 -0700 |
| commit | b562c238e74c679409fca91c01de03b91a104c30 (patch) | |
| tree | e5fec9181fef7af1bdb109f0f542414a3de4638a /original-kernel-headers/media/msm_cam_sensor.h | |
| parent | 8318afe915d8e46faf25d047f5dd987d30cc0175 (diff) | |
| download | msm8994-b562c238e74c679409fca91c01de03b91a104c30.tar.gz | |
msm8994: update kernel headers
LA.BF64.1.2.1_rb2.6
Change-Id: I6c7f8d1159dabf2721e7cbe1525ca38c6148aab0
Signed-off-by: Patrick Tjin <pattjin@google.com>
Diffstat (limited to 'original-kernel-headers/media/msm_cam_sensor.h')
| -rw-r--r-- | original-kernel-headers/media/msm_cam_sensor.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/original-kernel-headers/media/msm_cam_sensor.h b/original-kernel-headers/media/msm_cam_sensor.h index 6cf6e47..4a3636e 100644 --- a/original-kernel-headers/media/msm_cam_sensor.h +++ b/original-kernel-headers/media/msm_cam_sensor.h @@ -5,6 +5,7 @@ #include <sys/types.h> #endif +#include <linux/v4l2-mediabus.h> #include <media/msm_camsensor_sdk.h> #include <linux/types.h> @@ -37,6 +38,16 @@ #define MAX_AF_ITERATIONS 3 #define MAX_NUMBER_OF_STEPS 47 +#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */ +#define MSM_V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') + /* 14 BGBG.. GRGR.. */ +#define MSM_V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') + /* 14 GBGB.. RGRG.. */ +#define MSM_V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('B', 'A', '1', '4') + /* 14 GRGR.. BGBG.. */ +#define MSM_V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') + /* 14 RGRG.. GBGB.. */ + enum flash_type { LED_FLASH = 1, STROBE_FLASH, @@ -558,6 +569,7 @@ struct msm_camera_led_cfg_t { struct msm_flash_init_info_t { enum msm_flash_driver_type flash_driver_type; + uint32_t slave_addr; struct msm_sensor_power_setting_array *power_setting_array; struct msm_camera_i2c_reg_setting_array *settings; }; @@ -729,6 +741,7 @@ struct msm_ois_cfg_data32 { struct msm_flash_init_info_t32 { enum msm_flash_driver_type flash_driver_type; + uint32_t slave_addr; compat_uptr_t power_setting_array; compat_uptr_t settings; }; |