media: s5c73m3: Switch to GPIO descriptors

The driver has an option to pass in GPIO numbers from platform
data but this is not used in the kernel so delete this. Get
GPIO descriptors using the standard API and simplify the code,
gpiolib will handle any inversions.

Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index d96ba58ce1e5350bf56342e7330354f7917fbe72..59b03b0860d5f0cc6d95f31e25fed6b5352c3fee 100644 (file)
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -10,12 +10,11 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/firmware.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/media.h>
 #include <linux/module.h>
-#include <linux/of_gpio.h>
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
 #include <linux/sizes.h>
@@ -1347,24 +1346,6 @@ static int s5c73m3_oif_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
        return 0;
 }
 
-static int s5c73m3_gpio_set_value(struct s5c73m3 *priv, int id, u32 val)
-{
-       if (!gpio_is_valid(priv->gpio[id].gpio))
-               return 0;
-       gpio_set_value(priv->gpio[id].gpio, !!val);
-       return 1;
-}
-
-static int s5c73m3_gpio_assert(struct s5c73m3 *priv, int id)
-{
-       return s5c73m3_gpio_set_value(priv, id, priv->gpio[id].level);
-}
-
-static int s5c73m3_gpio_deassert(struct s5c73m3 *priv, int id)
-{
-       return s5c73m3_gpio_set_value(priv, id, !priv->gpio[id].level);
-}
-
 static int __s5c73m3_power_on(struct s5c73m3 *state)
 {
        int i, ret;
@@ -1386,10 +1367,9 @@ static int __s5c73m3_power_on(struct s5c73m3 *state)
        v4l2_dbg(1, s5c73m3_dbg, &state->oif_sd, "clock frequency: %ld\n",
                                        clk_get_rate(state->clock));
 
-       s5c73m3_gpio_deassert(state, STBY);
+       gpiod_set_value(state->stby, 0);
        usleep_range(100, 200);
-
-       s5c73m3_gpio_deassert(state, RSET);
+       gpiod_set_value(state->reset, 0);
        usleep_range(50, 100);
 
        return 0;
@@ -1404,11 +1384,10 @@ static int __s5c73m3_power_off(struct s5c73m3 *state)
 {
        int i, ret;
 
-       if (s5c73m3_gpio_assert(state, RSET))
-               usleep_range(10, 50);
-
-       if (s5c73m3_gpio_assert(state, STBY))
-               usleep_range(100, 200);
+       gpiod_set_value(state->reset, 1);
+       usleep_range(10, 50);
+       gpiod_set_value(state->stby, 1);
+       usleep_range(100, 200);
 
        clk_disable_unprepare(state->clock);
 
@@ -1543,58 +1522,10 @@ static const struct v4l2_subdev_ops oif_subdev_ops = {
        .video  = &s5c73m3_oif_video_ops,
 };
 
-static int s5c73m3_configure_gpios(struct s5c73m3 *state)
-{
-       static const char * const gpio_names[] = {
-               "S5C73M3_STBY", "S5C73M3_RST"
-       };
-       struct i2c_client *c = state->i2c_client;
-       struct s5c73m3_gpio *g = state->gpio;
-       int ret, i;
-
-       for (i = 0; i < GPIO_NUM; ++i) {
-               unsigned int flags = GPIOF_DIR_OUT;
-               if (g[i].level)
-                       flags |= GPIOF_INIT_HIGH;
-               ret = devm_gpio_request_one(&c->dev, g[i].gpio, flags,
-                                           gpio_names[i]);
-               if (ret) {
-                       v4l2_err(c, "failed to request gpio %s\n",
-                                gpio_names[i]);
-                       return ret;
-               }
-       }
-       return 0;
-}
-
-static int s5c73m3_parse_gpios(struct s5c73m3 *state)
-{
-       static const char * const prop_names[] = {
-               "standby-gpios", "xshutdown-gpios",
-       };
-       struct device *dev = &state->i2c_client->dev;
-       struct device_node *node = dev->of_node;
-       int ret, i;
-
-       for (i = 0; i < GPIO_NUM; ++i) {
-               enum of_gpio_flags of_flags;
-
-               ret = of_get_named_gpio_flags(node, prop_names[i],
-                                             0, &of_flags);
-               if (ret < 0) {
-                       dev_err(dev, "failed to parse %s DT property\n",
-                               prop_names[i]);
-                       return -EINVAL;
-               }
-               state->gpio[i].gpio = ret;
-               state->gpio[i].level = !(of_flags & OF_GPIO_ACTIVE_LOW);
-       }
-       return 0;
-}
-
 static int s5c73m3_get_platform_data(struct s5c73m3 *state)
 {
-       struct device *dev = &state->i2c_client->dev;
+       struct i2c_client *c = state->i2c_client;
+       struct device *dev = &c->dev;
        const struct s5c73m3_platform_data *pdata = dev->platform_data;
        struct device_node *node = dev->of_node;
        struct device_node *node_ep;
@@ -1608,8 +1539,6 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state)
                }
 
                state->mclk_frequency = pdata->mclk_frequency;
-               state->gpio[STBY] = pdata->gpio_stby;
-               state->gpio[RSET] = pdata->gpio_reset;
                return 0;
        }
 
