| Message ID | 1444028299-11755-1-git-send-email-cw00.choi@samsung.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Mon, Oct 05, 2015 at 03:58:19PM +0900, Chanwoo Choi wrote: > This patch adds the support for Device tree bindings of extcon-gpio driver. > The extcon-gpio device tree node must include the both 'extcon-id' and > 'extcon-gpio' property. > > For exmaple: > usb_cable: extcon-gpio-0 { > compatible = "extcon-gpio"; > extcon-id = <EXTCON_USB>; > extcon-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; > } > > ta_cable: extcon-gpio-1 { > compatible = "extcon-gpio"; > extcon-id = <EXTCON_CHG_USB_DCP>; > extcon-gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; > debounce-ms = <50>; /* 50 millisecond */ > wakeup-source; > } > > &dwc3_usb { > extcon = <&usb_cable>; > }; > > &charger { > extcon = <&ta_cable>; > }; > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > --- > Changes from v1: > - Create the include/dt-bindings/extcon/extcon.h including the identification > of external connector. These definitions are used in dts file. > - Fix error if CONFIG_OF is disabled. > > .../devicetree/bindings/extcon/extcon-gpio.txt | 38 +++++++ > drivers/extcon/extcon-gpio.c | 110 ++++++++++++++++----- > include/dt-bindings/extcon/extcon.h | 44 +++++++++ > include/linux/extcon/extcon-gpio.h | 6 +- > 4 files changed, 173 insertions(+), 25 deletions(-) > create mode 100644 Documentation/devicetree/bindings/extcon/extcon-gpio.txt > create mode 100644 include/dt-bindings/extcon/extcon.h > > diff --git a/Documentation/devicetree/bindings/extcon/extcon-gpio.txt b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt > new file mode 100644 > index 000000000000..70c36f729963 > --- /dev/null > +++ b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt > @@ -0,0 +1,38 @@ > +GPIO Extcon device > + > +This is a virtual device used to generate specific external connector > +from the GPIO pin connected to a GPIO pin. > + > +Required properties: > +- compatible: Must be "extcon-gpio". > +- extcon-id: unique id for specific external connector. > + See include/dt-bindings/extcon/extcon.h. This property is either misnamed and badly described, or it is pointless (the node is sufficient to form a unique ID which can be referenced by phandle). What is this used for exactly? > +- extcon-gpio: GPIO pin to detect the external connector. See gpio binding. > + > +Optional properties: > +- debounce-ms: the debounce dealy for GPIO pin in millisecond. > +- wakeup-source: Boolean, extcon can wake-up the system. > + > +Example: Examples of extcon-gpio node as listed below: > + > + usb_cable: extcon-gpio-0 { > + compatible = "extcon-gpio"; > + extcon-id = <EXTCON_USB>; > + extcon-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; > + } > + > + ta_cable: extcon-gpio-1 { > + compatible = "extcon-gpio"; > + extcon-id = <EXTCON_CHG_USB_DCP>; > + extcon-gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; > + debounce-ms = <50>; /* 50 millisecond */ > + wakeup-source; > + } > + > + &dwc3_usb { > + extcon = <&usb_cable>; > + }; > + > + &charger { > + extcon = <&ta_cable>; > + }; > diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c > index 279ff8f6637d..7f3e24aae0c4 100644 > --- a/drivers/extcon/extcon-gpio.c > +++ b/drivers/extcon/extcon-gpio.c > @@ -1,8 +1,8 @@ > /* > * extcon_gpio.c - Single-state GPIO extcon driver based on extcon class > * > - * Copyright (C) 2008 Google, Inc. > - * Author: Mike Lockwood <lockwood@android.com> > + * Copyright (C) 2015 Chanwoo Choi <cw00.choi@samsung.com>, Samsung Electronics > + * Copyright (C) 2008 Mike Lockwood <lockwood@android.com>, Google, Inc. > * > * Modified by MyungJoo Ham <myungjoo.ham@samsung.com> to support extcon > * (originally switch class is supported) > @@ -26,12 +26,14 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/platform_device.h> > +#include <linux/property.h> > #include <linux/slab.h> > #include <linux/workqueue.h> > > struct gpio_extcon_data { > struct extcon_dev *edev; > int irq; > + bool irq_wakeup; > struct delayed_work work; > unsigned long debounce_jiffies; > > @@ -61,19 +63,50 @@ 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) > +static int gpio_extcon_parse_of(struct device *dev, > + struct gpio_extcon_data *data) > { > - struct gpio_extcon_pdata *pdata = data->pdata; > + struct gpio_extcon_pdata *pdata; > int ret; > > - ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_DIR_IN, > - dev_name(dev)); > + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); > + if (!pdata) > + return -ENOMEM; > + > + ret = device_property_read_u32(dev, "extcon-id", &pdata->extcon_id); > + if (ret < 0) > + return -EINVAL; No sanity checking of the value? Why device_property rather than of_property? > + > + data->id_gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN); > if (ret < 0) > return ret; > > - data->id_gpiod = gpio_to_desc(pdata->gpio); > - if (!data->id_gpiod) > - return -EINVAL; > + data->irq_wakeup = device_property_read_bool(dev, "wakeup-source"); > + > + device_property_read_u32(dev, "debounce-ms", &pdata->debounce); Likewise, surely there's an upper bound above? Mark. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Mark, On 2015년 10월 05일 20:13, Mark Rutland wrote: > On Mon, Oct 05, 2015 at 03:58:19PM +0900, Chanwoo Choi wrote: >> This patch adds the support for Device tree bindings of extcon-gpio driver. >> The extcon-gpio device tree node must include the both 'extcon-id' and >> 'extcon-gpio' property. >> >> For exmaple: >> usb_cable: extcon-gpio-0 { >> compatible = "extcon-gpio"; >> extcon-id = <EXTCON_USB>; >> extcon-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; >> } >> >> ta_cable: extcon-gpio-1 { >> compatible = "extcon-gpio"; >> extcon-id = <EXTCON_CHG_USB_DCP>; >> extcon-gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; >> debounce-ms = <50>; /* 50 millisecond */ >> wakeup-source; >> } >> >> &dwc3_usb { >> extcon = <&usb_cable>; >> }; >> >> &charger { >> extcon = <&ta_cable>; >> }; >> >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> >> --- >> Changes from v1: >> - Create the include/dt-bindings/extcon/extcon.h including the identification >> of external connector. These definitions are used in dts file. >> - Fix error if CONFIG_OF is disabled. >> >> .../devicetree/bindings/extcon/extcon-gpio.txt | 38 +++++++ >> drivers/extcon/extcon-gpio.c | 110 ++++++++++++++++----- >> include/dt-bindings/extcon/extcon.h | 44 +++++++++ >> include/linux/extcon/extcon-gpio.h | 6 +- >> 4 files changed, 173 insertions(+), 25 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/extcon/extcon-gpio.txt >> create mode 100644 include/dt-bindings/extcon/extcon.h >> >> diff --git a/Documentation/devicetree/bindings/extcon/extcon-gpio.txt b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt >> new file mode 100644 >> index 000000000000..70c36f729963 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt >> @@ -0,0 +1,38 @@ >> +GPIO Extcon device >> + >> +This is a virtual device used to generate specific external connector >> +from the GPIO pin connected to a GPIO pin. >> + >> +Required properties: >> +- compatible: Must be "extcon-gpio". >> +- extcon-id: unique id for specific external connector. >> + See include/dt-bindings/extcon/extcon.h. > > This property is either misnamed and badly described, or it is > pointless (the node is sufficient to form a unique ID which can be > referenced by phandle). > > What is this used for exactly? OK, I'll modify the description of 'extcon-id' property as following: - extcon-id: The extcon support the various type of external connector to check whether connector is attached or detached. The each external connector has the unique number to identify it. So this property includes the unique number which indicates the specific external connector. When external connector is attached or detached, GPIO pin detect the changed state. See include/ dt-bindings/extcon/extcon.h which defines the unique number for supported external connector from extcon framework. > >> +- extcon-gpio: GPIO pin to detect the external connector. See gpio binding. >> + >> +Optional properties: >> +- debounce-ms: the debounce dealy for GPIO pin in millisecond. >> +- wakeup-source: Boolean, extcon can wake-up the system. >> + >> +Example: Examples of extcon-gpio node as listed below: >> + >> + usb_cable: extcon-gpio-0 { >> + compatible = "extcon-gpio"; >> + extcon-id = <EXTCON_USB>; >> + extcon-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; >> + } >> + >> + ta_cable: extcon-gpio-1 { >> + compatible = "extcon-gpio"; >> + extcon-id = <EXTCON_CHG_USB_DCP>; >> + extcon-gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; >> + debounce-ms = <50>; /* 50 millisecond */ >> + wakeup-source; >> + } >> + >> + &dwc3_usb { >> + extcon = <&usb_cable>; >> + }; >> + >> + &charger { >> + extcon = <&ta_cable>; >> + }; >> diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c >> index 279ff8f6637d..7f3e24aae0c4 100644 >> --- a/drivers/extcon/extcon-gpio.c >> +++ b/drivers/extcon/extcon-gpio.c >> @@ -1,8 +1,8 @@ >> /* >> * extcon_gpio.c - Single-state GPIO extcon driver based on extcon class >> * >> - * Copyright (C) 2008 Google, Inc. >> - * Author: Mike Lockwood <lockwood@android.com> >> + * Copyright (C) 2015 Chanwoo Choi <cw00.choi@samsung.com>, Samsung Electronics >> + * Copyright (C) 2008 Mike Lockwood <lockwood@android.com>, Google, Inc. >> * >> * Modified by MyungJoo Ham <myungjoo.ham@samsung.com> to support extcon >> * (originally switch class is supported) >> @@ -26,12 +26,14 @@ >> #include <linux/kernel.h> >> #include <linux/module.h> >> #include <linux/platform_device.h> >> +#include <linux/property.h> >> #include <linux/slab.h> >> #include <linux/workqueue.h> >> >> struct gpio_extcon_data { >> struct extcon_dev *edev; >> int irq; >> + bool irq_wakeup; >> struct delayed_work work; >> unsigned long debounce_jiffies; >> >> @@ -61,19 +63,50 @@ 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) >> +static int gpio_extcon_parse_of(struct device *dev, >> + struct gpio_extcon_data *data) >> { >> - struct gpio_extcon_pdata *pdata = data->pdata; >> + struct gpio_extcon_pdata *pdata; >> int ret; >> >> - ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_DIR_IN, >> - dev_name(dev)); >> + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); >> + if (!pdata) >> + return -ENOMEM; >> + >> + ret = device_property_read_u32(dev, "extcon-id", &pdata->extcon_id); >> + if (ret < 0) >> + return -EINVAL; > > No sanity checking of the value? When checking the validation of value, I should check both the unique number and name. But, the name of external connector is only accessed in the extcon core driver(drivers/extcon/extcon.c) So, I'll implement the sanity checking on extcon core when calling the extcon_dev_allocate(*supported_cable). > > Why device_property rather than of_property? There is no special reason. When using the device_property_*(), It is well-working without any problem. >> + >> + data->id_gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN); >> if (ret < 0) >> return ret; >> >> - data->id_gpiod = gpio_to_desc(pdata->gpio); >> - if (!data->id_gpiod) >> - return -EINVAL; >> + data->irq_wakeup = device_property_read_bool(dev, "wakeup-source"); >> + >> + device_property_read_u32(dev, "debounce-ms", &pdata->debounce); > > Likewise, surely there's an upper bound above? The unit of debounce-ms is millisecond. It is not determined limit value for just time. Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/extcon/extcon-gpio.txt b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt new file mode 100644 index 000000000000..70c36f729963 --- /dev/null +++ b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt @@ -0,0 +1,38 @@ +GPIO Extcon device + +This is a virtual device used to generate specific external connector +from the GPIO pin connected to a GPIO pin. + +Required properties: +- compatible: Must be "extcon-gpio". +- extcon-id: unique id for specific external connector. + See include/dt-bindings/extcon/extcon.h. +- extcon-gpio: GPIO pin to detect the external connector. See gpio binding. + +Optional properties: +- debounce-ms: the debounce dealy for GPIO pin in millisecond. +- wakeup-source: Boolean, extcon can wake-up the system. + +Example: Examples of extcon-gpio node as listed below: + + usb_cable: extcon-gpio-0 { + compatible = "extcon-gpio"; + extcon-id = <EXTCON_USB>; + extcon-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; + } + + ta_cable: extcon-gpio-1 { + compatible = "extcon-gpio"; + extcon-id = <EXTCON_CHG_USB_DCP>; + extcon-gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; + debounce-ms = <50>; /* 50 millisecond */ + wakeup-source; + } + + &dwc3_usb { + extcon = <&usb_cable>; + }; + + &charger { + extcon = <&ta_cable>; + }; diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c index 279ff8f6637d..7f3e24aae0c4 100644 --- a/drivers/extcon/extcon-gpio.c +++ b/drivers/extcon/extcon-gpio.c @@ -1,8 +1,8 @@ /* * extcon_gpio.c - Single-state GPIO extcon driver based on extcon class * - * Copyright (C) 2008 Google, Inc. - * Author: Mike Lockwood <lockwood@android.com> + * Copyright (C) 2015 Chanwoo Choi <cw00.choi@samsung.com>, Samsung Electronics + * Copyright (C) 2008 Mike Lockwood <lockwood@android.com>, Google, Inc. * * Modified by MyungJoo Ham <myungjoo.ham@samsung.com> to support extcon * (originally switch class is supported) @@ -26,12 +26,14 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/workqueue.h> struct gpio_extcon_data { struct extcon_dev *edev; int irq; + bool irq_wakeup; struct delayed_work work; unsigned long debounce_jiffies; @@ -61,19 +63,50 @@ 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) +static int gpio_extcon_parse_of(struct device *dev, + struct gpio_extcon_data *data) { - struct gpio_extcon_pdata *pdata = data->pdata; + struct gpio_extcon_pdata *pdata; int ret; - ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_DIR_IN, - dev_name(dev)); + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + ret = device_property_read_u32(dev, "extcon-id", &pdata->extcon_id); + if (ret < 0) + return -EINVAL; + + data->id_gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN); if (ret < 0) return ret; - data->id_gpiod = gpio_to_desc(pdata->gpio); - if (!data->id_gpiod) - return -EINVAL; + data->irq_wakeup = device_property_read_bool(dev, "wakeup-source"); + + device_property_read_u32(dev, "debounce-ms", &pdata->debounce); + + pdata->irq_flags = (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING + | IRQF_ONESHOT); + + data->pdata = pdata; + return 0; +} + +static int gpio_extcon_init(struct device *dev, struct gpio_extcon_data *data) +{ + struct gpio_extcon_pdata *pdata = data->pdata; + int ret; + + if (!data->id_gpiod) { + 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, @@ -96,16 +129,20 @@ static int gpio_extcon_probe(struct platform_device *pdev) struct gpio_extcon_data *data; 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(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; - data->pdata = pdata; + + if (!pdata) { + ret = gpio_extcon_parse_of(&pdev->dev, data); + if (ret < 0) + return ret; + } else { + data->pdata = pdata; + } + + if (!data->pdata->irq_flags || data->pdata->extcon_id == EXTCON_NONE) + return -EINVAL; /* Initialize the gpio */ ret = gpio_extcon_init(&pdev->dev, data); @@ -113,7 +150,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) 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, + &data->pdata->extcon_id); if (IS_ERR(data->edev)) { dev_err(&pdev->dev, "failed to allocate extcon device\n"); return -ENOMEM; @@ -130,7 +168,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) * is attached or detached. */ ret = devm_request_any_context_irq(&pdev->dev, data->irq, - gpio_irq_handler, pdata->irq_flags, + gpio_irq_handler, + data->pdata->irq_flags, pdev->name, data); if (ret < 0) return ret; @@ -139,6 +178,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) /* Perform initial detection */ gpio_extcon_work(&data->work.work); + device_init_wakeup(&pdev->dev, data->irq_wakeup); + return 0; } @@ -152,11 +193,23 @@ static int gpio_extcon_remove(struct platform_device *pdev) } #ifdef CONFIG_PM_SLEEP +static int gpio_extcon_suspend(struct device *dev) +{ + struct gpio_extcon_data *data = dev_get_drvdata(dev); + + if (data->irq_wakeup) + enable_irq_wake(data->irq); + + return 0; +} + static int gpio_extcon_resume(struct device *dev) { - struct gpio_extcon_data *data; + struct gpio_extcon_data *data = dev_get_drvdata(dev); + + if (data->irq_wakeup) + disable_irq_wake(data->irq); - data = dev_get_drvdata(dev); if (data->pdata->check_on_resume) queue_delayed_work(system_power_efficient_wq, &data->work, data->debounce_jiffies); @@ -165,7 +218,18 @@ static int gpio_extcon_resume(struct device *dev) } #endif -static SIMPLE_DEV_PM_OPS(gpio_extcon_pm_ops, NULL, gpio_extcon_resume); +#if defined(CONFIG_OF) +static const struct of_device_id gpio_extcon_of_match[] = { + { .compatible = "extcon-gpio", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, gpio_extcon_of_match); +#else +#define gpio_extcon_of_match NULL +#endif + +static SIMPLE_DEV_PM_OPS(gpio_extcon_pm_ops, + gpio_extcon_suspend, gpio_extcon_resume); static struct platform_driver gpio_extcon_driver = { .probe = gpio_extcon_probe, @@ -173,11 +237,13 @@ static struct platform_driver gpio_extcon_driver = { .driver = { .name = "extcon-gpio", .pm = &gpio_extcon_pm_ops, + .of_match_table = gpio_extcon_of_match, }, }; module_platform_driver(gpio_extcon_driver); +MODULE_AUTHOR("Chanwoo Choi <cw00.choi@samsung.com>"); MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>"); MODULE_DESCRIPTION("GPIO extcon driver"); MODULE_LICENSE("GPL"); diff --git a/include/dt-bindings/extcon/extcon.h b/include/dt-bindings/extcon/extcon.h new file mode 100644 index 000000000000..14c7f36b2206 --- /dev/null +++ b/include/dt-bindings/extcon/extcon.h @@ -0,0 +1,44 @@ +/* + * This header provides constants for most extcon bindings. + * + * Most extcon bindings include the unique identification format. + * In most cases, the unique id format uses the standard values/macro + * defined in this header. + */ + +#ifndef _DT_BINDINGS_EXTCON_EXTCON_H +#define _DT_BINDINGS_EXTCON_EXTCON_H + +/* USB external connector */ +#define EXTCON_USB 1 +#define EXTCON_USB_HOST 2 + +/* Charging external connector */ +#define EXTCON_CHG_USB 5 +#define EXTCON_CHG_USB_FAST 6 +#define EXTCON_CHG_USB_SLOW 7 +#define EXTCON_CHG_USB_DCP 8 +#define EXTCON_CHG_USB_CDP 9 + +/* Jack external connector */ +#define EXTCON_JACK_MICROPHONE 20 +#define EXTCON_JACK_HEADPHONE 21 +#define EXTCON_JACK_LINE_IN 22 +#define EXTCON_JACK_LINE_OUT 23 +#define EXTCON_JACK_VIDEO_IN 24 +#define EXTCON_JACK_VIDEO_OUT 25 +#define EXTCON_JACK_SPDIF_IN 26 +#define EXTCON_JACK_SPDIF_OUT 27 + +/* Display external connector */ +#define EXTCON_DISP_HDMI 40 +#define EXTCON_DISP_MHL 41 +#define EXTCON_DISP_DVI 42 +#define EXTCON_DISP_VGA 43 + +/* Miscellaneous external connector */ +#define EXTCON_DOCK 60 +#define EXTCON_JIG 61 +#define EXTCON_MECHANICAL 62 + +#endif /* _DT_BINDINGS_EXTCON_EXTCON_H */ diff --git a/include/linux/extcon/extcon-gpio.h b/include/linux/extcon/extcon-gpio.h index 7cacafb78b09..bcc6d7f7116a 100644 --- a/include/linux/extcon/extcon-gpio.h +++ b/include/linux/extcon/extcon-gpio.h @@ -1,8 +1,8 @@ /* * Single-state GPIO extcon driver based on extcon class * - * Copyright (C) 2012 Samsung Electronics - * Author: MyungJoo Ham <myungjoo.ham@samsung.com> + * Copyright (C) 2015 Chanwoo Choi <cw00.choi@samsung.com>, Samsung Electronics + * Copyright (C) 2012 MyungJoo Ham <myungjoo.ham@samsung.com>, Samsung Electronics * * based on switch class driver * Copyright (C) 2008 Google, Inc. @@ -38,7 +38,7 @@ struct gpio_extcon_pdata { unsigned int extcon_id; unsigned gpio; bool gpio_active_low; - unsigned long debounce; + unsigned int debounce; unsigned long irq_flags; bool check_on_resume;
This patch adds the support for Device tree bindings of extcon-gpio driver. The extcon-gpio device tree node must include the both 'extcon-id' and 'extcon-gpio' property. For exmaple: usb_cable: extcon-gpio-0 { compatible = "extcon-gpio"; extcon-id = <EXTCON_USB>; extcon-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; } ta_cable: extcon-gpio-1 { compatible = "extcon-gpio"; extcon-id = <EXTCON_CHG_USB_DCP>; extcon-gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; debounce-ms = <50>; /* 50 millisecond */ wakeup-source; } &dwc3_usb { extcon = <&usb_cable>; }; &charger { extcon = <&ta_cable>; }; Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> --- Changes from v1: - Create the include/dt-bindings/extcon/extcon.h including the identification of external connector. These definitions are used in dts file. - Fix error if CONFIG_OF is disabled. .../devicetree/bindings/extcon/extcon-gpio.txt | 38 +++++++ drivers/extcon/extcon-gpio.c | 110 ++++++++++++++++----- include/dt-bindings/extcon/extcon.h | 44 +++++++++ include/linux/extcon/extcon-gpio.h | 6 +- 4 files changed, 173 insertions(+), 25 deletions(-) create mode 100644 Documentation/devicetree/bindings/extcon/extcon-gpio.txt create mode 100644 include/dt-bindings/extcon/extcon.h