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

ed378a52 · Linus Torvalds <[email protected]> · 2012-03-20 11:26:30 -07:00

Pull USB merge for 3.4-rc1 from Greg KH:
 "Here's the big USB merge for the 3.4-rc1 merge window.

  Lots of gadget driver reworks here, driver updates, xhci changes, some
  new drivers added, usb-serial core reworking to fix some bugs, and
  other various minor things.

  There are some patches touching arch code, but they have all been
  acked by the various arch maintainers."

* tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (302 commits)
  net: qmi_wwan: add support for ZTE MF820D
  USB: option: add ZTE MF820D
  usb: gadget: f_fs: Remove lock is held before freeing checks
  USB: option: make interface blacklist work again
  usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
  USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls
  USB: use generic platform driver on ath79
  USB: EHCI: Add a generic platform device driver
  USB: OHCI: Add a generic platform device driver
  USB: ftdi_sio: new PID: LUMEL PD12
  USB: ftdi_sio: add support for FT-X series devices
  USB: serial: mos7840: Fixed MCS7820 device attach problem
  usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.
  usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
  USB: ohci-nxp: Remove i2c_write(), use smbus
  USB: ohci-nxp: Support for LPC32xx
  USB: ohci-nxp: Rename symbols from pnx4008 to nxp
  USB: OHCI-HCD: Rename ohci-pnx4008 to ohci-nxp
  usb: gadget: Kconfig: fix typo for 'different'
  usb: dwc3: pci: fix another failure path in dwc3_pci_probe()
  ...

Commit: ed378a52dabf77b406b447fd3238f83ea24b71fa
Parents: 843ec558 · 11207b6f

Merge commit. Changes below are compared with the first parent: 843ec558.

Changes

