Commit 8f3bfd21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some small USB driver fixes for 5.11-rc5.  They resolve:

   - xhci issues for some reported problems

   - ehci driver issue for one specific device

   - USB gadget fixes for some reported problems

   - cdns3 driver fixes for issues reported

   - MAINTAINERS file update

   - thunderbolt minor fix

  All of these have been in linux-next with no reported issues"

* tag 'usb-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: bdc: Make bdc pci driver depend on BROKEN
  xhci: tegra: Delay for disabling LFPS detector
  xhci: make sure TRB is fully written before giving it to the controller
  usb: udc: core: Use lock when write to soft_connect
  USB: gadget: dummy-hcd: Fix errors in port-reset handling
  usb: gadget: aspeed: fix stop dma register setting.
  USB: ehci: fix an interrupt calltrace error
  ehci: fix EHCI host controller initialization sequence
  MAINTAINERS: update Peter Chen's email address
  thunderbolt: Drop duplicated 0x prefix from format string
  MAINTAINERS: Update address for Cadence USB3 driver
  usb: cdns3: imx: improve driver .remove API
  usb: cdns3: imx: fix can't create core device the second time issue
  usb: cdns3: imx: fix writing read-only memory issue
parents e6806137 ef02684c

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -3879,7 +3879,7 @@ F: Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt 
F:	drivers/mtd/nand/raw/cadence-nand-controller.c









CADENCE USB3 DRD IP DRIVER









M:	Peter Chen <peter.chen@nxp.com>









M:	Peter Chen <peter.chen@kernel.org>









M:	Pawel Laszczak <pawell@cadence.com>









R:	Roger Quadros <rogerq@kernel.org>









R:	Aswath Govindraju <a-govindraju@ti.com>








@@ -4161,7 +4161,7 @@ S:	Maintained







F:	Documentation/translations/zh_CN/

















CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER









M:	Peter Chen <Peter.Chen@nxp.com>









M:	Peter Chen <peter.chen@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git








@@ -18420,7 +18420,7 @@ F:	Documentation/usb/ohci.rst







F:	drivers/usb/host/ohci*

















USB OTG FSM (Finite State Machine)









M:	Peter Chen <Peter.Chen@nxp.com>









M:	Peter Chen <peter.chen@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git

























drivers/thunderbolt/icm.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2316,7 +2316,7 @@ static int icm_usb4_switch_nvm_authenticate_status(struct tb_switch *sw,

















	if (auth && auth->reply.route_hi == sw->config.route_hi &&









	    auth->reply.route_lo == sw->config.route_lo) {









		tb_dbg(tb, "NVM_AUTH found for %llx flags 0x%#x status %#x\n",









		tb_dbg(tb, "NVM_AUTH found for %llx flags %#x status %#x\n",









		       tb_route(sw), auth->reply.hdr.flags, auth->reply.status);









		if (auth->reply.hdr.flags & ICM_FLAGS_ERROR)









			ret = -EIO;
































drivers/usb/cdns3/cdns3-imx.c



+11
−11






























Original line number
Diff line number
Diff line







@@ -185,7 +185,11 @@ static int cdns_imx_probe(struct platform_device *pdev)







	}



















	data->num_clks = ARRAY_SIZE(imx_cdns3_core_clks);









	data->clks = (struct clk_bulk_data *)imx_cdns3_core_clks;









	data->clks = devm_kmemdup(dev, imx_cdns3_core_clks,









				sizeof(imx_cdns3_core_clks), GFP_KERNEL);









	if (!data->clks)









		return -ENOMEM;



















	ret = devm_clk_bulk_get(dev, data->num_clks, data->clks);









	if (ret)









		return ret;








@@ -214,20 +218,16 @@ static int cdns_imx_probe(struct platform_device *pdev)







	return ret;









}



















static int cdns_imx_remove_core(struct device *dev, void *data)









{









	struct platform_device *pdev = to_platform_device(dev);



















	platform_device_unregister(pdev);



















	return 0;









}



















static int cdns_imx_remove(struct platform_device *pdev)









{









	struct device *dev = &pdev->dev;









	struct cdns_imx *data = dev_get_drvdata(dev);



















	device_for_each_child(dev, NULL, cdns_imx_remove_core);









	pm_runtime_get_sync(dev);









	of_platform_depopulate(dev);









	clk_bulk_disable_unprepare(data->num_clks, data->clks);









	pm_runtime_disable(dev);









	pm_runtime_put_noidle(dev);









	platform_set_drvdata(pdev, NULL);



















	return 0;
































drivers/usb/gadget/udc/aspeed-vhub/epn.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -420,6 +420,9 @@ static void ast_vhub_stop_active_req(struct ast_vhub_ep *ep,







	u32 state, reg, loops;



















	/* Stop DMA activity */









	if (ep->epn.desc_mode)









		writel(VHUB_EP_DMA_CTRL_RESET, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);









	else









		writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);



















	/* Wait for it to complete */
































drivers/usb/gadget/udc/bdc/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -17,7 +17,7 @@ if USB_BDC_UDC







comment "Platform Support"









config	USB_BDC_PCI









	tristate "BDC support for PCIe based platforms"









	depends on USB_PCI









	depends on USB_PCI && BROKEN









	default USB_BDC_UDC









	help









		Enable support for platforms which have BDC connected through PCIe, such as Lego3 FPGA platform.