Merge tag 'fixes-for-v3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe says: usb: fixes for v3.8-rc2 Here is the first set of fixes for v3.8-rc cycle. There is a build fix for musb's dsps glue layer caused by some header cleanup on the OMAP tree. Marvel's USB drivers got a fix up for clk API usage switching over to clk_prepare() calls. u_serial has a bug fix for a missing wake_up() which would make gs_cleanup() wait forever for gs_close() to finish. A minor bug fix on dwc3's debugfs interface which would make us read wrong addresses when dumping all registers. dummy_hcd learned how to enumerate g_multi. s3c-hsotg now understands that we shouldn't kfree() memory allocated with devm_*. Other than that, there are a bunch of other minor fixes on renesas_usbhs, tcm_usb_gadget and amd5536udc. All patches have been pending on mailing for many weeks and shouldn't cause any problems.
This commit is contained in:
@@ -2298,10 +2298,7 @@ static int __init musb_init(void)
|
||||
if (usb_disabled())
|
||||
return 0;
|
||||
|
||||
pr_info("%s: version " MUSB_VERSION ", "
|
||||
"?dma?"
|
||||
", "
|
||||
"otg (peripheral+host)",
|
||||
pr_info("%s: version " MUSB_VERSION ", ?dma?, otg (peripheral+host)\n",
|
||||
musb_driver_name);
|
||||
return platform_driver_register(&musb_driver);
|
||||
}
|
||||
|
@@ -134,6 +134,11 @@ static const resource_size_t dsps_control_module_phys[] = {
|
||||
DSPS_AM33XX_CONTROL_MODULE_PHYS_1,
|
||||
};
|
||||
|
||||
#define USBPHY_CM_PWRDN (1 << 0)
|
||||
#define USBPHY_OTG_PWRDN (1 << 1)
|
||||
#define USBPHY_OTGVDET_EN (1 << 19)
|
||||
#define USBPHY_OTGSESSEND_EN (1 << 20)
|
||||
|
||||
/**
|
||||
* musb_dsps_phy_control - phy on/off
|
||||
* @glue: struct dsps_glue *
|
||||
|
Reference in New Issue
Block a user