iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: i2c: ak7375: Prepare for supporting another chip

Browse Source 
In view of adding support for at least one other chip,
change the driver to move chip-specific properties and
values in a common structure.

No functional changes.

Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Vincent Knecht 2023-12-01 19:13:48 +01:00 committed by Hans Verkuil
parent 60fc87a695
commit 4e671eb56b
1 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
drivers/media/i2c/ak7375.c
View File

@ -10,30 +10,45 @@
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#define AK7375_MAX_FOCUS_POS 4095 struct ak73xx_chipdef {
/* u8 reg_position;
* This sets the minimum granularity for the focus positions. u8 reg_cont;
* A value of 1 gives maximum accuracy for a desired focus position u8 shift_pos;
*/ u8 mode_active;
#define AK7375_FOCUS_STEPS 1 u8 mode_standby;
/* u16 focus_pos_max;
* This acts as the minimum granularity of lens movement. /*
* Keep this value power of 2, so the control steps can be * This sets the minimum granularity for the focus positions.
* uniformly adjusted for gradual lens movement, with desired * A value of 1 gives maximum accuracy for a desired focus position
* number of control steps. */
*/ u16 focus_steps;
#define AK7375_CTRL_STEPS 64 /*
#define AK7375_CTRL_DELAY_US 1000 * This acts as the minimum granularity of lens movement.
/* * Keep this value power of 2, so the control steps can be
* The vcm may take up 10 ms (tDELAY) to power on and start taking * uniformly adjusted for gradual lens movement, with desired
* I2C messages. Based on AK7371 datasheet. * number of control steps.
*/ */
#define AK7375_POWER_DELAY_US 10000 u16 ctrl_steps;
u16 ctrl_delay_us;
/*
* The vcm may take time (tDELAY) to power on and start taking
* I2C messages.
*/
u16 power_delay_us;
};
#define AK7375_REG_POSITION 0x0 static const struct ak73xx_chipdef ak7375_cdef = {
#define AK7375_REG_CONT 0x2 .reg_position = 0x0,
#define AK7375_MODE_ACTIVE 0x0 .reg_cont = 0x2,
#define AK7375_MODE_STANDBY 0x40 .shift_pos = 4, /* 12 bits position values, need to << 4 */
.mode_active = 0x0,
.mode_standby = 0x40,
.focus_pos_max = 4095,
.focus_steps = 1,
.ctrl_steps = 64,
.ctrl_delay_us = 1000,
.power_delay_us = 10000,
};
static const char * const ak7375_supply_names[] = { static const char * const ak7375_supply_names[] = {
"vdd", "vdd",
@ -42,6 +57,7 @@ static const char * const ak7375_supply_names[] = {
/* ak7375 device structure */ /* ak7375 device structure */
struct ak7375_device { struct ak7375_device {
const struct ak73xx_chipdef *cdef;
struct v4l2_ctrl_handler ctrls_vcm; struct v4l2_ctrl_handler ctrls_vcm;
struct v4l2_subdev sd; struct v4l2_subdev sd;
struct v4l2_ctrl *focus; struct v4l2_ctrl *focus;
@ -86,10 +102,11 @@ static int ak7375_i2c_write(struct ak7375_device *ak7375,
static int ak7375_set_ctrl(struct v4l2_ctrl *ctrl) static int ak7375_set_ctrl(struct v4l2_ctrl *ctrl)
{ {
struct ak7375_device *dev_vcm = to_ak7375_vcm(ctrl); struct ak7375_device *dev_vcm = to_ak7375_vcm(ctrl);
const struct ak73xx_chipdef *cdef = dev_vcm->cdef;
if (ctrl->id == V4L2_CID_FOCUS_ABSOLUTE) if (ctrl->id == V4L2_CID_FOCUS_ABSOLUTE)
return ak7375_i2c_write(dev_vcm, AK7375_REG_POSITION, return ak7375_i2c_write(dev_vcm, cdef->reg_position,
ctrl->val << 4, 2); ctrl->val << cdef->shift_pos, 2);
return -EINVAL; return -EINVAL;
} }
@ -128,11 +145,12 @@ static int ak7375_init_controls(struct ak7375_device *dev_vcm)
{ {
struct v4l2_ctrl_handler *hdl = &dev_vcm->ctrls_vcm; struct v4l2_ctrl_handler *hdl = &dev_vcm->ctrls_vcm;
const struct v4l2_ctrl_ops *ops = &ak7375_vcm_ctrl_ops; const struct v4l2_ctrl_ops *ops = &ak7375_vcm_ctrl_ops;
const struct ak73xx_chipdef *cdef = dev_vcm->cdef;
v4l2_ctrl_handler_init(hdl, 1); v4l2_ctrl_handler_init(hdl, 1);
dev_vcm->focus = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_ABSOLUTE, dev_vcm->focus = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_ABSOLUTE,
0, AK7375_MAX_FOCUS_POS, AK7375_FOCUS_STEPS, 0); 0, cdef->focus_pos_max, cdef->focus_steps, 0);
if (hdl->error) if (hdl->error)
dev_err(dev_vcm->sd.dev, "%s fail error: 0x%x\n", dev_err(dev_vcm->sd.dev, "%s fail error: 0x%x\n",
@ -153,6 +171,8 @@ static int ak7375_probe(struct i2c_client *client)
if (!ak7375_dev) if (!ak7375_dev)
return -ENOMEM; return -ENOMEM;
ak7375_dev->cdef = device_get_match_data(&client->dev);
for (i = 0; i < ARRAY_SIZE(ak7375_supply_names); i++) for (i = 0; i < ARRAY_SIZE(ak7375_supply_names); i++)
ak7375_dev->supplies[i].supply = ak7375_supply_names[i]; ak7375_dev->supplies[i].supply = ak7375_supply_names[i];
@ -206,30 +226,31 @@ static void ak7375_remove(struct i2c_client *client)
/* /*
* This function sets the vcm position, so it consumes least current * This function sets the vcm position, so it consumes least current
* The lens position is gradually moved in units of AK7375_CTRL_STEPS, * The lens position is gradually moved in units of ctrl_steps,
* to make the movements smoothly. * to make the movements smoothly.
*/ */
static int __maybe_unused ak7375_vcm_suspend(struct device *dev) static int __maybe_unused ak7375_vcm_suspend(struct device *dev)
{ {
struct v4l2_subdev *sd = dev_get_drvdata(dev); struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct ak7375_device *ak7375_dev = sd_to_ak7375_vcm(sd); struct ak7375_device *ak7375_dev = sd_to_ak7375_vcm(sd);
const struct ak73xx_chipdef *cdef = ak7375_dev->cdef;
int ret, val; int ret, val;
if (!ak7375_dev->active) if (!ak7375_dev->active)
return 0; return 0;
for (val = ak7375_dev->focus->val & ~(AK7375_CTRL_STEPS - 1); for (val = ak7375_dev->focus->val & ~(cdef->ctrl_steps - 1);
val >= 0; val -= AK7375_CTRL_STEPS) { val >= 0; val -= cdef->ctrl_steps) {
ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_POSITION, ret = ak7375_i2c_write(ak7375_dev, cdef->reg_position,
val << 4, 2); val << cdef->shift_pos, 2);
if (ret) if (ret)
dev_err_once(dev, "%s I2C failure: %d\n", dev_err_once(dev, "%s I2C failure: %d\n",
__func__, ret); __func__, ret);
usleep_range(AK7375_CTRL_DELAY_US, AK7375_CTRL_DELAY_US + 10); usleep_range(cdef->ctrl_delay_us, cdef->ctrl_delay_us + 10);
} }
ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_CONT, ret = ak7375_i2c_write(ak7375_dev, cdef->reg_cont,
AK7375_MODE_STANDBY, 1); cdef->mode_standby, 1);
if (ret) if (ret)
dev_err(dev, "%s I2C failure: %d\n", __func__, ret); dev_err(dev, "%s I2C failure: %d\n", __func__, ret);
@ -246,13 +267,14 @@ static int __maybe_unused ak7375_vcm_suspend(struct device *dev)
/* /*
* This function sets the vcm position to the value set by the user * This function sets the vcm position to the value set by the user
* through v4l2_ctrl_ops s_ctrl handler * through v4l2_ctrl_ops s_ctrl handler
* The lens position is gradually moved in units of AK7375_CTRL_STEPS, * The lens position is gradually moved in units of ctrl_steps,
* to make the movements smoothly. * to make the movements smoothly.
*/ */
static int __maybe_unused ak7375_vcm_resume(struct device *dev) static int __maybe_unused ak7375_vcm_resume(struct device *dev)
{ {
struct v4l2_subdev *sd = dev_get_drvdata(dev); struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct ak7375_device *ak7375_dev = sd_to_ak7375_vcm(sd); struct ak7375_device *ak7375_dev = sd_to_ak7375_vcm(sd);
const struct ak73xx_chipdef *cdef = ak7375_dev->cdef;
int ret, val; int ret, val;
if (ak7375_dev->active) if (ak7375_dev->active)
@ -264,24 +286,24 @@ static int __maybe_unused ak7375_vcm_resume(struct device *dev)
return ret; return ret;
/* Wait for vcm to become ready */ /* Wait for vcm to become ready */
usleep_range(AK7375_POWER_DELAY_US, AK7375_POWER_DELAY_US + 500); usleep_range(cdef->power_delay_us, cdef->power_delay_us + 500);
ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_CONT, ret = ak7375_i2c_write(ak7375_dev, cdef->reg_cont,
AK7375_MODE_ACTIVE, 1); cdef->mode_active, 1);
if (ret) { if (ret) {
dev_err(dev, "%s I2C failure: %d\n", __func__, ret); dev_err(dev, "%s I2C failure: %d\n", __func__, ret);
return ret; return ret;
} }
for (val = ak7375_dev->focus->val % AK7375_CTRL_STEPS; for (val = ak7375_dev->focus->val % cdef->ctrl_steps;
val <= ak7375_dev->focus->val; val <= ak7375_dev->focus->val;
val += AK7375_CTRL_STEPS) { val += cdef->ctrl_steps) {
ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_POSITION, ret = ak7375_i2c_write(ak7375_dev, cdef->reg_position,
val << 4, 2); val << cdef->shift_pos, 2);
if (ret) if (ret)
dev_err_ratelimited(dev, "%s I2C failure: %d\n", dev_err_ratelimited(dev, "%s I2C failure: %d\n",
__func__, ret); __func__, ret);
usleep_range(AK7375_CTRL_DELAY_US, AK7375_CTRL_DELAY_US + 10); usleep_range(cdef->ctrl_delay_us, cdef->ctrl_delay_us + 10);
} }
ak7375_dev->active = true; ak7375_dev->active = true;
@ -290,7 +312,7 @@ static int __maybe_unused ak7375_vcm_resume(struct device *dev)
} }
static const struct of_device_id ak7375_of_table[] = { static const struct of_device_id ak7375_of_table[] = {
{ .compatible = "asahi-kasei,ak7375" }, { .compatible = "asahi-kasei,ak7375", .data = &ak7375_cdef, },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ak7375_of_table); MODULE_DEVICE_TABLE(of, ak7375_of_table);