The ov772x driver uses "rstb-gpios" and "pwdn-gpios" for reset and
powerdown pins.  However, using generic names for these gpios is
preferred.  ("reset-gpios" and "powerdown-gpios" respectively)

There is only one mainline user for these gpios, so rename to generic
names.

Cc: Jacopo Mondi <jacopo+rene...@jmondi.org>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Hans Verkuil <hans.verk...@cisco.com>
Cc: Sakari Ailus <sakari.ai...@linux.intel.com>
Cc: Mauro Carvalho Chehab <mche...@s-opensource.com>
Reviewed-by: Jacopo Mondi <jac...@jmondi.org>
Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com>
---
* v4
- No changes

 arch/sh/boards/mach-migor/setup.c | 5 +++--
 drivers/media/i2c/ov772x.c        | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/sh/boards/mach-migor/setup.c 
b/arch/sh/boards/mach-migor/setup.c
index 271dfc2..73b9ee4 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -351,8 +351,9 @@ static struct platform_device migor_ceu_device = {
 static struct gpiod_lookup_table ov7725_gpios = {
        .dev_id         = "0-0021",
        .table          = {
-               GPIO_LOOKUP("sh7722_pfc", GPIO_PTT0, "pwdn", GPIO_ACTIVE_HIGH),
-               GPIO_LOOKUP("sh7722_pfc", GPIO_PTT3, "rstb", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("sh7722_pfc", GPIO_PTT0, "powerdown",
+                           GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP("sh7722_pfc", GPIO_PTT3, "reset", GPIO_ACTIVE_LOW),
        },
 };
 
diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c
index bb5327f..97a65ce 100644
--- a/drivers/media/i2c/ov772x.c
+++ b/drivers/media/i2c/ov772x.c
@@ -837,10 +837,10 @@ static int ov772x_power_on(struct ov772x_priv *priv)
         * available to handle this cleanly, request the GPIO temporarily
         * to avoid conflicts.
         */
-       priv->rstb_gpio = gpiod_get_optional(&client->dev, "rstb",
+       priv->rstb_gpio = gpiod_get_optional(&client->dev, "reset",
                                             GPIOD_OUT_LOW);
        if (IS_ERR(priv->rstb_gpio)) {
-               dev_info(&client->dev, "Unable to get GPIO \"rstb\"");
+               dev_info(&client->dev, "Unable to get GPIO \"reset\"");
                return PTR_ERR(priv->rstb_gpio);
        }
 
@@ -1307,10 +1307,10 @@ static int ov772x_probe(struct i2c_client *client,
                goto error_ctrl_free;
        }
 
-       priv->pwdn_gpio = gpiod_get_optional(&client->dev, "pwdn",
+       priv->pwdn_gpio = gpiod_get_optional(&client->dev, "powerdown",
                                             GPIOD_OUT_LOW);
        if (IS_ERR(priv->pwdn_gpio)) {
-               dev_info(&client->dev, "Unable to get GPIO \"pwdn\"");
+               dev_info(&client->dev, "Unable to get GPIO \"powerdown\"");
                ret = PTR_ERR(priv->pwdn_gpio);
                goto error_clk_put;
        }
-- 
2.7.4

Reply via email to