From: Markus Pargmann <mpa@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] usb: chipidea: Add udc unregister for device removal
Date: Thu, 17 Sep 2015 17:16:25 +0200 [thread overview]
Message-ID: <1442502985-21988-1-git-send-email-mpa@pengutronix.de> (raw)
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 <mpa@pengutronix.de>
---
drivers/usb/gadget/fsl_udc.c | 13 +++++++++++++
drivers/usb/imx/chipidea-imx.c | 6 ++++++
include/usb/fsl_usb2.h | 1 +
3 files changed, 20 insertions(+)
diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c
index 19f3da65bbc6..9b59669773af 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 1dca6bfe1db5..e971df011f51 100644
--- a/drivers/usb/imx/chipidea-imx.c
+++ b/drivers/usb/imx/chipidea-imx.c
@@ -275,6 +275,11 @@ static int imx_chipidea_probe(struct device_d *dev)
return ret;
};
+static void imx_chipidea_remove(struct device_d *dev)
+{
+ ci_udc_unregister();
+}
+
static __maybe_unused struct of_device_id imx_chipidea_dt_ids[] = {
{
.compatible = "fsl,imx27-usb",
@@ -287,5 +292,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 dec3933d82ed..881a5d4fdfd9 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 */
--
2.5.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2015-09-17 15:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 15:16 Markus Pargmann [this message]
2015-09-21 6:24 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1442502985-21988-1-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox