evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extcon: gpio: Use descriptor-based GPIO interface instead of legacy gpio_* API

Browse source 
This patch uses the descriptor-based GPIO interface (gpiod_* API) instead of
legacy gpio_* API and add the internal gpio_extcon_init() to handle
all gpio-related tasks.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Chanwoo Choi 2015-09-30 14:57:57 +09:00
parent 6ba129974a
commit de992acb93
1 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/extcon/extcon-gpio.c
View file

@ -20,6 +20,7 @@
#include <linux/extcon.h> #include <linux/extcon.h>
#include <linux/extcon/extcon-gpio.h> #include <linux/extcon/extcon-gpio.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -34,6 +35,7 @@ struct gpio_extcon_data {
struct delayed_work work; struct delayed_work work;
unsigned long debounce_jiffies; unsigned long debounce_jiffies;
struct gpio_desc *id_gpiod;
struct gpio_extcon_pdata *pdata; struct gpio_extcon_pdata *pdata;
}; };
@ -44,7 +46,7 @@ static void gpio_extcon_work(struct work_struct *work)
container_of(to_delayed_work(work), struct gpio_extcon_data, container_of(to_delayed_work(work), struct gpio_extcon_data,
work); work);
state = gpio_get_value(data->pdata->gpio); state = gpiod_get_value_cansleep(data->id_gpiod);
if (data->pdata->gpio_active_low) if (data->pdata->gpio_active_low)
state = !state; state = !state;
extcon_set_state(data->edev, state); extcon_set_state(data->edev, state);
@ -59,6 +61,35 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int gpio_extcon_init(struct device *dev, struct gpio_extcon_data *data)
{
struct gpio_extcon_pdata *pdata = data->pdata;
int ret;
ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_DIR_IN,
dev_name(dev));
if (ret < 0)
return ret;
data->id_gpiod = gpio_to_desc(pdata->gpio);
if (!data->id_gpiod)
return -EINVAL;
if (pdata->debounce) {
ret = gpiod_set_debounce(data->id_gpiod,
pdata->debounce * 1000);
if (ret < 0)
data->debounce_jiffies =
msecs_to_jiffies(pdata->debounce);
}
data->irq = gpiod_to_irq(data->id_gpiod);
if (data->irq < 0)
return data->irq;
return 0;
}
static int gpio_extcon_probe(struct platform_device *pdev) static int gpio_extcon_probe(struct platform_device *pdev)
{ {
struct gpio_extcon_pdata *pdata = dev_get_platdata(&pdev->dev); struct gpio_extcon_pdata *pdata = dev_get_platdata(&pdev->dev);
@ -74,26 +105,19 @@ static int gpio_extcon_probe(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
data->pdata = pdata;
/* Initialize the gpio */
ret = gpio_extcon_init(&pdev->dev, data);
if (ret < 0)
return ret;
/* Allocate the memory of extcon devie and register extcon device */
data->edev = devm_extcon_dev_allocate(&pdev->dev, &pdata->extcon_id); data->edev = devm_extcon_dev_allocate(&pdev->dev, &pdata->extcon_id);
if (IS_ERR(data->edev)) { if (IS_ERR(data->edev)) {
dev_err(&pdev->dev, "failed to allocate extcon device\n"); dev_err(&pdev->dev, "failed to allocate extcon device\n");
return -ENOMEM; return -ENOMEM;
} }
data->pdata = pdata;
ret = devm_gpio_request_one(&pdev->dev, data->pdata->gpio, GPIOF_DIR_IN,
pdev->name);
if (ret < 0)
return ret;
if (pdata->debounce) {
ret = gpio_set_debounce(data->pdata->gpio,
pdata->debounce * 1000);
if (ret < 0)
data->debounce_jiffies =
msecs_to_jiffies(pdata->debounce);
}
ret = devm_extcon_dev_register(&pdev->dev, data->edev); ret = devm_extcon_dev_register(&pdev->dev, data->edev);
if (ret < 0) if (ret < 0)
@ -101,10 +125,10 @@ static int gpio_extcon_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&data->work, gpio_extcon_work); INIT_DELAYED_WORK(&data->work, gpio_extcon_work);
data->irq = gpio_to_irq(data->pdata->gpio); /*
if (data->irq < 0) * Request the interrput of gpio to detect whether external connector
return data->irq; * is attached or detached.
*/
ret = devm_request_any_context_irq(&pdev->dev, data->irq, ret = devm_request_any_context_irq(&pdev->dev, data->irq,
gpio_irq_handler, pdata->irq_flags, gpio_irq_handler, pdata->irq_flags,
pdev->name, data); pdev->name, data);