drivers: camera: update camera drivers

Updating all camera drivers to pass generic
device structure to common camera functions.

This is needed to support SPI sensors.

Jira CHWI-1191

Change-Id: I798336c432aac61a623297eff4b10bb3c162252b
Signed-off-by: Frank Chen <frankc@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1490036
GVS: Gerrit_Virtual_Submit

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/media/i2c/ov5693.c b/drivers/media/i2c/ov5693.c
index 3ae173c0e..6080960d5 100644
--- a/drivers/media/i2c/ov5693.c
+++ b/drivers/media/i2c/ov5693.c
@@ -282,7 +282,7 @@ static void ov5693_gpio_set(struct ov5693 *priv,
                             unsigned int gpio, int val)
 {
         if (priv->pdata && priv->pdata->use_cam_gpio)
-                cam_gpio_ctrl(priv->i2c_client, gpio, val, 1);
+                cam_gpio_ctrl(&priv->i2c_client->dev, gpio, val, 1);
         else {
                 if (gpio_cansleep(gpio))
                         gpio_set_value_cansleep(gpio, val);
@@ -409,7 +409,7 @@ static int ov5693_power_put(struct ov5693 *priv)
         pw->iovdd = NULL;
 
         if (priv->pdata && priv->pdata->use_cam_gpio)
-                cam_gpio_deregister(priv->i2c_client, pw->pwdn_gpio);
+                cam_gpio_deregister(&priv->i2c_client->dev, pw->pwdn_gpio);
         else {
                 gpio_free(pw->pwdn_gpio);
                 gpio_free(pw->reset_gpio);
@@ -454,10 +454,10 @@ static int ov5693_power_get(struct ov5693 *priv)
 
 
         /* analog 2.8v */
-        err |= camera_common_regulator_get(priv->i2c_client,
+        err |= camera_common_regulator_get(&priv->i2c_client->dev,
                         &pw->avdd, pdata->regulators.avdd);
         /* IO 1.8v */
-        err |= camera_common_regulator_get(priv->i2c_client,
+        err |= camera_common_regulator_get(&priv->i2c_client->dev,
                         &pw->iovdd, pdata->regulators.iovdd);
 
         if (!err) {
@@ -466,7 +466,7 @@ static int ov5693_power_get(struct ov5693 *priv)
         }
 
         if (pdata->use_cam_gpio) {
-                err = cam_gpio_register(priv->i2c_client, pw->pwdn_gpio);
+                err = cam_gpio_register(&priv->i2c_client->dev, pw->pwdn_gpio);
                 if (err)
                         dev_err(&priv->i2c_client->dev,
                                 "%s ERR can't register cam gpio %u!\n",
@@ -497,7 +497,7 @@ static int ov5693_set_coarse_time_short(struct ov5693 *priv, s32 val);
 static int ov5693_s_stream(struct v4l2_subdev *sd, int enable)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct camera_common_data *s_data = to_camera_common_data(client);
+        struct camera_common_data *s_data = to_camera_common_data(&client->dev);
         struct ov5693 *priv = (struct ov5693 *)s_data->priv;
         struct v4l2_control control;
         int err;
@@ -589,7 +589,7 @@ exit:
 static int ov5693_g_input_status(struct v4l2_subdev *sd, u32 *status)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct camera_common_data *s_data = to_camera_common_data(client);
+        struct camera_common_data *s_data = to_camera_common_data(&client->dev);
         struct ov5693 *priv = (struct ov5693 *)s_data->priv;
         struct camera_common_power_rail *pw = &priv->power;
 
@@ -1291,7 +1291,7 @@ static struct camera_common_pdata *ov5693_parse_dt(struct i2c_client *client)
         if (!board_priv_pdata)
                 return NULL;
 
-        err = camera_common_parse_clocks(client, board_priv_pdata);
+        err = camera_common_parse_clocks(&client->dev, board_priv_pdata);
         if (err) {
                 dev_err(&client->dev, "Failed to find clocks\n");
                 goto error;
@@ -1405,7 +1405,7 @@ static int ov5693_probe(struct i2c_client *client,
 
         common_data->ops                = &ov5693_common_ops;
         common_data->ctrl_handler       = &priv->ctrl_handler;
-        common_data->i2c_client         = client;
+        common_data->dev                = &client->dev;
         common_data->frmfmt             = ov5693_frmfmt;
         common_data->colorfmt           = camera_common_find_datafmt(
                                           OV5693_DEFAULT_DATAFMT);
@@ -1431,7 +1431,7 @@ static int ov5693_probe(struct i2c_client *client,
         if (err)
                 return err;
 
-        err = camera_common_parse_ports(client, common_data);
+        err = camera_common_parse_ports(&client->dev, common_data);
         if (err) {
                 dev_err(&client->dev, "Failed to find port info\n");
                 return err;
@@ -1480,7 +1480,7 @@ static int ov5693_probe(struct i2c_client *client,
 static int
 ov5693_remove(struct i2c_client *client)
 {
-        struct camera_common_data *s_data = to_camera_common_data(client);
+        struct camera_common_data *s_data = to_camera_common_data(&client->dev);
         struct ov5693 *priv = (struct ov5693 *)s_data->priv;
 
         v4l2_async_unregister_subdev(priv->subdev);