268 files changed · +9599 −5517

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-bus-usb	modified	+11	−0	View file
Documentation/feature-removal-schedule.txt	modified	+11	−0	View file
Documentation/i2c/instantiating-devices	modified	+3	−3	View file
arch/arm/mach-imx/mx31moboard-devboard.c	modified	+15	−9	View file
arch/arm/mach-imx/mx31moboard-marxbot.c	modified	+15	−9	View file
arch/arm/mach-pxa/pxa3xx-ulpi.c	modified	+10	−10	View file
arch/arm/mach-tegra/include/mach/usb_phy.h	modified	+1	−1	View file
arch/arm/mach-tegra/usb_phy.c	modified	+2	−2	View file
arch/arm/plat-mxc/include/mach/mxc_ehci.h	modified	+1	−1	View file
arch/arm/plat-mxc/include/mach/ulpi.h	modified	+3	−3	View file
arch/arm/plat-mxc/ulpi.c	modified	+4	−4	View file
arch/mips/ath79/dev-usb.c	modified	+25	−6	View file
drivers/block/Kconfig	modified	+1	−1	View file
drivers/block/ub.c	modified	+2	−37	View file
drivers/net/usb/Kconfig	modified	+22	−0	View file
drivers/net/usb/Makefile	modified	+1	−0	View file
drivers/net/usb/qmi_wwan.c	added	+478	−0	View file
drivers/power/isp1704_charger.c	modified	+58	−48	View file
drivers/power/pda_power.c	modified	+5	−5	View file
drivers/power/twl4030_charger.c	modified	+10	−10	View file
drivers/scsi/scsi_scan.c	modified	+4	−0	View file
drivers/scsi/sd.c	modified	+1	−1	View file
drivers/staging/keucr/transport.h	modified	+0	−37	View file
drivers/staging/quatech_usb2/quatech_usb2.c	modified	+4	−36	View file
drivers/staging/serqt_usb2/serqt_usb2.c	modified	+4	−36	View file
drivers/usb/Kconfig	modified	+22	−21	View file
drivers/usb/class/cdc-acm.c	modified	+29	−1	View file
drivers/usb/class/cdc-wdm.c	modified	+227	−125	View file
drivers/usb/core/driver.c	modified	+78	−42	View file
drivers/usb/core/hcd-pci.c	modified	+2	−0	View file
drivers/usb/core/hcd.c	modified	+3	−3	View file
drivers/usb/core/hub.c	modified	+162	−50	View file
drivers/usb/core/sysfs.c	modified	+23	−0	View file
drivers/usb/core/urb.c	modified	+15	−17	View file
drivers/usb/core/usb.c	modified	+1	−1	View file
drivers/usb/core/usb.h	modified	+1	−0	View file
drivers/usb/dwc3/Makefile	modified	+13	−0	View file
drivers/usb/dwc3/core.c	modified	+52	−70	View file
drivers/usb/dwc3/core.h	modified	+82	−118	View file
drivers/usb/dwc3/debugfs.c	modified	+208	−6	View file
drivers/usb/dwc3/dwc3-exynos.c	added	+151	−0	View file
drivers/usb/dwc3/dwc3-omap.c	modified	+53	−63	View file
drivers/usb/dwc3/dwc3-pci.c	modified	+26	−27	View file
drivers/usb/dwc3/ep0.c	modified	+54	−44	View file
drivers/usb/dwc3/gadget.c	modified	+270	−159	View file
drivers/usb/dwc3/gadget.h	modified	+3	−2	View file
drivers/usb/dwc3/host.c	modified	+1	−1	View file
drivers/usb/gadget/Kconfig	modified	+20	−7	View file
drivers/usb/gadget/amd5536udc.c	modified	+53	−94	View file
drivers/usb/gadget/at91_udc.c	modified	+1	−1	View file
drivers/usb/gadget/atmel_usba_udc.c	modified	+1	−0	View file
drivers/usb/gadget/audio.c	modified	+42	−5	View file
drivers/usb/gadget/ci13xxx_msm.c	modified	+2	−2	View file
drivers/usb/gadget/ci13xxx_udc.c	modified	+10	−8	View file
drivers/usb/gadget/ci13xxx_udc.h	modified	+1	−1	View file
drivers/usb/gadget/dummy_hcd.c	modified	+485	−270	View file
drivers/usb/gadget/epautoconf.c	modified	+10	−6	View file
drivers/usb/gadget/f_acm.c	modified	+51	−1	View file
drivers/usb/gadget/f_ecm.c	modified	+25	−0	View file
drivers/usb/gadget/f_fs.c	modified	+2	−4	View file
drivers/usb/gadget/f_mass_storage.c	modified	+14	−15	View file
drivers/usb/gadget/f_midi.c	modified	+1	−1	View file
drivers/usb/gadget/f_rndis.c	modified	+1	−1	View file
drivers/usb/gadget/f_serial.c	modified	+42	−0	View file
drivers/usb/gadget/f_subset.c	modified	+17	−17	View file
drivers/usb/gadget/f_audio.c → drivers/usb/gadget/f_uac1.c	renamed	+1	−24	View file
drivers/usb/gadget/f_uac2.c	added	+1449	−0	View file
drivers/usb/gadget/file_storage.c	modified	+13	−13	View file
drivers/usb/gadget/fsl_qe_udc.c	modified	+1	−0	View file
drivers/usb/gadget/fsl_udc_core.c	modified	+14	−14	View file
drivers/usb/gadget/fsl_usb2_udc.h	modified	+1	−1	View file
drivers/usb/gadget/g_ffs.c	modified	+1	−1	View file
drivers/usb/gadget/goku_udc.c	modified	+9	−10	View file
drivers/usb/gadget/hid.c	modified	+3	−3	View file
drivers/usb/gadget/inode.c	modified	+2	−0	View file
drivers/usb/gadget/langwell_udc.c	modified	+11	−41	View file
drivers/usb/gadget/langwell_udc.h	modified	+1	−1	View file
drivers/usb/gadget/mass_storage.c	modified	+1	−1	View file
drivers/usb/gadget/multi.c	modified	+1	−1	View file
drivers/usb/gadget/mv_udc.h	modified	+1	−1	View file
drivers/usb/gadget/mv_udc_core.c	modified	+5	−4	View file
drivers/usb/gadget/net2272.c	modified	+8	−10	View file
drivers/usb/gadget/net2280.c	modified	+9	−10	View file
drivers/usb/gadget/omap_udc.c	modified	+15	−11	View file
drivers/usb/gadget/omap_udc.h	modified	+1	−1	View file
drivers/usb/gadget/pch_udc.c	modified	+312	−11	View file
drivers/usb/gadget/pxa25x_udc.c	modified	+9	−6	View file
drivers/usb/gadget/pxa25x_udc.h	modified	+1	−1	View file
drivers/usb/gadget/pxa27x_udc.c	modified	+6	−5	View file
drivers/usb/gadget/pxa27x_udc.h	modified	+1	−1	View file
drivers/usb/gadget/r8a66597-udc.c	modified	+2	−8	View file
drivers/usb/gadget/s3c-hsudc.c	modified	+23	−11	View file
drivers/usb/gadget/s3c2410_udc.c	modified	+2	−0	View file
drivers/usb/gadget/serial.c	modified	+1	−1	View file
drivers/usb/gadget/storage_common.c	modified	+1	−41	View file
drivers/usb/gadget/u_audio.c → drivers/usb/gadget/u_uac1.c	renamed	+2	−2	View file
drivers/usb/gadget/u_audio.h → drivers/usb/gadget/u_uac1.h	renamed	+1	−1	View file
drivers/usb/gadget/udc-core.c	modified	+52	−0	View file
drivers/usb/host/Kconfig	modified	+35	−10	View file
drivers/usb/host/Makefile	modified	+4	−0	View file
drivers/usb/host/ehci-ath79.c	deleted	+0	−208	View before deletion
drivers/usb/host/ehci-dbg.c	modified	+1	−1	View file
drivers/usb/host/ehci-fsl.c	modified	+31	−16	View file
drivers/usb/host/ehci-fsl.h	modified	+4	−0	View file
drivers/usb/host/ehci-hcd.c	modified	+10	−10	View file
drivers/usb/host/ehci-hub.c	modified	+6	−4	View file
drivers/usb/host/ohci-ath79.c → drivers/usb/host/ehci-ls1x.c	renamed	+69	−61	View file
drivers/usb/host/ehci-msm.c	modified	+7	−7	View file
drivers/usb/host/ehci-mv.c	modified	+6	−6	View file
drivers/usb/host/ehci-mxc.c	modified	+7	−5	View file
drivers/usb/host/ehci-platform.c	added	+198	−0	View file
drivers/usb/host/ehci-pxa168.c	deleted	+0	−363	View before deletion
drivers/usb/host/ehci-s5p.c	modified	+15	−0	View file
drivers/usb/host/ehci-spear.c	modified	+81	−2	View file
drivers/usb/host/ehci-tegra.c	modified	+7	−7	View file
drivers/usb/host/ehci.h	modified	+1	−1	View file
drivers/usb/host/fsl-mph-dr-of.c	modified	+0	−1	View file
drivers/usb/host/imx21-dbg.c	modified	+1	−1	View file
drivers/usb/host/isp116x-hcd.c	modified	+4	−19	View file
drivers/usb/host/isp1362-hcd.c	modified	+4	−16	View file
drivers/usb/host/ohci-exynos.c	modified	+2	−4	View file
drivers/usb/host/ohci-hcd.c	modified	+9	−9	View file
drivers/usb/host/ohci-pnx4008.c → drivers/usb/host/ohci-nxp.c	renamed	+164	−89	View file
drivers/usb/host/ohci-omap.c	modified	+4	−4	View file
drivers/usb/host/ohci-platform.c	added	+194	−0	View file
drivers/usb/host/ohci-pxa27x.c	modified	+3	−2	View file
drivers/usb/host/ohci.h	modified	+1	−1	View file
drivers/usb/host/r8a66597-hcd.c	modified	+4	−17	View file
drivers/usb/host/sl811-hcd.c	modified	+4	−17	View file
drivers/usb/host/uhci-hcd.c	modified	+3	−0	View file
drivers/usb/host/xhci-hub.c	modified	+41	−0	View file
drivers/usb/host/xhci-mem.c	modified	+178	−63	View file
drivers/usb/host/xhci-plat.c	added	+205	−0	View file
drivers/usb/host/xhci-ring.c	modified	+209	−124	View file
drivers/usb/host/xhci.c	modified	+43	−29	View file
drivers/usb/host/xhci.h	modified	+30	−4	View file
drivers/usb/musb/am35x.c	modified	+11	−9	View file
drivers/usb/musb/blackfin.c	modified	+8	−7	View file
drivers/usb/musb/da8xx.c	modified	+11	−9	View file
drivers/usb/musb/davinci.c	modified	+13	−11	View file
drivers/usb/musb/musb_core.c	modified	+36	−41	View file
drivers/usb/musb/musb_core.h	modified	+1	−1	View file
drivers/usb/musb/musb_debugfs.c	modified	+7	−7	View file
drivers/usb/musb/musb_gadget.c	modified	+29	−10	View file
drivers/usb/musb/musb_virthub.c	modified	+6	−3	View file
drivers/usb/musb/omap2430.c	modified	+24	−22	View file
drivers/usb/musb/tusb6010.c	modified	+18	−15	View file
drivers/usb/musb/ux500.c	modified	+10	−9	View file
drivers/usb/otg/Kconfig	modified	+1	−1	View file
drivers/usb/otg/ab8500-usb.c	modified	+53	−42	View file
drivers/usb/otg/fsl_otg.c	modified	+62	−51	View file
drivers/usb/otg/fsl_otg.h	modified	+1	−1	View file
drivers/usb/otg/gpio_vbus.c	modified	+36	−25	View file
drivers/usb/otg/isp1301_omap.c	modified	+122	−112	View file
drivers/usb/otg/msm_otg.c	modified	+205	−193	View file
drivers/usb/otg/mv_otg.c	modified	+62	−48	View file
drivers/usb/otg/mv_otg.h	modified	+1	−1	View file
drivers/usb/otg/nop-usb-xceiv.c	modified	+31	−35	View file
drivers/usb/otg/otg.c	modified	+19	−19	View file
drivers/usb/otg/otg_fsm.c	modified	+11	−11	View file
drivers/usb/otg/otg_fsm.h	modified	+1	−1	View file
drivers/usb/otg/twl4030-usb.c	modified	+46	−37	View file
drivers/usb/otg/twl6030-usb.c	modified	+65	−54	View file
drivers/usb/otg/ulpi.c	modified	+64	−52	View file
drivers/usb/otg/ulpi_viewport.c	modified	+3	−3	View file
drivers/usb/renesas_usbhs/common.c	modified	+6	−5	View file
drivers/usb/renesas_usbhs/common.h	modified	+1	−0	View file
drivers/usb/renesas_usbhs/fifo.c	modified	+13	−16	View file
drivers/usb/renesas_usbhs/fifo.h	modified	+2	−1	View file
drivers/usb/renesas_usbhs/mod.c	modified	+1	−1	View file
drivers/usb/renesas_usbhs/mod_gadget.c	modified	+23	−56	View file
drivers/usb/serial/Kconfig	modified	+17	−0	View file
drivers/usb/serial/Makefile	modified	+2	−0	View file
drivers/usb/serial/aircable.c	modified	+4	−26	View file
drivers/usb/serial/ark3116.c	modified	+4	−26	View file
drivers/usb/serial/belkin_sa.c	modified	+5	−30	View file
drivers/usb/serial/ch341.c	modified	+4	−23	View file
drivers/usb/serial/cp210x.c	modified	+44	−33	View file
drivers/usb/serial/cyberjack.c	modified	+5	−31	View file
drivers/usb/serial/cypress_m8.c	modified	+7	−57	View file
drivers/usb/serial/digi_acceleport.c	modified	+6	−39	View file
drivers/usb/serial/empeg.c	modified	+5	−29	View file
drivers/usb/serial/f81232.c	added	+405	−0	View file
drivers/usb/serial/ftdi_sio.c	modified	+34	−24	View file
drivers/usb/serial/ftdi_sio.h	modified	+2	−1	View file
drivers/usb/serial/ftdi_sio_ids.h	modified	+16	−3	View file
drivers/usb/serial/funsoft.c	modified	+4	−21	View file
drivers/usb/serial/garmin_gps.c	modified	+4	−36	View file
drivers/usb/serial/generic.c	modified	+7	−12	View file
drivers/usb/serial/hp4x.c	modified	+4	−27	View file
drivers/usb/serial/io_edgeport.c	modified	+5	−61	View file
drivers/usb/serial/io_tables.h	modified	+5	−5	View file
drivers/usb/serial/io_ti.c	modified	+6	−38	View file
drivers/usb/serial/ipaq.c	modified	+11	−17	View file
drivers/usb/serial/ipw.c	modified	+4	−28	View file
drivers/usb/serial/ir-usb.c	modified	+9	−21	View file
drivers/usb/serial/iuu_phoenix.c	modified	+4	−27	View file
drivers/usb/serial/keyspan.c	modified	+1	−47	View file
drivers/usb/serial/keyspan.h	modified	+5	−5	View file
drivers/usb/serial/keyspan_pda.c	modified	+7	−55	View file
drivers/usb/serial/kl5kusb105.c	modified	+5	−32	View file
drivers/usb/serial/kobil_sct.c	modified	+4	−31	View file
drivers/usb/serial/mct_u232.c	modified	+5	−29	View file
drivers/usb/serial/metro-usb.c	added	+402	−0	View file
drivers/usb/serial/mos7720.c	modified	+6	−40	View file
drivers/usb/serial/mos7840.c	modified	+63	−79	View file
drivers/usb/serial/moto_modem.c	modified	+4	−22	View file
drivers/usb/serial/navman.c	modified	+4	−21	View file
drivers/usb/serial/omninet.c	modified	+6	−32	View file
drivers/usb/serial/opticon.c	modified	+4	−21	View file
drivers/usb/serial/option.c	modified	+21	−32	View file
drivers/usb/serial/oti6858.c	modified	+8	−28	View file
drivers/usb/serial/pl2303.c	modified	+4	−27	View file
drivers/usb/serial/qcaux.c	modified	+4	−22	View file
drivers/usb/serial/qcserial.c	modified	+66	−68	View file
drivers/usb/serial/safe_serial.c	modified	+7	−17	View file
drivers/usb/serial/siemens_mpi.c	modified	+4	−26	View file
drivers/usb/serial/sierra.c	modified	+4	−33	View file
drivers/usb/serial/spcp8x5.c	modified	+4	−27	View file
drivers/usb/serial/ssu100.c	modified	+4	−36	View file
drivers/usb/serial/symbolserial.c	modified	+4	−21	View file
drivers/usb/serial/ti_usb_3410_5052.c	modified	+10	−30	View file
drivers/usb/serial/usb-serial.c	modified	+72	−5	View file
drivers/usb/serial/usb_debug.c	modified	+4	−22	View file
drivers/usb/serial/visor.c	modified	+8	−29	View file
drivers/usb/serial/vivopay-serial.c	modified	+4	−27	View file
drivers/usb/serial/whiteheat.c	modified	+5	−42	View file
drivers/usb/serial/zio.c	modified	+4	−22	View file
drivers/usb/storage/alauda.c	modified	+1	−0	View file
drivers/usb/storage/cypress_atacb.c	modified	+1	−0	View file
drivers/usb/storage/datafab.c	modified	+1	−0	View file
drivers/usb/storage/ene_ub6250.c	modified	+14	−13	View file
drivers/usb/storage/freecom.c	modified	+1	−0	View file
drivers/usb/storage/isd200.c	modified	+1	−0	View file
drivers/usb/storage/jumpshot.c	modified	+1	−0	View file
drivers/usb/storage/karma.c	modified	+1	−0	View file
drivers/usb/storage/onetouch.c	modified	+1	−0	View file
drivers/usb/storage/realtek_cr.c	modified	+10	−3	View file
drivers/usb/storage/scsiglue.c	modified	+31	−24	View file
drivers/usb/storage/sddr09.c	modified	+1	−0	View file
drivers/usb/storage/sddr55.c	modified	+1	−0	View file
drivers/usb/storage/shuttle_usbat.c	modified	+1	−0	View file
drivers/usb/storage/transport.c	modified	+2	−1	View file
drivers/usb/storage/transport.h	modified	+0	−39	View file
drivers/usb/storage/uas.c	modified	+212	−116	View file
drivers/usb/storage/usb.c	modified	+18	−3	View file
include/linux/device.h	modified	+4	−3	View file
include/linux/platform_data/dwc3-exynos.h	added	+24	−0	View file
include/linux/usb.h	modified	+9	−1	View file
include/linux/usb/audio-v2.h	modified	+21	−0	View file
include/linux/usb/cdc-wdm.h	added	+19	−0	View file
include/linux/usb/ch11.h	modified	+5	−0	View file
include/linux/usb/ch9.h	modified	+5	−0	View file
include/linux/usb/ehci_pdriver.h	added	+46	−0	View file
include/linux/usb/gadget.h	modified	+10	−0	View file
include/linux/usb/hcd.h	modified	+3	−1	View file
include/linux/usb/intel_mid_otg.h	modified	+3	−3	View file
include/linux/usb/msm_hsusb.h	modified	+1	−1	View file
include/linux/usb/ohci_pdriver.h	added	+38	−0	View file
include/linux/usb/otg.h	modified	+93	−71	View file
include/linux/usb/renesas_usbhs.h	modified	+1	−0	View file
include/linux/usb/serial.h	modified	+34	−2	View file
include/linux/usb/storage.h	modified	+38	−0	View file
include/linux/usb/uas.h	added	+69	−0	View file
include/linux/usb/ulpi.h	modified	+2	−2	View file
include/scsi/scsi_device.h	modified	+5	−2	View file
tools/usb/ffs-test.c	modified	+1	−1	View file
tools/usb/testusb.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-bus-usb

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index b4f5487..7c22a53 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -182,3 +182,14 @@ Description:
 		USB2 hardware LPM is enabled for the device. Developer can
 		write y/Y/1 or n/N/0 to the file to enable/disable the
 		feature.
