From d27cddcc3ad5c37c22acf287a5dbe36a0906359f Mon Sep 17 00:00:00 2001 From: Markus Pargmann Date: Thu, 17 Sep 2015 17:16:25 +0200 Subject: usb: chipidea: Add udc unregister for device removal The host may assume that the usb device is still up and running after booting if we do not deregister the udc here. I observed issues when the linux kernel was using a usb gadget directly where the complete USB Hub got disconnected through this. This patch adds a proper USB disconnect for gadget devices. Signed-off-by: Markus Pargmann Signed-off-by: Sascha Hauer --- drivers/usb/gadget/fsl_udc.c | 13 +++++++++++++ drivers/usb/imx/chipidea-imx.c | 7 +++++++ include/usb/fsl_usb2.h | 1 + 3 files changed, 21 insertions(+) diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c index 19f3da65bb..9b59669773 100644 --- a/drivers/usb/gadget/fsl_udc.c +++ b/drivers/usb/gadget/fsl_udc.c @@ -2293,6 +2293,13 @@ err_out: return ret; } +void ci_udc_unregister(void) +{ + if (udc_controller) + usb_del_gadget_udc(&udc_controller->gadget); + +} + static int fsl_udc_probe(struct device_d *dev) { void __iomem *regs = dev_request_mem_region(dev, 0); @@ -2303,8 +2310,14 @@ static int fsl_udc_probe(struct device_d *dev) return ci_udc_register(dev, regs); } +static void fsl_udc_remove(struct device_d *dev) +{ + ci_udc_unregister(); +} + static struct driver_d fsl_udc_driver = { .name = "fsl-udc", .probe = fsl_udc_probe, + .remove = fsl_udc_remove, }; device_platform_driver(fsl_udc_driver); diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c index 1dca6bfe1d..5da2c26494 100644 --- a/drivers/usb/imx/chipidea-imx.c +++ b/drivers/usb/imx/chipidea-imx.c @@ -275,6 +275,12 @@ static int imx_chipidea_probe(struct device_d *dev) return ret; }; +static void imx_chipidea_remove(struct device_d *dev) +{ + if (IS_ENABLED(CONFIG_USB_GADGET_DRIVER_ARC)) + ci_udc_unregister(); +} + static __maybe_unused struct of_device_id imx_chipidea_dt_ids[] = { { .compatible = "fsl,imx27-usb", @@ -287,5 +293,6 @@ static struct driver_d imx_chipidea_driver = { .name = "imx-usb", .probe = imx_chipidea_probe, .of_compatible = DRV_OF_COMPAT(imx_chipidea_dt_ids), + .remove = imx_chipidea_remove, }; device_platform_driver(imx_chipidea_driver); diff --git a/include/usb/fsl_usb2.h b/include/usb/fsl_usb2.h index dec3933d82..881a5d4fdf 100644 --- a/include/usb/fsl_usb2.h +++ b/include/usb/fsl_usb2.h @@ -24,5 +24,6 @@ struct fsl_usb2_platform_data { }; int ci_udc_register(struct device_d *dev, void __iomem *regs); +void ci_udc_unregister(void); #endif /* __USB_FSL_USB2_H */ -- cgit v1.2.3