media: i2c: max9271: Introduce wake_up() function

The MAX9271 chip manual prescribes a delay of 5 milliseconds
after the chip exits from low power state.

Add a new function to the max9271 library driver that wakes up the chip
with a dummy i2c transaction and implements the correct delay of 5
milliseconds after the chip exits from low power state.

Use the newly introduced function in the rdacm20 and rdacm21 camera
drivers. The former was not respecting the required delay while the
latter was waiting for a too-short timeout.

Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/i2c/max9271.c b/drivers/media/i2c/max9271.c
index 2c7dc7fb9846295c977654a155d45cf2ddd2407f..ff86c8c4ea61dbbfbe98b67172bd1b41775c94a0 100644 (file)
--- a/drivers/media/i2c/max9271.c
+++ b/drivers/media/i2c/max9271.c
@@ -80,6 +80,18 @@ static int max9271_pclk_detect(struct max9271_device *dev)
        return -EIO;
 }
 
+void max9271_wake_up(struct max9271_device *dev)
+{
+       /*
+        * Use the chip default address as this function has to be called
+        * before any other one.
+        */
+       dev->client->addr = MAX9271_DEFAULT_ADDR;
+       i2c_smbus_read_byte(dev->client);
+       usleep_range(5000, 8000);
+}
+EXPORT_SYMBOL_GPL(max9271_wake_up);
+
 int max9271_set_serial_link(struct max9271_device *dev, bool enable)
 {
        int ret;

diff --git a/drivers/media/i2c/max9271.h b/drivers/media/i2c/max9271.h
index d78fb21441e99fd21603cde34dfa9acc532ed708..dc5e4e70ba6f5c897da1ee6adb824f9c754748fe 100644 (file)
--- a/drivers/media/i2c/max9271.h
+++ b/drivers/media/i2c/max9271.h
@@ -85,6 +85,15 @@ struct max9271_device {
        struct i2c_client *client;
 };
 
+/**
+ * max9271_wake_up() - Wake up the serializer by issuing an i2c transaction
+ * @dev: The max9271 device
+ *
+ * This function shall be called before any other interaction with the
+ * serializer.
+ */
+void max9271_wake_up(struct max9271_device *dev);
+
 /**
  * max9271_set_serial_link() - Enable/disable serial link
  * @dev: The max9271 device

diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c
index a4b639cf806378df4f1da0591cd828d4f9b423d9..ecd8bf97aae17dca84ec4ed311a78e477fc27048 100644 (file)
--- a/drivers/media/i2c/rdacm20.c
+++ b/drivers/media/i2c/rdacm20.c
@@ -455,9 +455,7 @@ static int rdacm20_initialize(struct rdacm20_device *dev)
        unsigned int retry = 3;
        int ret;
 
-       /* Verify communication with the MAX9271: ping to wakeup. */
-       dev->serializer->client->addr = MAX9271_DEFAULT_ADDR;
-       i2c_smbus_read_byte(dev->serializer->client);
+       max9271_wake_up(dev->serializer);
 
        /* Serial link disabled during config as it needs a valid pixel clock. */
        ret = max9271_set_serial_link(dev->serializer, false);

diff --git a/drivers/media/i2c/rdacm21.c b/drivers/media/i2c/rdacm21.c
index 5b78d818577307040655153725593169303a7020..67ed1e5c450d79d17beed214daa5757e56bb2f2a 100644 (file)
--- a/drivers/media/i2c/rdacm21.c
+++ b/drivers/media/i2c/rdacm21.c
@@ -450,10 +450,7 @@ static int rdacm21_initialize(struct rdacm21_device *dev)
 {
        int ret;
 
-       /* Verify communication with the MAX9271: ping to wakeup. */
-       dev->serializer.client->addr = MAX9271_DEFAULT_ADDR;
-       i2c_smbus_read_byte(dev->serializer.client);
-       usleep_range(3000, 5000);
+       max9271_wake_up(&dev->serializer);
 
        /* Enable reverse channel and disable the serial link. */
        ret = max9271_set_serial_link(&dev->serializer, false);