Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98fc74a7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add support for actuator_ois driver type"

parents 33aaa73a 5324cf2f

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

+16 −0
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ static int32_t msm_actuator_power_down(struct msm_actuator_ctrl_t *a_ctrl); 


static struct msm_actuator msm_vcm_actuator_table;

static struct msm_actuator msm_piezo_actuator_table;

static struct msm_actuator msm_ois_actuator_table;



static struct i2c_driver msm_actuator_i2c_driver;

static struct msm_actuator *actuators[] = {

	&msm_vcm_actuator_table,

	&msm_piezo_actuator_table,

	&msm_ois_actuator_table,

};



static int32_t msm_actuator_piezo_set_default_focus(
@@ -1284,6 +1286,7 @@ static int __init msm_actuator_init_module(void) 
		msm_actuator_platform_probe);

	if (!rc)

		return rc;



	CDBG("%s:%d rc %d\n", __func__, __LINE__, rc);

	return i2c_add_driver(&msm_actuator_i2c_driver);

}
@@ -1316,6 +1319,19 @@ static struct msm_actuator msm_piezo_actuator_table = { 
	},

};



static struct msm_actuator msm_ois_actuator_table = {

	.act_type = ACTUATOR_OIS,

	.func_tbl = {

		.actuator_init_step_table = msm_actuator_init_step_table,

		.actuator_move_focus = msm_actuator_move_focus,

		.actuator_write_focus = msm_actuator_write_focus,

		.actuator_set_default_focus = msm_actuator_set_default_focus,

		.actuator_init_focus = msm_actuator_init_focus,

		.actuator_parse_i2c_params = msm_actuator_parse_i2c_params,

		.actuator_set_position = msm_actuator_set_position,

	},

};



module_init(msm_actuator_init_module);

MODULE_DESCRIPTION("MSM ACTUATOR");

MODULE_LICENSE("GPL v2");

include/media/msm_cam_sensor.h

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ enum msm_actuator_cfg_type_t { 
enum actuator_type {

	ACTUATOR_VCM,

	ACTUATOR_PIEZO,

	ACTUATOR_OIS,

};



enum msm_actuator_data_type {