+
+What:		/sys/bus/usb/devices/.../removable
+Date:		February 2012
+Contact:	Matthew Garrett <[email protected]>
+Description:
+		Some information about whether a given USB device is
+		physically fixed to the platform can be inferred from a
+		combination of hub decriptor bits and platform-specific data
+		such as ACPI. This file will read either "removable" or
+		"fixed" if the information is available, and "unknown"
+		otherwise.
\ No newline at end of file

Documentation/feature-removal-schedule.txt

View file

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a0ffac0..d5dc80f 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -524,3 +524,14 @@ Files:	arch/arm/mach-at91/at91cap9.c
 Why:	The code is not actively maintained and platforms are now hard to find.
 Who:	Nicolas Ferre <[email protected]>
 	Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
+
+----------------------------
+
+What:	Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")
+When:	3.6
+Why:	This driver provides support for USB storage devices like "USB
+	sticks". As of now, it is deactivated in Debian, Fedora and
+        Ubuntu. All current users can switch over to usb-storage
+        (CONFIG_USB_STORAGE) which only drawback is the additional SCSI
+        stack.
+Who:	Sebastian Andrzej Siewior <[email protected]>

Documentation/i2c/instantiating-devices

View file

diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices
index 9edb75d..abf6361 100644
--- a/Documentation/i2c/instantiating-devices
+++ b/Documentation/i2c/instantiating-devices
@@ -87,11 +87,11 @@ it may have different addresses from one board to the next (manufacturer
 changing its design without notice). In this case, you can call
 i2c_new_probed_device() instead of i2c_new_device().
 