@@ -1624,9 +1553,17 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state)
                                        state->mclk_frequency);
        }
 
-       ret = s5c73m3_parse_gpios(state);
-       if (ret < 0)
-               return -EINVAL;
+       /* Request GPIO lines asserted */
+       state->stby = devm_gpiod_get(dev, "standby", GPIOD_OUT_HIGH);
+       if (IS_ERR(state->stby))
+               return dev_err_probe(dev, PTR_ERR(state->stby),
+                                    "failed to request gpio S5C73M3_STBY\n");
+       gpiod_set_consumer_name(state->stby, "S5C73M3_STBY");
+       state->reset = devm_gpiod_get(dev, "xshutdown", GPIOD_OUT_HIGH);
+       if (IS_ERR(state->reset))
+               return dev_err_probe(dev, PTR_ERR(state->reset),
+                                    "failed to request gpio S5C73M3_RST\n");
+       gpiod_set_consumer_name(state->reset, "S5C73M3_RST");
 
        node_ep = of_graph_get_next_endpoint(node, NULL);
        if (!node_ep) {
@@ -1708,10 +1645,6 @@ static int s5c73m3_probe(struct i2c_client *client)
        if (ret < 0)
                return ret;
 
-       ret = s5c73m3_configure_gpios(state);
-       if (ret)
-               goto out_err;
-
        for (i = 0; i < S5C73M3_MAX_SUPPLIES; i++)
                state->supplies[i].supply = s5c73m3_supply_names[i];
 

diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
index 141ad0ba7f5a4aba9c5c8d832d511c3c7a402172..e3543ae384edff59e944f7e096ba7c05b17c89a2 100644 (file)
--- a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
@@ -10,7 +10,6 @@
 #include <linux/sizes.h>
 #include <linux/delay.h>
 #include <linux/firmware.h>
-#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/media.h>

diff --git a/drivers/media/i2c/s5c73m3/s5c73m3.h b/drivers/media/i2c/s5c73m3/s5c73m3.h
index c3fcfdd3ea66dff0196959c5e100db75aebc2563..1fc7df41c5ee38d49e89d082347089f7fef37096 100644 (file)
--- a/drivers/media/i2c/s5c73m3/s5c73m3.h
+++ b/drivers/media/i2c/s5c73m3/s5c73m3.h
@@ -12,6 +12,7 @@
 #include <linux/clk.h>
 #include <linux/kernel.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gpio/consumer.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-subdev.h>
@@ -351,12 +352,6 @@ struct s5c73m3_ctrls {
        struct v4l2_ctrl *scene_mode;
 };
 
-enum s5c73m3_gpio_id {
-       STBY,
-       RSET,
-       GPIO_NUM,
-};
-
 enum s5c73m3_resolution_types {
        RES_ISP,
        RES_JPEG,
@@ -383,7 +378,8 @@ struct s5c73m3 {
        u32 i2c_read_address;
 
        struct regulator_bulk_data supplies[S5C73M3_MAX_SUPPLIES];
-       struct s5c73m3_gpio gpio[GPIO_NUM];
+       struct gpio_desc *stby;
+       struct gpio_desc *reset;
 
        struct clk *clock;
 

diff --git a/include/media/i2c/s5c73m3.h b/include/media/i2c/s5c73m3.h
index a51f1025ba1c6b7f426e152c8e403f309d117fdc..df0769d64523639ceecc4220161eba019645f25e 100644 (file)
--- a/include/media/i2c/s5c73m3.h
+++ b/include/media/i2c/s5c73m3.h
@@ -20,21 +20,9 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-mediabus.h>
 
-/**
- * struct s5c73m3_gpio - data structure describing a GPIO
- * @gpio:  GPIO number
- * @level: indicates active state of the @gpio
- */
-struct s5c73m3_gpio {
-       int gpio;
-       int level;
-};
-
 /**
  * struct s5c73m3_platform_data - s5c73m3 driver platform data
  * @mclk_frequency: sensor's master clock frequency in Hz
- * @gpio_reset:  GPIO driving RESET pin
- * @gpio_stby:   GPIO driving STBY pin
  * @bus_type:    bus type
  * @nlanes:      maximum number of MIPI-CSI lanes used
  * @horiz_flip:  default horizontal image flip value, non zero to enable
@@ -44,9 +32,6 @@ struct s5c73m3_gpio {
 struct s5c73m3_platform_data {
        unsigned long mclk_frequency;
 
-       struct s5c73m3_gpio gpio_reset;
-       struct s5c73m3_gpio gpio_stby;
-
        enum v4l2_mbus_type bus_type;
        u8 nlanes;
        u8 horiz_flip;