diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 18:24:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 18:24:38 -0700 |
| commit | 9e43643b11695911bb1dd585d9a9f758a5ad4d89 (patch) | |
| tree | cb9cdcfea0895229fcaceee6bf51d0aa345f5159 /include/linux/usb | |
| parent | a4d8e93c3182a54d8d21a4d1cec6538ae1be9e16 (diff) | |
| parent | 851ce932242d5a79bef8fe625fce37cc2f27033e (diff) | |
| download | op-kernel-dev-9e43643b11695911bb1dd585d9a9f758a5ad4d89.zip op-kernel-dev-9e43643b11695911bb1dd585d9a9f758a5ad4d89.tar.gz | |
Merge tag 'usb-ci-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes:
USB Chipidea updates for v4.4-rc1
- Use extcon framework for VBUS and ID detect
- Add imx6sx and imx7d support
- Other small changes
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/chipidea.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index a41833c..5dd75fa 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -5,9 +5,28 @@ #ifndef __LINUX_USB_CHIPIDEA_H #define __LINUX_USB_CHIPIDEA_H +#include <linux/extcon.h> #include <linux/usb/otg.h> struct ci_hdrc; + +/** + * struct ci_hdrc_cable - structure for external connector cable state tracking + * @state: current state of the line + * @changed: set to true when extcon event happen + * @edev: device which generate events + * @ci: driver state of the chipidea device + * @nb: hold event notification callback + * @conn: used for notification registration + */ +struct ci_hdrc_cable { + bool state; + bool changed; + struct extcon_dev *edev; + struct ci_hdrc *ci; + struct notifier_block nb; +}; + struct ci_hdrc_platform_data { const char *name; /* offset of the capability registers */ @@ -48,6 +67,11 @@ struct ci_hdrc_platform_data { u32 ahb_burst_config; u32 tx_burst_size; u32 rx_burst_size; + + /* VBUS and ID signal state tracking, using extcon framework */ + struct ci_hdrc_cable vbus_extcon; + struct ci_hdrc_cable id_extcon; + u32 phy_clkgate_delay_us; }; /* Default offset of capability registers */ |
