nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

i2c: pca-platform: switch to struct gpio_desc

Browse source 
Make use of struct gpio_desc which allows us to specify the active state
of the reset pin.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Chris Packham 2017-06-26 12:44:31 +12:00 committed by Wolfram Sang
parent e00ad7ef68
commit 4cc7229daa
1 changed files with 19 additions and 24 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/i2c/busses/i2c-pca-platform.c
View file

@ -22,6 +22,7 @@
#include <linux/i2c-algo-pca.h> #include <linux/i2c-algo-pca.h>
#include <linux/i2c-pca-platform.h> #include <linux/i2c-pca-platform.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/irq.h> #include <asm/irq.h>
@ -29,7 +30,7 @@
struct i2c_pca_pf_data { struct i2c_pca_pf_data {
void __iomem *reg_base; void __iomem *reg_base;
int irq; /* if 0, use polling */ int irq; /* if 0, use polling */
int gpio; struct gpio_desc *gpio;
wait_queue_head_t wait; wait_queue_head_t wait;
struct i2c_adapter adap; struct i2c_adapter adap;
struct i2c_algo_pca_data algo_data; struct i2c_algo_pca_data algo_data;
@ -112,9 +113,9 @@ static void i2c_pca_pf_resetchip(void *pd)
{ {
struct i2c_pca_pf_data *i2c = pd; struct i2c_pca_pf_data *i2c = pd;
gpio_set_value(i2c->gpio, 0); gpiod_set_value(i2c->gpio, 1);
ndelay(100); ndelay(100);
gpio_set_value(i2c->gpio, 1); gpiod_set_value(i2c->gpio, 0);
} }
static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id) static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
@ -181,11 +182,24 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
if (platform_data) { if (platform_data) {
i2c->adap.timeout = platform_data->timeout; i2c->adap.timeout = platform_data->timeout;
i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed; i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed;
i2c->gpio = platform_data->gpio; if (gpio_is_valid(platform_data->gpio)) {
ret = devm_gpio_request_one(&pdev->dev,
platform_data->gpio,
GPIOF_ACTIVE_LOW,
i2c->adap.name);
if (ret == 0) {
i2c->gpio = gpio_to_desc(platform_data->gpio);
gpiod_direction_output(i2c->gpio, 0);
i2c->algo_data.reset_chip = i2c_pca_pf_resetchip;
} else {
dev_warn(&pdev->dev, "Registering gpio failed!\n");
i2c->gpio = NULL;
}
}
} else { } else {
i2c->adap.timeout = HZ; i2c->adap.timeout = HZ;
i2c->algo_data.i2c_clock = 59000; i2c->algo_data.i2c_clock = 59000;
i2c->gpio = -1; i2c->gpio = NULL;
} }
i2c->algo_data.data = i2c; i2c->algo_data.data = i2c;
@ -208,19 +222,6 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
break; break;
} }
/* Use gpio_is_valid() when in mainline */
if (i2c->gpio > -1) {
ret = gpio_request(i2c->gpio, i2c->adap.name);
if (ret == 0) {
gpio_direction_output(i2c->gpio, 1);
i2c->algo_data.reset_chip = i2c_pca_pf_resetchip;
} else {
printk(KERN_WARNING "%s: Registering gpio failed!\n",
i2c->adap.name);
i2c->gpio = ret;
}
}
if (irq) { if (irq) {
ret = request_irq(irq, i2c_pca_pf_handler, ret = request_irq(irq, i2c_pca_pf_handler,
IRQF_TRIGGER_FALLING, pdev->name, i2c); IRQF_TRIGGER_FALLING, pdev->name, i2c);
@ -243,9 +244,6 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
if (irq) if (irq)
free_irq(irq, i2c); free_irq(irq, i2c);
e_reqirq: e_reqirq:
if (i2c->gpio > -1)
gpio_free(i2c->gpio);
iounmap(i2c->reg_base); iounmap(i2c->reg_base);
e_remap: e_remap:
kfree(i2c); kfree(i2c);
@ -265,9 +263,6 @@ static int i2c_pca_pf_remove(struct platform_device *pdev)
if (i2c->irq) if (i2c->irq)
free_irq(i2c->irq, i2c); free_irq(i2c->irq, i2c);
if (i2c->gpio > -1)
gpio_free(i2c->gpio);
iounmap(i2c->reg_base); iounmap(i2c->reg_base);
release_mem_region(i2c->io_base, i2c->io_size); release_mem_region(i2c->io_base, i2c->io_size);
kfree(i2c); kfree(i2c);