diff options
| author | Greg Kroah-Hartman <[email protected]> | 2016-03-01 16:49:18 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2016-03-01 16:49:18 -0800 |
| commit | 449a97d07a8d4ed4e8e3981ce6ae42c25e381b24 (patch) | |
| tree | e95efe57f0cdeef3295da36bb0e88caf25399ac6 /include/linux | |
| parent | 523462df282fc527a01bceca5125017e2259fbf5 (diff) | |
| parent | ae64e42cc2b3a17ac0c11815f53211093a54cf55 (diff) | |
Merge tag 'extcon-next-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing
Chanwoo writes:
Update extcon for 4.6
Detailed description for patchset:
1. Add new EXTCON_CHG_USB_SDP type
- SDP (Standard Downstream Port) USB Charging Port
means the charging connector.a
2. Add the VBUS detection by using GPIO on extcon-palmas
- Beaglex15 board uses the extcon-palmas driver
But, beaglex15 board need the GPIO support for VBUS
detection.
3. Fix the minor issue of extcon drivers
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/palmas.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index c800dbc42079..5c9a1d44c125 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -580,7 +580,9 @@ struct palmas_usb { int vbus_irq; int gpio_id_irq; + int gpio_vbus_irq; struct gpio_desc *id_gpiod; + struct gpio_desc *vbus_gpiod; unsigned long sw_debounce_jiffies; struct delayed_work wq_detectid; @@ -589,6 +591,7 @@ struct palmas_usb { bool enable_vbus_detection; bool enable_id_detection; bool enable_gpio_id_detection; + bool enable_gpio_vbus_detection; }; #define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator) |