Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40519d54 authored by Akinobu Mita's avatar Akinobu Mita Committed by Mauro Carvalho Chehab
Browse files

media: ov772x: use generic names for reset and powerdown gpios 



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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4b610d6d

arch/sh/boards/mach-migor/setup.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -351,8 +351,9 @@ static struct platform_device migor_ceu_device = { 
static struct gpiod_lookup_table ov7725_gpios = {

static struct gpiod_lookup_table ov7725_gpios = {

	.dev_id		= "0-0021",

	.dev_id		= "0-0021",

	.table		= {

	.table		= {

		GPIO_LOOKUP("sh7722_pfc", GPIO_PTT0, "pwdn", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("sh7722_pfc", GPIO_PTT0, "powerdown",

		GPIO_LOOKUP("sh7722_pfc", GPIO_PTT3, "rstb", GPIO_ACTIVE_LOW),

			    GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("sh7722_pfc", GPIO_PTT3, "reset", GPIO_ACTIVE_LOW),

	},

	},

};

};

drivers/media/i2c/ov772x.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -837,10 +837,10 @@ static int ov772x_power_on(struct ov772x_priv *priv) 
	 * available to handle this cleanly, request the GPIO temporarily

	 * available to handle this cleanly, request the GPIO temporarily

	 * to avoid conflicts.

	 * to avoid conflicts.

	 */

	 */

	priv->rstb_gpio = gpiod_get_optional(&client->dev, "rstb",

	priv->rstb_gpio = gpiod_get_optional(&client->dev, "reset",

					     GPIOD_OUT_LOW);

					     GPIOD_OUT_LOW);

	if (IS_ERR(priv->rstb_gpio)) {

	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);

		return PTR_ERR(priv->rstb_gpio);

	}

	}
@@ -1307,10 +1307,10 @@ static int ov772x_probe(struct i2c_client *client, 
		goto error_ctrl_free;

		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);

					     GPIOD_OUT_LOW);

	if (IS_ERR(priv->pwdn_gpio)) {

	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);

		ret = PTR_ERR(priv->pwdn_gpio);

		goto error_clk_put;

		goto error_clk_put;

	}

	}