On Thu, 1 Apr 2010, Rodolfo Giometti wrote:
> On Tue, Mar 30, 2010 at 04:06:11PM +0200, Rodolfo Giometti wrote:
> > On Tue, Feb 23, 2010 at 12:19:13AM +0100, Richard Röjfors wrote:
> > >
> > > We use it as a subdev to a driver not yet committed from us. So I think
> > > you should extend it, not move it.
> >
> > Finally I got something functional... but I'm puzzled to know how I
> > can add platform data configuration struct by using the I2C's
> > platform_data pointer if it is already used to hold struct
> > soc_camera_device... O_o
>
> Here my solution:
>
> static __devinit int adv7180_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> struct adv7180_state *state;
> #if defined(CONFIG_SOC_CAMERA)
> struct soc_camera_device *icd = client->dev.platform_data;
> struct soc_camera_link *icl;
> struct adv7180_platform_data *pdata = NULL;
> #else
> struct adv7180_platform_data *pdata =
> client->dev.platform_data;
> #endif
No, we don't want any ifdefs in drivers. And the current driver doesn't
use the platform data, so, I would just leave it as it is - if NULL - no
soc-camera and no platform data, if it set - soc-camera environment is
used. That's until we standardise the use of platform data for v4l i2c
devices.
> struct v4l2_subdev *sd;
> int i, ret;
>
> /* Check if the adapter supports the needed features */
> if (!i2c_check_functionality(client->adapter,
> I2C_FUNC_SMBUS_BYTE_DATA))
> return -EIO;
>
> v4l_info(client, "chip found @ 0x%02x (%s)\n",
> client->addr << 1, client->adapter->name);
>
> #if defined(CONFIG_SOC_CAMERA)
> if (icd) {
> icl = to_soc_camera_link(icd);
> if (!icl || !icl->priv) {
> v4l_err(client, "missing platform data!\n");
> return -EINVAL;
> }
> pdata = icl->priv;
>
> icd->ops = &adv7180_soc_ops;
> v4l_info(client, "soc-camera support enabled\n");
> }
> #endif
>
> state = kzalloc(sizeof(struct adv7180_state), GFP_KERNEL);
> if (state == NULL) {
> ret = -ENOMEM;
> goto err;
> }
>
> state->irq = client->irq;
> INIT_WORK(&state->work, adv7180_work);
> mutex_init(&state->mutex);
> state->autodetect = true;
> sd = &state->sd;
> v4l2_i2c_subdev_init(sd, client, &adv7180_ops);
>
> if (pdata)
> for (i = 0; pdata[i].reg >= 0; i++) {
> printk("----> %x %x\n", pdata[i].reg,
> pdata[i].val);
> ret = i2c_smbus_write_byte_data(client,
> pdata[i].reg, pdata[i].val);
> if (ret < 0)
> goto err_unreg_subdev;
> }
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
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
