media: v4l2-subdev: add subdev-wide state struct

[linux-2.6-microblaze.git] / drivers / media / i2c / ov2659.c

diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 42f6417..13ded5b 100644 (file)
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -204,6 +204,7 @@ struct ov2659 {
        struct i2c_client *client;
        struct v4l2_ctrl_handler ctrls;
        struct v4l2_ctrl *link_frequency;
+       struct clk *clk;
        const struct ov2659_framesize *frame_size;
        struct sensor_register *format_ctrl_regs;
        struct ov2659_pll_ctrl pll;
@@ -979,7 +980,7 @@ static int ov2659_init(struct v4l2_subdev *sd, u32 val)
  */
 
 static int ov2659_enum_mbus_code(struct v4l2_subdev *sd,
-                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_state *sd_state,
                                 struct v4l2_subdev_mbus_code_enum *code)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -995,7 +996,7 @@ static int ov2659_enum_mbus_code(struct v4l2_subdev *sd,
 }
 
 static int ov2659_enum_frame_sizes(struct v4l2_subdev *sd,
-                                  struct v4l2_subdev_pad_config *cfg,
+                                  struct v4l2_subdev_state *sd_state,
                                   struct v4l2_subdev_frame_size_enum *fse)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -1021,7 +1022,7 @@ static int ov2659_enum_frame_sizes(struct v4l2_subdev *sd,
 }
 
 static int ov2659_get_fmt(struct v4l2_subdev *sd,
-                         struct v4l2_subdev_pad_config *cfg,
+                         struct v4l2_subdev_state *sd_state,
                          struct v4l2_subdev_format *fmt)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -1033,7 +1034,7 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd,
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
                struct v4l2_mbus_framefmt *mf;
 
-               mf = v4l2_subdev_get_try_format(sd, cfg, 0);
+               mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
                mutex_lock(&ov2659->lock);
                fmt->format = *mf;
                mutex_unlock(&ov2659->lock);
@@ -1083,7 +1084,7 @@ static void __ov2659_try_frame_size(struct v4l2_mbus_framefmt *mf,
 }
 
 static int ov2659_set_fmt(struct v4l2_subdev *sd,
-                         struct v4l2_subdev_pad_config *cfg,
+                         struct v4l2_subdev_state *sd_state,
                          struct v4l2_subdev_format *fmt)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -1113,7 +1114,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
-               mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
+               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
                *mf = fmt->format;
 #endif
        } else {
@@ -1186,11 +1187,9 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on)
                goto unlock;
        }
 
-       ret = pm_runtime_get_sync(&client->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(&client->dev);
+       ret = pm_runtime_resume_and_get(&client->dev);
+       if (ret < 0)
                goto unlock;
-       }
 
        ret = ov2659_init(sd, 0);
        if (!ret)
@@ -1270,6 +1269,8 @@ static int ov2659_power_off(struct device *dev)
 
        gpiod_set_value(ov2659->pwdn_gpio, 1);
 
+       clk_disable_unprepare(ov2659->clk);
+
        return 0;
 }
 
@@ -1278,9 +1279,17 @@ static int ov2659_power_on(struct device *dev)
        struct i2c_client *client = to_i2c_client(dev);
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct ov2659 *ov2659 = to_ov2659(sd);
+       int ret;
 
        dev_dbg(&client->dev, "%s:\n", __func__);
 
+       ret = clk_prepare_enable(ov2659->clk);
+       if (ret) {
+               dev_err(&client->dev, "%s: failed to enable clock\n",
+                       __func__);
+               return ret;
+       }
+
        gpiod_set_value(ov2659->pwdn_gpio, 0);
 
        if (ov2659->resetb_gpio) {
@@ -1302,7 +1311,7 @@ static int ov2659_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct v4l2_mbus_framefmt *format =
-                               v4l2_subdev_get_try_format(sd, fh->pad, 0);
+                               v4l2_subdev_get_try_format(sd, fh->state, 0);
 
        dev_dbg(&client->dev, "%s:\n", __func__);
 
@@ -1368,8 +1377,7 @@ static int ov2659_detect(struct v4l2_subdev *sd)
                id = OV265X_ID(pid, ver);
                if (id != OV2659_ID) {
                        dev_err(&client->dev,
-                               "Sensor detection failed (%04X, %d)\n",
-                               id, ret);
+                               "Sensor detection failed (%04X)\n", id);
                        ret = -ENODEV;
                } else {
                        dev_info(&client->dev, "Found OV%04X sensor\n", id);
@@ -1425,7 +1433,6 @@ static int ov2659_probe(struct i2c_client *client)
        const struct ov2659_platform_data *pdata = ov2659_get_pdata(client);
        struct v4l2_subdev *sd;
        struct ov2659 *ov2659;
-       struct clk *clk;
        int ret;
 
        if (!pdata) {
@@ -1440,11 +1447,11 @@ static int ov2659_probe(struct i2c_client *client)
        ov2659->pdata = pdata;
        ov2659->client = client;
 
-       clk = devm_clk_get(&client->dev, "xvclk");
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
+       ov2659->clk = devm_clk_get(&client->dev, "xvclk");
+       if (IS_ERR(ov2659->clk))
+               return PTR_ERR(ov2659->clk);
 
-       ov2659->xvclk_frequency = clk_get_rate(clk);
+       ov2659->xvclk_frequency = clk_get_rate(ov2659->clk);
        if (ov2659->xvclk_frequency < 6000000 ||
            ov2659->xvclk_frequency > 27000000)
                return -EINVAL;
@@ -1506,7 +1513,9 @@ static int ov2659_probe(struct i2c_client *client)
        ov2659->frame_size = &ov2659_framesizes[2];
        ov2659->format_ctrl_regs = ov2659_formats[0].format_ctrl_regs;
 
-       ov2659_power_on(&client->dev);
+       ret = ov2659_power_on(&client->dev);
+       if (ret < 0)
+               goto error;
 
        ret = ov2659_detect(sd);
        if (ret < 0)