diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-28 15:25:53 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-28 15:25:53 +0100 |
commit | 7e530d32a3655f15f1cf92e8aabed1bc3a21ee36 (patch) | |
tree | 7d6cb1cc6588e0cb1b65bf8d1c610b0ca3cb04de /drivers/usb/dwc3/core.h | |
parent | 19b3cf44e18c202d696354d1947b9a74fbad046e (diff) | |
parent | 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 (diff) |
Merge 6.4-rc4 into usb-next
We need the USB fixes in here and this resolves merge conflicts in:
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/udc/core.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/dwc3/core.h')
-rw-r--r-- | drivers/usb/dwc3/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 1968638f29ed..8b1295e4dcdd 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1118,6 +1118,7 @@ struct dwc3_scratchpad_array { * @dis_metastability_quirk: set to disable metastability quirk. * @dis_split_quirk: set to disable split boundary. * @wakeup_configured: set if the device is configured for remote wakeup. + * @suspended: set to track suspend event due to U3/L2. * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. * @max_cfg_eps: current max number of IN eps used across all USB configs. @@ -1334,6 +1335,7 @@ struct dwc3 { unsigned dis_split_quirk:1; unsigned async_callbacks:1; unsigned wakeup_configured:1; + unsigned suspended:1; u16 imod_interval; |