|
@@ -18,8 +18,6 @@
|
|
|
*/
|
|
|
|
|
|
#include <linux/extcon-provider.h>
|
|
|
-#include <linux/extcon/extcon-gpio.h>
|
|
|
-#include <linux/gpio.h>
|
|
|
#include <linux/gpio/consumer.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/interrupt.h>
|
|
@@ -29,14 +27,30 @@
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/workqueue.h>
|
|
|
|
|
|
+/**
|
|
|
+ * struct gpio_extcon_data - A simple GPIO-controlled extcon device state container.
|
|
|
+ * @edev: Extcon device.
|
|
|
+ * @irq: Interrupt line for the external connector.
|
|
|
+ * @work: Work fired by the interrupt.
|
|
|
+ * @debounce_jiffies: Number of jiffies to wait for the GPIO to stabilize, from the debounce
|
|
|
+ * value.
|
|
|
+ * @gpiod: GPIO descriptor for this external connector.
|
|
|
+ * @extcon_id: The unique id of specific external connector.
|
|
|
+ * @debounce: Debounce time for GPIO IRQ in ms.
|
|
|
+ * @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW).
|
|
|
+ * @check_on_resume: Boolean describing whether to check the state of gpio
|
|
|
+ * while resuming from sleep.
|
|
|
+ */
|
|
|
struct gpio_extcon_data {
|
|
|
struct extcon_dev *edev;
|
|
|
int irq;
|
|
|
struct delayed_work work;
|
|
|
unsigned long debounce_jiffies;
|
|
|
-
|
|
|
- struct gpio_desc *id_gpiod;
|
|
|
- struct gpio_extcon_pdata *pdata;
|
|
|
+ struct gpio_desc *gpiod;
|
|
|
+ unsigned int extcon_id;
|
|
|
+ unsigned long debounce;
|
|
|
+ unsigned long irq_flags;
|
|
|
+ bool check_on_resume;
|
|
|
};
|
|
|
|
|
|
static void gpio_extcon_work(struct work_struct *work)
|
|
@@ -46,11 +60,8 @@ static void gpio_extcon_work(struct work_struct *work)
|
|
|
container_of(to_delayed_work(work), struct gpio_extcon_data,
|
|
|
work);
|
|
|
|
|
|
- state = gpiod_get_value_cansleep(data->id_gpiod);
|
|
|
- if (data->pdata->gpio_active_low)
|
|
|
- state = !state;
|
|
|
-
|
|
|
- extcon_set_state_sync(data->edev, data->pdata->extcon_id, state);
|
|
|
+ state = gpiod_get_value_cansleep(data->gpiod);
|
|
|
+ extcon_set_state_sync(data->edev, data->extcon_id, state);
|
|
|
}
|
|
|
|
|
|
static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
|
|
@@ -62,65 +73,41 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
|
|
|
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)
|
|
|
{
|
|
|
- struct gpio_extcon_pdata *pdata = dev_get_platdata(&pdev->dev);
|
|
|
struct gpio_extcon_data *data;
|
|
|
+ struct device *dev = &pdev->dev;
|
|
|
int ret;
|
|
|
|
|
|
- if (!pdata)
|
|
|
- return -EBUSY;
|
|
|
- if (!pdata->irq_flags || pdata->extcon_id > EXTCON_NONE)
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
- data = devm_kzalloc(&pdev->dev, sizeof(struct gpio_extcon_data),
|
|
|
- GFP_KERNEL);
|
|
|
+ data = devm_kzalloc(dev, sizeof(struct gpio_extcon_data), GFP_KERNEL);
|
|
|
if (!data)
|
|
|
return -ENOMEM;
|
|
|
- data->pdata = pdata;
|
|
|
|
|
|
- /* Initialize the gpio */
|
|
|
- ret = gpio_extcon_init(&pdev->dev, data);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
+ /*
|
|
|
+ * FIXME: extcon_id represents the unique identifier of external
|
|
|
+ * connectors such as EXTCON_USB, EXTCON_DISP_HDMI and so on. extcon_id
|
|
|
+ * is necessary to register the extcon device. But, it's not yet
|
|
|
+ * developed to get the extcon id from device-tree or others.
|
|
|
+ * On later, it have to be solved.
|
|
|
+ */
|
|
|
+ if (!data->irq_flags || data->extcon_id > EXTCON_NONE)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ data->gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN);
|
|
|
+ if (IS_ERR(data->gpiod))
|
|
|
+ return PTR_ERR(data->gpiod);
|
|
|
+ data->irq = gpiod_to_irq(data->gpiod);
|
|
|
+ if (data->irq <= 0)
|
|
|
+ return data->irq;
|
|
|
|
|
|
/* 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(dev, &data->extcon_id);
|
|
|
if (IS_ERR(data->edev)) {
|
|
|
- dev_err(&pdev->dev, "failed to allocate extcon device\n");
|
|
|
+ dev_err(dev, "failed to allocate extcon device\n");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
- ret = devm_extcon_dev_register(&pdev->dev, data->edev);
|
|
|
+ ret = devm_extcon_dev_register(dev, data->edev);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
@@ -130,8 +117,8 @@ static int gpio_extcon_probe(struct platform_device *pdev)
|
|
|
* Request the interrupt of gpio to detect whether external connector
|
|
|
* is attached or detached.
|
|
|
*/
|
|
|
- ret = devm_request_any_context_irq(&pdev->dev, data->irq,
|
|
|
- gpio_irq_handler, pdata->irq_flags,
|
|
|
+ ret = devm_request_any_context_irq(dev, data->irq,
|
|
|
+ gpio_irq_handler, data->irq_flags,
|
|
|
pdev->name, data);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
@@ -158,7 +145,7 @@ static int gpio_extcon_resume(struct device *dev)
|
|
|
struct gpio_extcon_data *data;
|
|
|
|
|
|
data = dev_get_drvdata(dev);
|
|
|
- if (data->pdata->check_on_resume)
|
|
|
+ if (data->check_on_resume)
|
|
|
queue_delayed_work(system_power_efficient_wq,
|
|
|
&data->work, data->debounce_jiffies);
|
|
|
|