Re: [PATCH v2] extcon: gpio: Add the support for Device tree bindings
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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
>> }
>>
>> ta_cable: extcon-gpio-1 {
>> compatible = "extcon-gpio";
>> extcon-id = ;
>> 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
>> ---
>> 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 ..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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
>> +}
>> +
>> +ta_cable: extcon-gpio-1 {
>> +compatible = "extcon-gpio";
>> +extcon-id = ;
>> +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
>> + * Copyright (C) 2015 Chanwoo Choi , Samsung
>> Electronics
>> + * Copyright (C) 2008 Mike Lockwood , Google, Inc.
>> *
>> * Modified by MyungJoo Ham to support extcon
>> * (originally switch class is supported)
>> @@ -26,12 +26,14 @@
>> #include
>> #include
>> #include
>> +#include
>> #include
>> #include
>>
>> 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;
>> }
>>
>> -s
Re: [PATCH v2] extcon: gpio: Add the support for Device tree bindings
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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
> }
>
> ta_cable: extcon-gpio-1 {
> compatible = "extcon-gpio";
> extcon-id = ;
> 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
> ---
> 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 ..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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
> + }
> +
> + ta_cable: extcon-gpio-1 {
> + compatible = "extcon-gpio";
> + extcon-id = ;
> + 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
> + * Copyright (C) 2015 Chanwoo Choi , Samsung
> Electronics
> + * Copyright (C) 2008 Mike Lockwood , Google, Inc.
> *
> * Modified by MyungJoo Ham to support extcon
> * (originally switch class is supported)
> @@ -26,12 +26,14 @@
> #include
> #include
> #include
> +#include
> #include
> #include
>
> 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 dev
Re: [PATCH v2] extcon: gpio: Add the support for Device tree bindings
On 2015년 10월 05일 17:03, MyungJoo Ham 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.
>>
> []
>>
>> Signed-off-by: Chanwoo Choi
>
>
> Except for some beautification issues described below,
>
> Signed-off-by: MyungJoo Ham
>
>> ---
>> This patch is based on following patch[1].
>> [1] https://lkml.org/lkml/2015/10/3/304
>>
>> 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 ..70c36f729963
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt
> []
>> 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
>> + * Copyright (C) 2015 Chanwoo Choi , Samsung
>> Electronics
>> + * Copyright (C) 2008 Mike Lockwood , Google, Inc.
>> *
>> * Modified by MyungJoo Ham to support extcon
>> * (originally switch class is supported)
>
> Let's make it in chronological order.
> (may need to "beautify the last two lines as well)
>
> I.e., 2008-->2012-->2015 or 2015-->2012-->2008.
> Not 2015-->2008-->2012
OK. I'll modify it.
>
>
>> @@ -26,12 +26,14 @@
> []
>> diff --git a/include/dt-bindings/extcon/extcon.h
>> b/include/dt-bindings/extcon/extcon.h
>> new file mode 100644
>> index ..14c7f36b2206
>> --- /dev/null
>> +++ b/include/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
> []
>> @@ -38,7 +38,7 @@ struct gpio_extcon_pdata {
>> unsigned int extcon_id;
>> unsigned gpio;
>> bool gpio_active_low;
>> -unsigned long debounce;
>> +unsigned int debounce;
>
> What about u32, making it more clear?
> ( > + device_property_read_u32(dev, "debounce-ms", &pdata->debounce); )
OK.
Thanks,
Chanwoo Choi
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] extcon: gpio: Add the support for Device tree bindings
>
> 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.
>
[]
>
> Signed-off-by: Chanwoo Choi
Except for some beautification issues described below,
Signed-off-by: MyungJoo Ham
> ---
> This patch is based on following patch[1].
> [1] https://lkml.org/lkml/2015/10/3/304
>
> 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 ..70c36f729963
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/extcon/extcon-gpio.txt
[]
> 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
> + * Copyright (C) 2015 Chanwoo Choi , Samsung
> Electronics
> + * Copyright (C) 2008 Mike Lockwood , Google, Inc.
> *
> * Modified by MyungJoo Ham to support extcon
> * (originally switch class is supported)
Let's make it in chronological order.
(may need to "beautify the last two lines as well)
I.e., 2008-->2012-->2015 or 2015-->2012-->2008.
Not 2015-->2008-->2012
> @@ -26,12 +26,14 @@
[]
> diff --git a/include/dt-bindings/extcon/extcon.h
> b/include/dt-bindings/extcon/extcon.h
> new file mode 100644
> index ..14c7f36b2206
> --- /dev/null
> +++ b/include/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
[]
> @@ -38,7 +38,7 @@ struct gpio_extcon_pdata {
> unsigned int extcon_id;
> unsigned gpio;
> bool gpio_active_low;
> - unsigned long debounce;
> + unsigned int debounce;
What about u32, making it more clear?
( > + device_property_read_u32(dev, "debounce-ms", &pdata->debounce); )
> unsigned long irq_flags;
>
> bool check_on_resume;
> --
> 1.8.0
N�r��yb�X��ǧv�^�){.n�+���z��z��z)w* jg��� �ݢj/���z�ޖ��2�ޙ&�)ߡ�a���� �G���h��j:+v���w��٥
[PATCH v2] extcon: gpio: Add the support for Device tree bindings
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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
}
ta_cable: extcon-gpio-1 {
compatible = "extcon-gpio";
extcon-id = ;
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
---
This patch is based on following patch[1].
[1] https://lkml.org/lkml/2015/10/3/304
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 ..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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
+ }
+
+ ta_cable: extcon-gpio-1 {
+ compatible = "extcon-gpio";
+ extcon-id = ;
+ 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
+ * Copyright (C) 2015 Chanwoo Choi , Samsung Electronics
+ * Copyright (C) 2008 Mike Lockwood , Google, Inc.
*
* Modified by MyungJoo Ham to support extcon
* (originally switch class is supported)
@@ -26,12 +26,14 @@
#include
#include
#include
+#include
#include
#include
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);
+
[PATCH v2] extcon: gpio: Add the support for Device tree bindings
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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
}
ta_cable: extcon-gpio-1 {
compatible = "extcon-gpio";
extcon-id = ;
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
---
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 ..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-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
+ }
+
+ ta_cable: extcon-gpio-1 {
+ compatible = "extcon-gpio";
+ extcon-id = ;
+ 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
+ * Copyright (C) 2015 Chanwoo Choi , Samsung Electronics
+ * Copyright (C) 2008 Mike Lockwood , Google, Inc.
*
* Modified by MyungJoo Ham to support extcon
* (originally switch class is supported)
@@ -26,12 +26,14 @@
#include
#include
#include
+#include
#include
#include
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
+