-Example (from the pnx4008 OHCI driver):
+Example (from the nxp OHCI driver):
 
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
-static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
+static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
 {
 	(...)
 	struct i2c_adapter *i2c_adap;
@@ -100,7 +100,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
 	(...)
 	i2c_adap = i2c_get_adapter(2);
 	memset(&i2c_info, 0, sizeof(struct i2c_board_info));
-	strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE);
+	strlcpy(i2c_info.type, "isp1301_nxp", I2C_NAME_SIZE);
 	isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
 						   normal_i2c, NULL);
 	i2c_put_adapter(i2c_adap);

arch/arm/mach-imx/mx31moboard-devboard.c

View file

diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c
index 0aa2536..cc285e5 100644
--- a/arch/arm/mach-imx/mx31moboard-devboard.c
+++ b/arch/arm/mach-imx/mx31moboard-devboard.c
@@ -158,7 +158,7 @@ static int devboard_usbh1_hw_init(struct platform_device *pdev)
 #define USBH1_VBUSEN_B	IOMUX_TO_GPIO(MX31_PIN_NFRE_B)
 #define USBH1_MODE	IOMUX_TO_GPIO(MX31_PIN_NFALE)
 
-static int devboard_isp1105_init(struct otg_transceiver *otg)
+static int devboard_isp1105_init(struct usb_phy *otg)
 {
 	int ret = gpio_request(USBH1_MODE, "usbh1-mode");
 	if (ret)
@@ -177,7 +177,7 @@ static int devboard_isp1105_init(struct otg_transceiver *otg)
 }
 
 
