Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff7532ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more USB fixes from Greg Kroah-Hartman:
 "Here are some more USB fixes for the 3.8-rc4 tree.

  Some gadget driver fixes, and finally resolved the ehci-mxc driver
  build issues (it's just some code moving around and being deleted)."

* tag 'usb-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: EHCI: fix build error in ehci-mxc
  USB: EHCI: add a name for the platform-private field
  USB: EHCI: fix incorrect configuration test
  USB: EHCI: Move definition of EHCI_STATS to ehci.h
  USB: UHCI: fix IRQ race during initialization
  usb: gadget: FunctionFS: Fix missing braces in parse_opts
  usb: dwc3: gadget: fix ep->maxburst for ep0
  ARM: i.MX clock: Change the connection-id for fsl-usb2-udc
  usb: gadget: fsl_mxc_udc: replace MX35_IO_ADDRESS to ioremap
  usb: gadget: fsl-mxc-udc: replace cpu_is_xxx() with platform_device_id
  usb: musb: cppi_dma: drop '__init' annotation
parents ae763db4 dba63b2f

arch/arm/mach-imx/clk-imx25.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -254,9 +254,9 @@ int __init mx25_clocks_init(void) 
	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27");

	clk_register_clkdev(clk[usbotg_ahb], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[usbotg_ahb], "ahb", "imx-udc-mx27");

	clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27");

	clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0");

	clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0");

	/* i.mx25 has the i.mx35 type cspi */

	/* i.mx25 has the i.mx35 type cspi */

	clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0");

	clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0");

arch/arm/mach-imx/clk-imx27.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -236,9 +236,9 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");

	clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");

	clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0");

	clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0");

	clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0");

	clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0");

	clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27");

	clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_ipg_gate], "ipg", "imx-udc-mx27");

	clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_ahb_gate], "ahb", "imx-udc-mx27");

	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0");

	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0");

	clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.0");

	clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.0");

	clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.0");

	clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.0");

arch/arm/mach-imx/clk-imx31.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -139,9 +139,9 @@ int __init mx31_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_div_post], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_div_post], "per", "imx-udc-mx27");

	clk_register_clkdev(clk[usb_gate], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_gate], "ahb", "imx-udc-mx27");

	clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27");

	clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");

	clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");

	/* i.mx31 has the i.mx21 type uart */

	/* i.mx31 has the i.mx21 type uart */

	clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0");

	clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0");

arch/arm/mach-imx/clk-imx35.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -251,9 +251,9 @@ int __init mx35_clocks_init() 
	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[usbotg_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usbotg_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27");

	clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27");

	clk_register_clkdev(clk[usbotg_gate], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[usbotg_gate], "ahb", "imx-udc-mx27");

	clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");

	clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");

	clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0");

	clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0");

	clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");

	clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");

arch/arm/mach-imx/clk-imx51-imx53.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -269,9 +269,9 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, 
	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2");

	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2");

	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2");

	clk_register_clkdev(clk[usboh3_per_gate], "per", "fsl-usb2-udc");

	clk_register_clkdev(clk[usboh3_per_gate], "per", "imx-udc-mx51");

	clk_register_clkdev(clk[usboh3_gate], "ipg", "fsl-usb2-udc");

	clk_register_clkdev(clk[usboh3_gate], "ipg", "imx-udc-mx51");

	clk_register_clkdev(clk[usboh3_gate], "ahb", "fsl-usb2-udc");

	clk_register_clkdev(clk[usboh3_gate], "ahb", "imx-udc-mx51");

	clk_register_clkdev(clk[nfc_gate], NULL, "imx51-nand");

	clk_register_clkdev(clk[nfc_gate], NULL, "imx51-nand");

	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");

	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");