diff options
| author | Rahul Sharma <sharah@codeaurora.org> | 2018-01-04 12:27:55 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-12 02:44:57 -0800 |
| commit | a211778552390eaad1943f8c75d8a131d2f517fa (patch) | |
| tree | 6a42c70ed9004db16e0c864d80c5d7ec56fc1b76 /include/uapi | |
| parent | 04b6b652ac86f10c6f22c7de575be5e4ebcc48ea (diff) | |
msm: ais: Camera clock voting fixes for LA XO
AIS camera voting on VFE and ISPIF clocks cause XO shutdown failure.
So, add new AIS manager driver, to control AIS camera clock votes.
Also add a new method in early camera driver to turn on/off clocks
when it's needed.
Change-Id: I43090b51cb29ca9de62dfa191f77b7aa9dae8613
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/media/ais/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/media/ais/msm_ais.h | 1 | ||||
| -rw-r--r-- | include/uapi/media/ais/msm_ais_mgr.h | 28 | ||||
| -rw-r--r-- | include/uapi/media/ais/msm_ais_sensor.h | 5 |
4 files changed, 35 insertions, 0 deletions
diff --git a/include/uapi/media/ais/Kbuild b/include/uapi/media/ais/Kbuild index 121e3a61560f..c8d50c7d077c 100644 --- a/include/uapi/media/ais/Kbuild +++ b/include/uapi/media/ais/Kbuild @@ -4,3 +4,4 @@ header-y += msm_ais_isp.h header-y += msm_ais_ispif.h header-y += msm_ais_sensor.h header-y += msm_ais_sensor_sdk.h +header-y += msm_ais_mgr.h diff --git a/include/uapi/media/ais/msm_ais.h b/include/uapi/media/ais/msm_ais.h index 9156ca0c9083..c393a2a7f636 100644 --- a/include/uapi/media/ais/msm_ais.h +++ b/include/uapi/media/ais/msm_ais.h @@ -52,6 +52,7 @@ #define MSM_CAMERA_SUBDEV_IR_LED 18 #define MSM_CAMERA_SUBDEV_IR_CUT 19 #define MSM_CAMERA_SUBDEV_EXT 20 +#define MSM_CAMERA_SUBDEV_AIS_MNGR 21 #define MSM_MAX_CAMERA_SENSORS 5 diff --git a/include/uapi/media/ais/msm_ais_mgr.h b/include/uapi/media/ais/msm_ais_mgr.h new file mode 100644 index 000000000000..43ae16df65f9 --- /dev/null +++ b/include/uapi/media/ais/msm_ais_mgr.h @@ -0,0 +1,28 @@ +#ifndef __UAPI_MEDIA_MSM_AIS_MGR_H__ +#define __UAPI_MEDIA_MSM_AIS_MGR_H__ + +#include <media/ais/msm_ais.h> + +enum clk_mgr_cfg_type_t { + AIS_CLK_ENABLE, + AIS_CLK_DISABLE, +}; + +#define AIS_CLK_ENABLE AIS_CLK_ENABLE +#define AIS_CLK_DISABLE AIS_CLK_DISABLE + +struct clk_mgr_cfg_data_ext { + enum clk_mgr_cfg_type_t cfg_type; +}; + +struct clk_mgr_cfg_data { + enum clk_mgr_cfg_type_t cfg_type; +}; + +#define VIDIOC_MSM_AIS_CLK_CFG \ + _IOWR('V', BASE_VIDIOC_PRIVATE, struct clk_mgr_cfg_data) + +#define VIDIOC_MSM_AIS_CLK_CFG_EXT \ + _IOWR('V', BASE_VIDIOC_PRIVATE+1, struct clk_mgr_cfg_data_ext) + +#endif /* __UAPI_MEDIA_MSM_AIS_MGR_H__ */ diff --git a/include/uapi/media/ais/msm_ais_sensor.h b/include/uapi/media/ais/msm_ais_sensor.h index eb9c24024383..59c20c8e84ae 100644 --- a/include/uapi/media/ais/msm_ais_sensor.h +++ b/include/uapi/media/ais/msm_ais_sensor.h @@ -369,8 +369,13 @@ enum msm_sensor_cfg_type_t { CFG_WRITE_I2C_ARRAY_ASYNC, CFG_WRITE_I2C_ARRAY_SYNC, CFG_WRITE_I2C_ARRAY_SYNC_BLOCK, + CFG_CCI_POWER_UP, + CFG_CCI_POWER_DOWN, }; +#define CFG_CCI_POWER_UP CFG_CCI_POWER_UP +#define CFG_CCI_POWER_DOWN CFG_CCI_POWER_DOWN + enum msm_actuator_cfg_type_t { CFG_GET_ACTUATOR_INFO, CFG_SET_ACTUATOR_INFO, |