-static int devboard_isp1105_set_vbus(struct otg_transceiver *otg, bool on)
+static int devboard_isp1105_set_vbus(struct usb_otg *otg, bool on)
 {
 	if (on)
 		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -194,18 +194,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = {
 
 static int __init devboard_usbh1_init(void)
 {
-	struct otg_transceiver *otg;
+	struct usb_phy *phy;
 	struct platform_device *pdev;
 
-	otg = kzalloc(sizeof(*otg), GFP_KERNEL);
-	if (!otg)
+	phy = kzalloc(sizeof(*phy), GFP_KERNEL);
+	if (!phy)
 		return -ENOMEM;
 
-	otg->label	= "ISP1105";
-	otg->init	= devboard_isp1105_init;
-	otg->set_vbus	= devboard_isp1105_set_vbus;
+	phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
+	if (!phy->otg) {
+		kfree(phy);
+		return -ENOMEM;
+	}
+
+	phy->label	= "ISP1105";
+	phy->init	= devboard_isp1105_init;
+	phy->otg->set_vbus	= devboard_isp1105_set_vbus;
 
-	usbh1_pdata.otg = otg;
+	usbh1_pdata.otg = phy;
 
 	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
 	if (IS_ERR(pdev))

arch/arm/mach-imx/mx31moboard-marxbot.c

View file

diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index bb639cb..135c90e 100644
--- a/arch/arm/mach-imx/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -272,7 +272,7 @@ static int marxbot_usbh1_hw_init(struct platform_device *pdev)
 #define USBH1_VBUSEN_B	IOMUX_TO_GPIO(MX31_PIN_NFRE_B)
 #define USBH1_MODE	IOMUX_TO_GPIO(MX31_PIN_NFALE)
 
-static int marxbot_isp1105_init(struct otg_transceiver *otg)
+static int marxbot_isp1105_init(struct usb_phy *otg)
 {
 	int ret = gpio_request(USBH1_MODE, "usbh1-mode");
 	if (ret)
@@ -291,7 +291,7 @@ static int marxbot_isp1105_init(struct otg_transceiver *otg)
 }
 
 
-static int marxbot_isp1105_set_vbus(struct otg_transceiver *otg, bool on)
+static int marxbot_isp1105_set_vbus(struct usb_otg *otg, bool on)
 {
 	if (on)
 		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -308,18 +308,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = {
 
 static int __init marxbot_usbh1_init(void)
 {
-	struct otg_transceiver *otg;
+	struct usb_phy *phy;
 	struct platform_device *pdev;
 
-	otg = kzalloc(sizeof(*otg), GFP_KERNEL);
-	if (!otg)
+	phy = kzalloc(sizeof(*phy), GFP_KERNEL);
+	if (!phy)
 		return -ENOMEM;
 
-	otg->label	= "ISP1105";
-	otg->init	= marxbot_isp1105_init;
-	otg->set_vbus	= marxbot_isp1105_set_vbus;
+	phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
+	if (!phy->otg) {
+		kfree(phy);
+		return -ENOMEM;
+	}
+
+	phy->label	= "ISP1105";
+	phy->init	= marxbot_isp1105_init;
+	phy->otg->set_vbus	= marxbot_isp1105_set_vbus;
 
-	usbh1_pdata.otg = otg;
+	usbh1_pdata.otg = phy;
 
 	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
 	if (IS_ERR(pdev))

arch/arm/mach-pxa/pxa3xx-ulpi.c

View file

diff --git a/arch/arm/mach-pxa/pxa3xx-ulpi.c b/arch/arm/mach-pxa/pxa3xx-ulpi.c
index e28dfb8..5ead6d4 100644
--- a/arch/arm/mach-pxa/pxa3xx-ulpi.c
+++ b/arch/arm/mach-pxa/pxa3xx-ulpi.c
@@ -33,7 +33,7 @@ struct pxa3xx_u2d_ulpi {
 	struct clk		*clk;
 	void __iomem		*mmio_base;
 
-	struct otg_transceiver	*otg;
+	struct usb_phy		*otg;
 	unsigned int		ulpi_mode;
 };
 
@@ -79,7 +79,7 @@ static int pxa310_ulpi_poll(void)
 	return -ETIMEDOUT;
 }
 
-static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg)
+static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
 {
 	int err;
 
@@ -98,7 +98,7 @@ static int pxa310_ulpi_read(struct otg_transceiver *otg, u32 reg)
 	return u2d_readl(U2DOTGUCR) & U2DOTGUCR_RDATA;
 }
 
-static int pxa310_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
 {
 	if (pxa310_ulpi_get_phymode() != SYNCH) {
 		pr_warning("%s: PHY is not in SYNCH mode!\n", __func__);
@@ -111,7 +111,7 @@ static int pxa310_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
 	return pxa310_ulpi_poll();
 }
 
-struct otg_io_access_ops pxa310_ulpi_access_ops = {
+struct usb_phy_io_ops pxa310_ulpi_access_ops = {
 	.read	= pxa310_ulpi_read,
 	.write	= pxa310_ulpi_write,
 };
@@ -139,19 +139,19 @@ static int pxa310_start_otg_host_transcvr(struct usb_bus *host)
 
 	pxa310_otg_transceiver_rtsm();
 
-	err = otg_init(u2d->otg);
+	err = usb_phy_init(u2d->otg);
 	if (err) {
 		pr_err("OTG transceiver init failed");
 		return err;
 	}
 
-	err = otg_set_vbus(u2d->otg, 1);
+	err = otg_set_vbus(u2d->otg->otg, 1);
 	if (err) {
 		pr_err("OTG transceiver VBUS set failed");
 		return err;
 	}
 
-	err = otg_set_host(u2d->otg, host);
+	err = otg_set_host(u2d->otg->otg, host);
 	if (err)
 		pr_err("OTG transceiver Host mode set failed");
 
@@ -189,9 +189,9 @@ static void pxa310_stop_otg_hc(void)
 {
 	pxa310_otg_transceiver_rtsm();
 
-	otg_set_host(u2d->otg, NULL);
-	otg_set_vbus(u2d->otg, 0);
-	otg_shutdown(u2d->otg);
+	otg_set_host(u2d->otg->otg, NULL);
+	otg_set_vbus(u2d->otg->otg, 0);
+	usb_phy_shutdown(u2d->otg);
 }
 
 static void pxa310_u2d_setup_otg_hc(void)

arch/arm/mach-tegra/include/mach/usb_phy.h

View file

diff --git a/arch/arm/mach-tegra/include/mach/usb_phy.h b/arch/arm/mach-tegra/include/mach/usb_phy.h
index d4b8f9e..de1a0f6 100644
--- a/arch/arm/mach-tegra/include/mach/usb_phy.h
+++ b/arch/arm/mach-tegra/include/mach/usb_phy.h
@@ -58,7 +58,7 @@ struct tegra_usb_phy {
 	struct clk *pad_clk;
 	enum tegra_usb_phy_mode mode;
 	void *config;
-	struct otg_transceiver *ulpi;
+	struct usb_phy *ulpi;
 };
 
 struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,

arch/arm/mach-tegra/usb_phy.c

View file

diff --git a/arch/arm/mach-tegra/usb_phy.c b/arch/arm/mach-tegra/usb_phy.c
index 37576a7..ad321f9 100644
--- a/arch/arm/mach-tegra/usb_phy.c
+++ b/arch/arm/mach-tegra/usb_phy.c
@@ -608,13 +608,13 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
 	writel(val, base + ULPI_TIMING_CTRL_1);
 
 	/* Fix VbusInvalid due to floating VBUS */
-	ret = otg_io_write(phy->ulpi, 0x40, 0x08);
+	ret = usb_phy_io_write(phy->ulpi, 0x40, 0x08);
 	if (ret) {
 		pr_err("%s: ulpi write failed\n", __func__);
 		return ret;
 	}
 
-	ret = otg_io_write(phy->ulpi, 0x80, 0x0B);
+	ret = usb_phy_io_write(phy->ulpi, 0x80, 0x0B);
 	if (ret) {
 		pr_err("%s: ulpi write failed\n", __func__);
 		return ret;

arch/arm/plat-mxc/include/mach/mxc_ehci.h

View file

diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
index 2c159dc..9ffd1bb 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_ehci.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
@@ -44,7 +44,7 @@ struct mxc_usbh_platform_data {
 	int (*exit)(struct platform_device *pdev);
 
 	unsigned int		 portsc;
-	struct otg_transceiver	*otg;
+	struct usb_phy		*otg;
 };
 
 int mx51_initialize_usb_hw(int port, unsigned int flags);

arch/arm/plat-mxc/include/mach/ulpi.h

View file

diff --git a/arch/arm/plat-mxc/include/mach/ulpi.h b/arch/arm/plat-mxc/include/mach/ulpi.h
index f9161c9..42bdaca 100644
--- a/arch/arm/plat-mxc/include/mach/ulpi.h
+++ b/arch/arm/plat-mxc/include/mach/ulpi.h
@@ -2,15 +2,15 @@
 #define __MACH_ULPI_H
 
 #ifdef CONFIG_USB_ULPI
-struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags);
+struct usb_phy *imx_otg_ulpi_create(unsigned int flags);
 #else
-static inline struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags)
+static inline struct usb_phy *imx_otg_ulpi_create(unsigned int flags)
 {
 	return NULL;
 }
 #endif
 
-extern struct otg_io_access_ops mxc_ulpi_access_ops;
+extern struct usb_phy_io_ops mxc_ulpi_access_ops;
 
 #endif /* __MACH_ULPI_H */
 

arch/arm/plat-mxc/ulpi.c

View file

diff --git a/arch/arm/plat-mxc/ulpi.c b/arch/arm/plat-mxc/ulpi.c
index 477e45b..d296342 100644
--- a/arch/arm/plat-mxc/ulpi.c
+++ b/arch/arm/plat-mxc/ulpi.c
@@ -58,7 +58,7 @@ static int ulpi_poll(void __iomem *view, u32 bit)
 	return -ETIMEDOUT;
 }
 
-static int ulpi_read(struct otg_transceiver *otg, u32 reg)
+static int ulpi_read(struct usb_phy *otg, u32 reg)
 {
 	int ret;
 	void __iomem *view = otg->io_priv;
@@ -84,7 +84,7 @@ static int ulpi_read(struct otg_transceiver *otg, u32 reg)
 	return (__raw_readl(view) >> ULPIVW_RDATA_SHIFT) & ULPIVW_RDATA_MASK;
 }
 
-static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
+static int ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
 {
 	int ret;
 	void __iomem *view = otg->io_priv;
@@ -106,13 +106,13 @@ static int ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
 	return ulpi_poll(view, ULPIVW_RUN);
 }
 
-struct otg_io_access_ops mxc_ulpi_access_ops = {
+struct usb_phy_io_ops mxc_ulpi_access_ops = {
 	.read	= ulpi_read,
 	.write	= ulpi_write,
 };
 EXPORT_SYMBOL_GPL(mxc_ulpi_access_ops);
 
-struct otg_transceiver *imx_otg_ulpi_create(unsigned int flags)
+struct usb_phy *imx_otg_ulpi_create(unsigned int flags)
 {
 	return otg_ulpi_create(&mxc_ulpi_access_ops, flags);
 }

arch/mips/ath79/dev-usb.c

View file

diff --git a/arch/mips/ath79/dev-usb.c b/arch/mips/ath79/dev-usb.c
index 002d6d2..36e9570 100644
--- a/arch/mips/ath79/dev-usb.c
+++ b/arch/mips/ath79/dev-usb.c
@@ -17,6 +17,8 @@
 #include <linux/irq.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
+#include <linux/usb/ehci_pdriver.h>
+#include <linux/usb/ohci_pdriver.h>
 
 #include <asm/mach-ath79/ath79.h>
 #include <asm/mach-ath79/ar71xx_regs.h>
@@ -36,14 +38,19 @@ static struct resource ath79_ohci_resources[] = {
 };
 
 static u64 ath79_ohci_dmamask = DMA_BIT_MASK(32);
+
+static struct usb_ohci_pdata ath79_ohci_pdata = {
+};
+
 static struct platform_device ath79_ohci_device = {
-	.name		= "ath79-ohci",
+	.name		= "ohci-platform",
 	.id		= -1,
 	.resource	= ath79_ohci_resources,
 	.num_resources	= ARRAY_SIZE(ath79_ohci_resources),
 	.dev = {
 		.dma_mask		= &ath79_ohci_dmamask,
 		.coherent_dma_mask	= DMA_BIT_MASK(32),
+		.platform_data		= &ath79_ohci_pdata,
 	},
 };
 
@@ -60,8 +67,20 @@ static struct resource ath79_ehci_resources[] = {
 };
 
 static u64 ath79_ehci_dmamask = DMA_BIT_MASK(32);
+
+static struct usb_ehci_pdata ath79_ehci_pdata_v1 = {
+	.has_synopsys_hc_bug	= 1,
+	.port_power_off		= 1,
+};
+
+static struct usb_ehci_pdata ath79_ehci_pdata_v2 = {
+	.caps_offset		= 0x100,
+	.has_tt			= 1,
+	.port_power_off		= 1,
+};
+
 static struct platform_device ath79_ehci_device = {
-	.name		= "ath79-ehci",
+	.name		= "ehci-platform",
 	.id		= -1,
 	.resource	= ath79_ehci_resources,
 	.num_resources	= ARRAY_SIZE(ath79_ehci_resources),
@@ -101,7 +120,7 @@ static void __init ath79_usb_setup(void)
 
 	ath79_ehci_resources[0].start = AR71XX_EHCI_BASE;
 	ath79_ehci_resources[0].end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1;
-	ath79_ehci_device.name = "ar71xx-ehci";
+	ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v1;
 	platform_device_register(&ath79_ehci_device);
 }
 
@@ -142,7 +161,7 @@ static void __init ar724x_usb_setup(void)
 
 	ath79_ehci_resources[0].start = AR724X_EHCI_BASE;
 	ath79_ehci_resources[0].end = AR724X_EHCI_BASE + AR724X_EHCI_SIZE - 1;
-	ath79_ehci_device.name = "ar724x-ehci";
+	ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
 	platform_device_register(&ath79_ehci_device);
 }
 
@@ -159,7 +178,7 @@ static void __init ar913x_usb_setup(void)
 
 	ath79_ehci_resources[0].start = AR913X_EHCI_BASE;
 	ath79_ehci_resources[0].end = AR913X_EHCI_BASE + AR913X_EHCI_SIZE - 1;
-	ath79_ehci_device.name = "ar913x-ehci";
+	ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
 	platform_device_register(&ath79_ehci_device);
 }
 
@@ -176,7 +195,7 @@ static void __init ar933x_usb_setup(void)
 
 	ath79_ehci_resources[0].start = AR933X_EHCI_BASE;
 	ath79_ehci_resources[0].end = AR933X_EHCI_BASE + AR933X_EHCI_SIZE - 1;
-	ath79_ehci_device.name = "ar933x-ehci";
+	ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
 	platform_device_register(&ath79_ehci_device);
 }
 

drivers/block/Kconfig

View file

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4e4c8a4..a796407 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -354,7 +354,7 @@ config BLK_DEV_SX8
 	  Use devices /dev/sx8/$N and /dev/sx8/$Np$M.
 
 config BLK_DEV_UB
-	tristate "Low Performance USB Block driver"
+	tristate "Low Performance USB Block driver (deprecated)"
 	depends on USB
 	help
 	  This driver supports certain USB attached storage devices

drivers/block/ub.c

View file

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 7333b9e..fcec022 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -119,43 +119,6 @@
 
 /*
  */
-
-/* command block wrapper */
-struct bulk_cb_wrap {
-	__le32	Signature;		/* contains 'USBC' */
-	u32	Tag;			/* unique per command id */
-	__le32	DataTransferLength;	/* size of data */
-	u8	Flags;			/* direction in bit 0 */
-	u8	Lun;			/* LUN */
-	u8	Length;			/* of of the CDB */
-	u8	CDB[UB_MAX_CDB_SIZE];	/* max command */
-};
-
-#define US_BULK_CB_WRAP_LEN	31
-#define US_BULK_CB_SIGN		0x43425355	/*spells out USBC */
-#define US_BULK_FLAG_IN		1
-#define US_BULK_FLAG_OUT	0
-
-/* command status wrapper */
-struct bulk_cs_wrap {
-	__le32	Signature;		/* should = 'USBS' */
-	u32	Tag;			/* same as original command */
-	__le32	Residue;		/* amount not transferred */
-	u8	Status;			/* see below */
-};
-
-#define US_BULK_CS_WRAP_LEN	13
-#define US_BULK_CS_SIGN		0x53425355	/* spells out 'USBS' */
-#define US_BULK_STAT_OK		0
-#define US_BULK_STAT_FAIL	1
-#define US_BULK_STAT_PHASE	2
-
-/* bulk-only class specific requests */
-#define US_BULK_RESET_REQUEST	0xff
-#define US_BULK_GET_MAX_LUN	0xfe
-
-/*
- */
 struct ub_dev;
 
 #define UB_MAX_REQ_SG	9	/* cdrecord requires 32KB and maybe a header */
@@ -2477,6 +2440,8 @@ static int __init ub_init(void)
 	int rc;
 	int i;
 
+	pr_info("'Low Performance USB Block' driver is deprecated. "
+			"Please switch to usb-storage\n");
 	for (i = 0; i < UB_QLOCK_NUM; i++)
 		spin_lock_init(&ub_qlockv[i]);
 

drivers/net/usb/Kconfig

View file

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 2335761..4bad899 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -398,6 +398,27 @@ config USB_NET_KALMIA
 	  To compile this driver as a module, choose M here: the
 	  module will be called kalmia.
 
+config USB_NET_QMI_WWAN
+	tristate "QMI WWAN driver for Qualcomm MSM based 3G and LTE modems"
+	depends on USB_USBNET
+	help
+	  Support WWAN LTE/3G devices based on Qualcomm Mobile Data Modem
+	  (MDM) chipsets.  Examples of such devices are
+	    * Huawei E392/E398
+
+	  This driver will only drive the ethernet part of the chips.
+	  The devices require additional configuration to be usable.
+	  Multiple management interfaces with linux drivers are
+	  available:
+
+	    * option: AT commands on /dev/ttyUSBx
+	    * cdc-wdm: Qualcomm MSM Interface (QMI) protocol on /dev/cdc-wdmx
+
+	  A modem manager with support for QMI is recommended.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called qmi_wwan.
+
 config USB_HSO
 	tristate "Option USB High Speed Mobile Devices"
 	depends on USB && RFKILL
@@ -461,4 +482,5 @@ config USB_VL600
 
 	  http://ubuntuforums.org/showpost.php?p=10589647&postcount=17
 
+
 endmenu

drivers/net/usb/Makefile

View file

diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index c203fa2..a2e2d72 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -29,4 +29,5 @@ obj-$(CONFIG_USB_SIERRA_NET)	+= sierra_net.o
 obj-$(CONFIG_USB_NET_CX82310_ETH)	+= cx82310_eth.o
 obj-$(CONFIG_USB_NET_CDC_NCM)	+= cdc_ncm.o
 obj-$(CONFIG_USB_VL600)		+= lg-vl600.o
+obj-$(CONFIG_USB_NET_QMI_WWAN)	+= qmi_wwan.o
 

drivers/net/usb/qmi_wwan.c

View file

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
new file mode 100644
index 0000000..aac68f5
--- /dev/null
+++ b/drivers/net/usb/qmi_wwan.c
@@ -0,0 +1,478 @@
+/*
+ * Copyright (c) 2012  Bjørn Mork <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/usb.h>
+#include <linux/usb/cdc.h>
+#include <linux/usb/usbnet.h>
+#include <linux/usb/cdc-wdm.h>
+
+/* The name of the CDC Device Management driver */
+#define DM_DRIVER "cdc_wdm"
+
+/*
+ * This driver supports wwan (3G/LTE/?) devices using a vendor
+ * specific management protocol called Qualcomm MSM Interface (QMI) -
+ * in addition to the more common AT commands over serial interface
+ * management
+ *
+ * QMI is wrapped in CDC, using CDC encapsulated commands on the