diff options
| author |   John Youn <John.Youn@synopsys.com> | 2016-02-05 17:06:35 -0800 |
|---|---|---|
| committer |   Felipe Balbi <balbi@kernel.org> | 2016-03-04 15:14:24 +0200 |
| commit | 554eead5436401ae3cfdb7d79fca24c14ebab143 (patch) | |
| tree | fdd573b9709c377eb2952b8dd3bdefe19a74be79 | |
| parent | usb: gadget: Update function for SuperSpeedPlus (diff) | |
| download | wireguard-linux-554eead5436401ae3cfdb7d79fca24c14ebab143.tar.xz wireguard-linux-554eead5436401ae3cfdb7d79fca24c14ebab143.zip | |
usb: gadget: Update config for SuperSpeedPlus
When a function is added to a configuration with usb_add_function(), the
configuration speed flags are updated. These flags indicate for which
speeds the configuration is valid for.
This patch adds a flag in the configuration for SuperSpeedPlus and
also updates this based on the existence of ssp_descriptors.
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
| -rw-r--r-- | drivers/usb/gadget/composite.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/configfs.c | 1 | ||||
| -rw-r--r-- | include/linux/usb/composite.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 11d243349ebf..560330f5457c 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -237,6 +237,8 @@ int usb_add_function(struct usb_configuration *config, config->highspeed = true; if (!config->superspeed && function->ss_descriptors) config->superspeed = true; + if (!config->superspeed_plus && function->ssp_descriptors) + config->superspeed_plus = true; done: if (value) diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index 590c44989e5e..c6cc15ebeed6 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1229,6 +1229,7 @@ static void purge_configs_funcs(struct gadget_info *gi) } c->next_interface_id = 0; memset(c->interface, 0, sizeof(c->interface)); + c->superspeed_plus = 0; c->superspeed = 0; c->highspeed = 0; c->fullspeed = 0; diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 9ff1e465d307..2b81b24eb5aa 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -322,6 +322,7 @@ struct usb_configuration { unsigned superspeed:1; unsigned highspeed:1; unsigned fullspeed:1; + unsigned superspeed_plus:1; struct usb_function *interface[MAX_CONFIG_INTERFACES]; }; |