* [PATCH v2 1/2] extcon: gpio: Minor cleanups
2014-07-09 9:01 [PATCH v2 0/2] Add devicetree support for extcon-gpio George Cherian
@ 2014-07-09 9:01 ` George Cherian
2014-07-09 9:01 ` [PATCH v2 2/2] extcon: gpio: Add dt support for the driver George Cherian
1 sibling, 0 replies; 3+ messages in thread
From: George Cherian @ 2014-07-09 9:01 UTC (permalink / raw)
To: cw00.choi, myungjoo.ham, grant.likely, rdunlap, galak,
mark.rutland, ijc+devicetree, robh+dt, pawel.moll, linux
Cc: linux-kernel, linux-doc, devicetree, george.cherian
Minor Cleanups
- Order the include files in alphabetical order.
- Fix description of state_off in extcon_gpio.h
- Add a descrition for check_on_resume in extcon_gpio.h
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/extcon/extcon-gpio.c | 10 +++++-----
include/linux/extcon/extcon-gpio.h | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 645b283..6c268b4 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -20,16 +20,16 @@
*
*/
-#include <linux/module.h>
-#include <linux/kernel.h>
+#include <linux/extcon.h>
+#include <linux/extcon/extcon-gpio.h>
+#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
-#include <linux/gpio.h>
-#include <linux/extcon.h>
-#include <linux/extcon/extcon-gpio.h>
struct gpio_extcon_data {
struct extcon_dev *edev;
diff --git a/include/linux/extcon/extcon-gpio.h b/include/linux/extcon/extcon-gpio.h
index 8900fdf..0b17ad4 100644
--- a/include/linux/extcon/extcon-gpio.h
+++ b/include/linux/extcon/extcon-gpio.h
@@ -34,8 +34,10 @@
* @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW).
* @state_on: print_state is overriden with state_on if attached.
* If NULL, default method of extcon class is used.
- * @state_off: print_state is overriden with state_on if detached.
+ * @state_off: print_state is overriden with state_off if detached.
* If NUll, default method of extcon class is used.
+ * @check_on_resume: Boolean describing whether to check the state of gpio
+ * while resuming from sleep.
*
* Note that in order for state_on or state_off to be valid, both state_on
* and state_off should be not NULL. If at least one of them is NULL,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 2/2] extcon: gpio: Add dt support for the driver.
2014-07-09 9:01 [PATCH v2 0/2] Add devicetree support for extcon-gpio George Cherian
2014-07-09 9:01 ` [PATCH v2 1/2] extcon: gpio: Minor cleanups George Cherian
@ 2014-07-09 9:01 ` George Cherian
1 sibling, 0 replies; 3+ messages in thread
From: George Cherian @ 2014-07-09 9:01 UTC (permalink / raw)
To: cw00.choi, myungjoo.ham, grant.likely, rdunlap, galak,
mark.rutland, ijc+devicetree, robh+dt, pawel.moll, linux
Cc: linux-kernel, linux-doc, devicetree, george.cherian
Add device tree support to extcon-gpio driver.
Add devicetree binding documentation
Signed-off-by: George Cherian <george.cherian@ti.com>
---
.../devicetree/bindings/extcon/extcon-gpio.txt | 21 ++++++++++++++++
drivers/extcon/extcon-gpio.c | 28 ++++++++++++++++++++++
2 files changed, 49 insertions(+)
create mode 100644 Documentation/devicetree/bindings/extcon/extcon-gpio.txt
diff --git a/Documentation/devicetree/bindings/extcon/extcon-gpio.txt b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt
new file mode 100644
index 0000000..1c12957
--- /dev/null
+++ b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt
@@ -0,0 +1,21 @@
+GPIO based EXTCON
+
+EXTCON GPIO
+-----------
+
+Required Properties:
+ - compatible: should be:
+ * "ti,extcon-gpio"
+ - gpios: specifies the gpio pin used.
+ - debounce: Debounce time for GPIO IRQ in ms
+ - irq-flags: IRQ flag to be used ( eg: IRQ_TYPE_EDGE_FALLING)
+
+
+Eg:
+
+ extcon1: am43_usbid_extcon1 {
+ compatible = "ti,extcon-gpio";
+ gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>;
+ debounce = <20>;
+ irq-flags = <IRQ_TYPE_EDGE_FALLING>;
+ };
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 6c268b4..e5e2cba 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -27,6 +27,7 @@
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
@@ -83,12 +84,33 @@ static ssize_t extcon_gpio_print_state(struct extcon_dev *edev, char *buf)
static int gpio_extcon_probe(struct platform_device *pdev)
{
+ struct device_node *np = pdev->dev.of_node;
struct gpio_extcon_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct gpio_extcon_data *extcon_data;
int ret;
+ if (np) {
+ enum of_gpio_flags flags;
+
+ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return -ENOMEM;
+
+ pdata->gpio = of_get_gpio(np, 0);
+ if (!gpio_is_valid(pdata->gpio))
+ return -EPROBE_DEFER;
+
+ pdata->name = np->name;
+ ret = of_get_gpio_flags(np, 0, &flags);
+ pdata->gpio_active_low = flags & OF_GPIO_ACTIVE_LOW;
+
+ of_property_read_u32(np, "debounce", (u32 *)&pdata->debounce);
+ of_property_read_u32(np, "irq-flags", (u32 *)&pdata->irq_flags);
+ }
+
if (!pdata)
return -EBUSY;
+
if (!pdata->irq_flags) {
dev_err(&pdev->dev, "IRQ flag is not specified.\n");
return -EINVAL;
@@ -177,6 +199,11 @@ static int gpio_extcon_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(gpio_extcon_pm_ops, NULL, gpio_extcon_resume);
+static struct of_device_id of_extcon_gpio_match_tbl[] = {
+ { .compatible = "ti,extcon-gpio", },
+ { /* end */ }
+};
+
static struct platform_driver gpio_extcon_driver = {
.probe = gpio_extcon_probe,
.remove = gpio_extcon_remove,
@@ -184,6 +211,7 @@ static struct platform_driver gpio_extcon_driver = {
.name = "extcon-gpio",
.owner = THIS_MODULE,
.pm = &gpio_extcon_pm_ops,
+ .of_match_table = of_extcon_gpio_match_tbl,
},
};
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread