Hi!
> The sensor is found in Nokia N900 main camera
>
> Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@xxxxxxxxx>
> +/*
> + * A buffered write method that puts the wanted register write
> + * commands in a message list and passes the list to the i2c framework
> + */
> +static int et8ek8_i2c_buffered_write_regs(struct i2c_client *client,
> + const struct et8ek8_reg *wnext,
> + int cnt)
> +{
> + /* FIXME: check how big cnt is */
> + struct i2c_msg msg[cnt];
> + unsigned char data[cnt][6];
Uff, no, variable length arrays in the kernel. No, I don't think that
should be done. Rather allocate maximum length here and then check its
> cnt?
> +/*
> + * Write a list of registers to i2c device.
> + *
> + * The list of registers is terminated by ET8EK8_REG_TERM.
> + * Returns zero if successful, or non-zero otherwise.
> + */
> +static int et8ek8_i2c_write_regs(struct i2c_client *client,
> + const struct et8ek8_reg reglist[])
> +{
> + int r, cnt = 0;
> + const struct et8ek8_reg *next, *wnext;
> +
> + if (!client->adapter)
> + return -ENODEV;
> +
> + if (reglist == NULL)
(!reglist) ? :-). Actually, you can keep your preffered style there,
but maybe ammount of if (something that can not happen) return
... should be reduced. Noone should ever call this without valid
reglist or client->adapter, right?
> + return -EINVAL;
> +
> + /* Initialize list pointers to the start of the list */
> + next = wnext = reglist;
> +
> + do {
> + /*
> + * We have to go through the list to figure out how
> + * many regular writes we have in a row
> + */
> + while (next->type != ET8EK8_REG_TERM
> + && next->type != ET8EK8_REG_DELAY) {
> + /*
> + * Here we check that the actual length fields
> + * are valid
> + */
> + if (next->type != ET8EK8_REG_8BIT
> + && next->type != ET8EK8_REG_16BIT) {
Extra space after &&
> + dev_err(&client->dev,
> + "Invalid value on entry %d 0x%x\n",
> + cnt, next->type);
> + return -EINVAL;
> + }
And maybe this could be just BUG_ON().
> +static struct et8ek8_reglist *et8ek8_reglist_find_mode_fmt(
> + struct et8ek8_meta_reglist *meta,
> + struct v4l2_mbus_framefmt *fmt)
> +{
> + struct et8ek8_reglist **list = et8ek8_reglist_first(meta);
> + struct et8ek8_reglist *best_match = NULL;
> + struct et8ek8_reglist *best_other = NULL;
> + struct v4l2_mbus_framefmt format;
> + unsigned int max_dist_match = (unsigned int)-1;
> + unsigned int max_dist_other = (unsigned int)-1;
> +
> + /* Find the mode with the closest image size. The distance between
> + * image sizes is the size in pixels of the non-overlapping regions
You may want to run checkpatch. I guess it will complain. I doubt it
matters much :-).
> + while (meta->reglist[nlists].ptr != NULL)
> + nlists++;
...!= NULL) can be removed. ... here and in other places.
> +
> + rval = et8ek8_i2c_write_reg(client, ET8EK8_REG_8BIT, 0x111B,
> + tp_mode << 4);
> + if (rval)
> + goto out;
> +
> + rval = et8ek8_i2c_write_reg(client, ET8EK8_REG_8BIT, 0x1121,
> + cbh_mode << 7);
> + if (rval)
> + goto out;
> +
> + rval = et8ek8_i2c_write_reg(client, ET8EK8_REG_8BIT, 0x1124,
> + cbv_mode << 7);
> + if (rval)
> + goto out;
> +
> + rval = et8ek8_i2c_write_reg(client, ET8EK8_REG_8BIT, 0x112C, din_sw);
> + if (rval)
> + goto out;
> +
> + rval = et8ek8_i2c_write_reg(client, ET8EK8_REG_8BIT, 0x1420, r1420);
> + if (rval)
> + goto out;
> +
> +out:
> + return rval;
> +}
Goto out when all out does is return is a bit of overkill.
> +static int et8ek8_get_ctrl(struct v4l2_ctrl *ctrl)
> +{
> + struct et8ek8_sensor *sensor =
> + container_of(ctrl->handler, struct et8ek8_sensor, ctrl_handler);
> + const struct et8ek8_mode *mode = &sensor->current_reglist->mode;
> +
> + switch (ctrl->id) {
> + case ET8EK8_CID_USER_FRAME_WIDTH:
> + ctrl->cur.val = mode->width;
> + break;
> + case ET8EK8_CID_USER_FRAME_HEIGHT:
> + ctrl->cur.val = mode->height;
> + break;
> + case ET8EK8_CID_USER_VISIBLE_WIDTH:
> + ctrl->cur.val = mode->window_width;
> + break;
> + case ET8EK8_CID_USER_VISIBLE_HEIGHT:
> + ctrl->cur.val = mode->window_height;
> + break;
> + case ET8EK8_CID_USER_SENSITIVITY:
> + ctrl->cur.val = mode->sensitivity;
> + break;
> + }
default: return -EINVAL ?
> + /*
> + * Calculate average pixel clock per line. Assume buffers can spread
> + * the data over horizontal blanking time. Rounding upwards.
> + * Formula taken from stock Nokia N900 kernel
> + */
"kernel." ?
> +static int et8ek8_power_off(struct et8ek8_sensor *sensor)
> +{
> + int rval;
> +
> + gpiod_set_value(sensor->reset, 0);
> + udelay(1);
> +
> + clk_disable_unprepare(sensor->ext_clk);
> +
> + rval = regulator_disable(sensor->vana);
> + return rval;
> +}
get rid of rval, return directly?
> + udelay(10); /* I wish this is a good value */
Me too ;-).
> +static int et8ek8_g_priv_mem(struct v4l2_subdev *subdev)
> +{
> + struct et8ek8_sensor *sensor = to_et8ek8_sensor(subdev);
> + struct i2c_client *client = v4l2_get_subdevdata(subdev);
> + unsigned int length = ET8EK8_PRIV_MEM_SIZE;
> + unsigned int offset = 0;
> + u8 *ptr = sensor->priv_mem;
> + int rval = 0;
> +
> + /* Read the EEPROM window-by-window, each window 8 bytes */
> + do {
> + u8 buffer[PRIV_MEM_WIN_SIZE];
> + struct i2c_msg msg;
> + int bytes, i;
> + int ofs;
> +
> + /* Set the current window */
> + rval = et8ek8_i2c_write_reg(client, ET8EK8_REG_8BIT, 0x0001,
> + 0xe0 | (offset >> 3));
> + if (rval < 0)
> + goto out;
out: only does return, cleaning it up here will help readability.
> + /* Wait for status bit */
> + for (i = 0; i < 1000; ++i) {
> + u32 status;
> +
> + rval = et8ek8_i2c_read_reg(client, ET8EK8_REG_8BIT,
> + 0x0003, &status);
> + if (rval < 0)
> + goto out;
> + if ((status & 0x08) == 0)
> + break;
> + usleep_range(1000, 2000);
> + };
> +
> + if (i == 1000) {
> + rval = -EIO;
> + goto out;
> + }
Especially here.
> + if (rval < 0)
> + goto out;
> + rval = 0;
And here.
> +#ifndef ET8EK8REGS_H
> +#define ET8EK8REGS_H
> +
> +#include <linux/i2c.h>
> +#include <linux/types.h>
> +#include <linux/videodev2.h>
> +#include <linux/v4l2-subdev.h>
> +
> +struct v4l2_mbus_framefmt;
> +struct v4l2_subdev_pad_mbus_code_enum;
> +
> +#define ET8EK8_MAGIC 0x531A0002
> +
> +struct et8ek8_mode {
> + /* Physical sensor resolution and current image window */
> + __u16 sensor_width;
> + __u16 sensor_height;
Is this exported to userspace?
Thanks,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
