media: ov2680: Check for "powerdown" GPIO con-id before checking for "reset" GPIO...

The datasheet of the OV2680 labels the single GPIO to put the sensor in
powersaving mode as XSHUTDN aka shutdown, _not_ reset.

This is important because some boards have standardized sensor connectors
which allow connecting various sensor modules. These connectors have both
reset and powerdown signals and the powerdown signal is routed to
the OV2680's XSHUTDN pin.

On x86/ACPI multiple Bay Trail, Cherry Trail, Sky Lake and Kaby Lake models
have an OV2680 connected to the ISP2 / IPU3. On these devices the GPIOS are
not described in DT instead the GPIOs are described with an Intel specific
DSM which labels them as either powerdown or reset. Often this DSM returns
both reset and powerdown pins even though the OV2680 has only 1 such pin.

For the ov2680 driver to work on these devices it must use the GPIO with
"powerdown" as con-id, matching the XSHUTDN name from the datasheet.

As for why "powerdown" vs say "shutdown" the ACPI DSM -> con-id mapping
code is shared, so we must use standardized names and currently all of
the following sensor drivers already use "powerdown":
adv7180, gc0310, isl7998x, ov02a10, ov2659, ov5640, ov5648, ov5670,
ov5693, ov7670, ov772x, ov7740, ov8858, ov8865 and ov9650 .

Where as the hi846 driver is the lonely standout using "shutdown".

Try the "powerdown" con-id first to make things work, falling back to
"reset" to keep existing DT setups working.

Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c
index bc0ca2927370bdb0cacbbc78cd03c1c8099dc4fe..b912ae7a63da0cb7174dc8fafccd2d50a523d72e 100644 (file)
--- a/drivers/media/i2c/ov2680.c
+++ b/drivers/media/i2c/ov2680.c
@@ -97,7 +97,7 @@ struct ov2680_dev {
        u32                             xvclk_freq;
        struct regulator_bulk_data      supplies[OV2680_NUM_SUPPLIES];
 
-       struct gpio_desc                *reset_gpio;
+       struct gpio_desc                *pwdn_gpio;
        struct mutex                    lock; /* protect members */
 
        bool                            is_enabled;
@@ -180,19 +180,19 @@ static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl)
 
 static void ov2680_power_up(struct ov2680_dev *sensor)
 {
-       if (!sensor->reset_gpio)
+       if (!sensor->pwdn_gpio)
                return;
 
-       gpiod_set_value(sensor->reset_gpio, 0);
+       gpiod_set_value(sensor->pwdn_gpio, 0);
        usleep_range(5000, 10000);
 }
 
 static void ov2680_power_down(struct ov2680_dev *sensor)
 {
-       if (!sensor->reset_gpio)
+       if (!sensor->pwdn_gpio)
                return;
 
-       gpiod_set_value(sensor->reset_gpio, 1);
+       gpiod_set_value(sensor->pwdn_gpio, 1);
        usleep_range(5000, 10000);
 }
 
@@ -336,7 +336,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor)
                return ret;
        }
 
-       if (!sensor->reset_gpio) {
+       if (!sensor->pwdn_gpio) {
                ret = cci_write(sensor->regmap, OV2680_REG_SOFT_RESET, 0x01,
                                NULL);
                if (ret != 0) {
@@ -697,16 +697,27 @@ static int ov2680_check_id(struct ov2680_dev *sensor)
 static int ov2680_parse_dt(struct ov2680_dev *sensor)
 {
        struct device *dev = sensor->dev;
+       struct gpio_desc *gpio;
        int ret;
 
-       sensor->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-                                                    GPIOD_OUT_HIGH);
-       ret = PTR_ERR_OR_ZERO(sensor->reset_gpio);
+       /*
+        * The pin we want is named XSHUTDN in the datasheet. Linux sensor
+        * drivers have standardized on using "powerdown" as con-id name
+        * for powerdown or shutdown pins. Older DTB files use "reset",
+        * so fallback to that if there is no "powerdown" pin.
+        */
+       gpio = devm_gpiod_get_optional(dev, "powerdown", GPIOD_OUT_HIGH);
+       if (!gpio)
+               gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
+
+       ret = PTR_ERR_OR_ZERO(gpio);
        if (ret < 0) {
                dev_dbg(dev, "error while getting reset gpio: %d\n", ret);
                return ret;
        }
 
+       sensor->pwdn_gpio = gpio;
+
        sensor->xvclk = devm_clk_get(dev, "xvclk");
        if (IS_ERR(sensor->xvclk)) {
                dev_err(dev, "xvclk clock missing or invalid\n");