summaryrefslogtreecommitdiff
path: root/patches.tizen/0723-Revert-V4L-s5c73m3-Initial-device-tree-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches.tizen/0723-Revert-V4L-s5c73m3-Initial-device-tree-support.patch')
-rw-r--r--patches.tizen/0723-Revert-V4L-s5c73m3-Initial-device-tree-support.patch221
1 files changed, 221 insertions, 0 deletions
diff --git a/patches.tizen/0723-Revert-V4L-s5c73m3-Initial-device-tree-support.patch b/patches.tizen/0723-Revert-V4L-s5c73m3-Initial-device-tree-support.patch
new file mode 100644
index 00000000000..3ba646625a7
--- /dev/null
+++ b/patches.tizen/0723-Revert-V4L-s5c73m3-Initial-device-tree-support.patch
@@ -0,0 +1,221 @@
+From 84e8affa246b99223e879ae61a58d940d265453d Mon Sep 17 00:00:00 2001
+From: Sylwester Nawrocki <s.nawrocki@samsung.com>
+Date: Mon, 2 Sep 2013 12:38:19 +0200
+Subject: [PATCH 0723/1302] Revert "V4L: s5c73m3: Initial device tree support"
+
+This reverts commit 73cb9c6410de507d85aec8df3ffcaeb0742c6f00.
+
+Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
+Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
+---
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 110 ++++++++++---------------------
+ drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 6 --
+ 2 files changed, 35 insertions(+), 81 deletions(-)
+
+diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+index 6a75a68a..0339f20 100644
+--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
++++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+@@ -23,7 +23,6 @@
+ #include <linux/init.h>
+ #include <linux/media.h>
+ #include <linux/module.h>
+-#include <linux/of_gpio.h>
+ #include <linux/regulator/consumer.h>
+ #include <linux/slab.h>
+ #include <linux/spi/spi.h>
+@@ -1521,28 +1520,17 @@ static const struct v4l2_subdev_ops oif_subdev_ops = {
+ .video = &s5c73m3_oif_video_ops,
+ };
+
+-/*
+- * GPIO control helpers
+- */
+-static int s5c73m3_configure_gpio(struct s5c73m3_gpio *gpio, int idx,
+- const char *name, struct device_node *node)
++static int s5c73m3_configure_gpio(int nr, int val, const char *name)
+ {
+- enum of_gpio_flags of_flags;
+- unsigned long flags;
+-
+- if (node) {
+- gpio->gpio = of_get_gpio_flags(node, idx, &of_flags);
+- gpio->level = !(of_flags & OF_GPIO_ACTIVE_LOW);
+- }
++ unsigned long flags = val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
++ int ret;
+
+- if (!gpio_is_valid(gpio->gpio))
++ if (!gpio_is_valid(nr))
+ return 0;
+-
+- flags = gpio->level ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
+- pr_debug("gpio[%d]: %d, flags: %#lx, of_flags: %#x\n",
+- idx, gpio->gpio, flags, of_flags);
+-
+- return gpio_request_one(gpio->gpio, flags, name);
++ ret = gpio_request_one(nr, flags, name);
++ if (!ret)
++ gpio_export(nr, 0);
++ return ret;
+ }
+
+ static int s5c73m3_free_gpios(struct s5c73m3 *state)
+@@ -1559,59 +1547,33 @@ static int s5c73m3_free_gpios(struct s5c73m3 *state)
+ }
+
+ static int s5c73m3_configure_gpios(struct s5c73m3 *state,
+- struct device *dev)
++ const struct s5c73m3_platform_data *pdata)
+ {
+- const struct s5c73m3_platform_data *pdata = dev->platform_data;
+- struct s5c73m3_gpio gpio;
++ const struct s5c73m3_gpio *gpio = &pdata->gpio_stby;
+ int ret;
+
+ state->gpio[STBY].gpio = -EINVAL;
+ state->gpio[RST].gpio = -EINVAL;
+
+- if (pdata)
+- gpio = pdata->gpio_stby;
+- else
+- gpio.gpio = -EINVAL;
+- ret = s5c73m3_configure_gpio(&gpio, STBY, "S5C73M3_STBY",
+- dev->of_node);
+- if (!ret) {
+- state->gpio[STBY] = gpio;
+- if (gpio_is_valid(gpio.gpio))
+- gpio_set_value(gpio.gpio, 0);
+- if (pdata)
+- gpio = pdata->gpio_reset;
+- else
+- gpio.gpio = -EINVAL;
+- ret = s5c73m3_configure_gpio(&gpio, RST, "S5C73M3_RST",
+- dev->of_node);
+- if (!ret && gpio_is_valid(gpio.gpio))
+- gpio_set_value(gpio.gpio, 0);
+- }
+- if (!ret)
+- state->gpio[RST] = gpio;
+- else
++ ret = s5c73m3_configure_gpio(gpio->gpio, gpio->level, "S5C73M3_STBY");
++ if (ret) {
+ s5c73m3_free_gpios(state);
++ return ret;
++ }
++ state->gpio[STBY] = *gpio;
++ if (gpio_is_valid(gpio->gpio))
++ gpio_set_value(gpio->gpio, 0);
+
+- return ret;
+-}
+-
+-static int s5c73m3_get_platform_data(struct s5c73m3 *state, struct device *dev)
+-{
+- const struct s5c73m3_platform_data *pdata = dev->platform_data;
+- struct device_node *node = dev->of_node;
+-
+- if (!node) {
+- if (!pdata) {
+- dev_err(dev, "Platform data not specified\n");
+- return -EINVAL;
+- }
+-
+- state->mclk_frequency = pdata->mclk_frequency;
+- state->bus_type = pdata->bus_type;
+- return 0;
++ gpio = &pdata->gpio_reset;
++ ret = s5c73m3_configure_gpio(gpio->gpio, gpio->level, "S5C73M3_RST");
++ if (ret) {
++ s5c73m3_free_gpios(state);
++ return ret;
+ }
++ state->gpio[RST] = *gpio;
++ if (gpio_is_valid(gpio->gpio))
++ gpio_set_value(gpio->gpio, 0);
+
+- of_property_read_u32(node, "clock-frequency", &state->mclk_frequency);
+ return 0;
+ }
+
+@@ -1619,19 +1581,21 @@ static int s5c73m3_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+ {
+ struct device *dev = &client->dev;
++ const struct s5c73m3_platform_data *pdata = client->dev.platform_data;
+ struct v4l2_subdev *sd;
+ struct v4l2_subdev *oif_sd;
+ struct s5c73m3 *state;
+ int ret, i;
+
++ if (pdata == NULL) {
++ dev_err(&client->dev, "Platform data not specified\n");
++ return -EINVAL;
++ }
++
+ state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return -ENOMEM;
+
+- ret = s5c73m3_get_platform_data(state, dev);
+- if (ret < 0)
+- return ret;
+-
+ mutex_init(&state->lock);
+ sd = &state->sensor_sd;
+ oif_sd = &state->oif_sd;
+@@ -1669,7 +1633,10 @@ static int s5c73m3_probe(struct i2c_client *client,
+ if (ret < 0)
+ return ret;
+
+- ret = s5c73m3_configure_gpios(state, dev);
++ state->mclk_frequency = pdata->mclk_frequency;
++ state->bus_type = pdata->bus_type;
++
++ ret = s5c73m3_configure_gpios(state, pdata);
+ if (ret)
+ goto out_err1;
+
+@@ -1745,15 +1712,8 @@ static const struct i2c_device_id s5c73m3_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, s5c73m3_id);
+
+-static const struct of_device_id s5c73m3_of_match[] = {
+- { .compatible = "samsung,s5c73m3" },
+- { }
+-};
+-MODULE_DEVICE_TABLE(of, s5c73m3_of_match);
+-
+ static struct i2c_driver s5c73m3_i2c_driver = {
+ .driver = {
+- .of_match_table = s5c73m3_of_match,
+ .name = DRIVER_NAME,
+ },
+ .probe = s5c73m3_probe,
+diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
+index 323b47b..be44558 100644
+--- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
++++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
+@@ -27,11 +27,6 @@
+
+ #define S5C73M3_SPI_DRV_NAME "S5C73M3-SPI"
+
+-static const struct of_device_id s5c73m3_spi_ids[] = {
+- { .compatible = "samsung,s5c73m3" },
+- { }
+-};
+-
+ enum spi_direction {
+ SPI_DIR_RX,
+ SPI_DIR_TX
+@@ -146,7 +141,6 @@ int s5c73m3_register_spi_driver(struct s5c73m3 *state)
+ spidrv->driver.name = S5C73M3_SPI_DRV_NAME;
+ spidrv->driver.bus = &spi_bus_type;
+ spidrv->driver.owner = THIS_MODULE;
+- spidrv->driver.of_match_table = s5c73m3_spi_ids;
+
+ return spi_register_driver(spidrv);
+ }
+--
+1.8.3.2
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 11:19:48 +0000