korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-24 14:54:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: c8sectpfe: switch to using gpiod API

Browse Source 
This switches the driver from using legacy gpio API and to the newer
gpiod API. Since ordinary gpiod APIs operate on logical and not
electrical levels, handling of the reset GPIO is adjusted accordingly.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Dmitry Torokhov 2023-02-03 15:13:48 -08:00 committed by Hans Verkuil
parent a650b821fa
commit 7d4be90b3d
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c
View File

@ -16,8 +16,10 @@
#include <linux/dma-mapping.h>
#include <linux/dvb/dmx.h>
#include <linux/dvb/frontend.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/firmware.h>
#include <linux/gpio/consumer.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@ -812,30 +814,23 @@ static int c8sectpfe_probe(struct platform_device *pdev)
}
of_node_put(i2c_bus);
tsin->rst_gpio = of_get_named_gpio(child, "reset-gpios", 0);
ret = gpio_is_valid(tsin->rst_gpio);
if (!ret) {
dev_err(dev,
"reset gpio for tsin%d not valid (gpio=%d)\n",
tsin->tsin_id, tsin->rst_gpio);
ret = -EINVAL;
goto err_node_put;
}
ret = devm_gpio_request_one(dev, tsin->rst_gpio,
GPIOF_OUT_INIT_LOW, "NIM reset");
/* Acquire reset GPIO and activate it */
tsin->rst_gpio = devm_fwnode_gpiod_get(dev,
of_fwnode_handle(child),
"reset", GPIOD_OUT_HIGH,
"NIM reset");
ret = PTR_ERR_OR_ZERO(tsin->rst_gpio);
if (ret && ret != -EBUSY) {
dev_err(dev, "Can't request tsin%d reset gpio\n"
, fei->channel_data[index]->tsin_id);
dev_err(dev, "Can't request tsin%d reset gpio\n",
fei->channel_data[index]->tsin_id);
goto err_node_put;
}
if (!ret) {
/* toggle reset lines */
gpio_direction_output(tsin->rst_gpio, 0);
/* wait for the chip to reset */
usleep_range(3500, 5000);
gpio_direction_output(tsin->rst_gpio, 1);
/* release the reset line */
gpiod_set_value_cansleep(tsin->rst_gpio, 0);
usleep_range(3000, 5000);
}

4
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.h
View File

@ -16,6 +16,8 @@
#define C8SECTPFE_MAX_TSIN_CHAN 8
struct gpio_desc;
struct channel_info {
int tsin_id;
@ -25,7 +27,7 @@ struct channel_info {
int i2c;
int dvb_card;
int rst_gpio;
struct gpio_desc *rst_gpio;
struct i2c_adapter *i2c_adapter;
struct i2c_adapter *tuner_i2c;