diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 16:27:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 16:27:14 +0200 |
| commit | 6503016ea5d3945f9af1eeac23ba99f408f3af1e (patch) | |
| tree | 7b965b962ccaf761eacf9adae671797085814344 /include | |
| parent | 8aff4eaa1de7a0ba70af8447ed08127ef0e8e45d (diff) | |
| parent | 59739131e0ca06db7560f9073fff2fb83f6bc2a5 (diff) | |
| download | linux-stable-6503016ea5d3945f9af1eeac23ba99f408f3af1e.tar.gz linux-stable-6503016ea5d3945f9af1eeac23ba99f408f3af1e.tar.bz2 linux-stable-6503016ea5d3945f9af1eeac23ba99f408f3af1e.zip | |
Merge tag 'usb-ci-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-testing
Peter writes:
- Add pinctrl support for dual-role switch at chipidea-core
- improve overcorrent handling for imx
- some small code restructure (no function affect)
* tag 'usb-ci-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
usb: chipidea: Fix otg event handler
usb: chipidea: Prevent unbalanced IRQ disable
doc: usb: ci-hdrc-usb2: Add pinctrl properties definition
usb: chipidea: Add dynamic pinctrl selection
usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match
usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started
usb: chipidea: imx: do not use preprocessor conditionals for PM
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/chipidea.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index 07f99362bc90..63758c399e4e 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -77,6 +77,12 @@ struct ci_hdrc_platform_data { struct ci_hdrc_cable vbus_extcon; struct ci_hdrc_cable id_extcon; u32 phy_clkgate_delay_us; + + /* pins */ + struct pinctrl *pctl; + struct pinctrl_state *pins_default; + struct pinctrl_state *pins_host; + struct pinctrl_state *pins_device; }; /* Default offset of capability registers */ |