]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:48:53 +0000 (14:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:48:53 +0000 (14:48 +1100)
1  2 
Documentation/devicetree/bindings/usb/dwc3.txt
MAINTAINERS
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-smartq.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
drivers/usb/chipidea/ci_hdrc_imx.c
drivers/usb/gadget/function/u_serial.c
include/linux/platform_data/atmel.h

index 9f64f69d153aeecc4573e6d3fe7c988a51401b24,9ff48e0defb4651743c25916ed6c7a9d88853042..fb2ad0acedbdbe0db4253b0fe4c2818f13f8ef71
@@@ -1,7 -1,6 +1,7 @@@
  synopsys DWC3 CORE
  
 -DWC3- USB3 CONTROLLER
 +DWC3- USB3 CONTROLLER. Complies to the generic USB binding properties
 +      as described in 'usb/generic.txt'
  
  Required properties:
   - compatible: must be "snps,dwc3"
@@@ -36,11 -35,16 +36,16 @@@ Optional properties
                        LTSSM during USB3 Compliance mode.
   - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy.
   - snps,dis_u2_susphy_quirk: when set core will disable USB2 suspend phy.
+  - snps,dis_enblslpm_quirk: when set clears the enblslpm in GUSB2PHYCFG,
+                       disabling the suspend signal to the PHY.
   - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
                        utmi_l1_suspend_n, false when asserts utmi_sleep_n
   - snps,hird-threshold: HIRD threshold
   - snps,hsphy_interface: High-Speed PHY interface selection between "utmi" for
     UTMI+ and "ulpi" for ULPI when the DWC_USB3_HSPHY_INTERFACE has value 3.
+  - snps,quirk-frame-length-adjustment: Value for GFLADJ_30MHZ field of GFLADJ
+       register for post-silicon frame length adjustment when the
+       fladj_30mhz_sdbnd signal is invalid or incorrect.
  
  This is usually a subnode to DWC3 glue to which it is connected.
  
diff --combined MAINTAINERS
index d99d47c8c2f8695ce31161bcc5b1939ee27867f5,04251673ec1495193f729912b69dc8d9bb7a1abd..e059bae82c07da28d15023dcdcb1922e655edfb8
@@@ -240,12 -240,6 +240,12 @@@ L:       lm-sensors@lm-sensors.or
  S:    Maintained
  F:    drivers/hwmon/abituguru3.c
  
 +ACCES 104-IDIO-16 GPIO DRIVER
 +M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-104-idio-16.c
 +
  ACENIC DRIVER
  M:    Jes Sorensen <jes@trained-monkey.org>
  L:    linux-acenic@sunsite.dk
@@@ -660,6 -654,11 +660,6 @@@ F:        drivers/gpu/drm/radeon/radeon_kfd.
  F:    drivers/gpu/drm/radeon/radeon_kfd.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 -AMD MICROCODE UPDATE SUPPORT
 -M:    Borislav Petkov <bp@alien8.de>
 -S:    Maintained
 -F:    arch/x86/kernel/cpu/microcode/amd*
 -
  AMD XGBE DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
  L:    netdev@vger.kernel.org
@@@ -789,11 -788,6 +789,11 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
 +M:    Duc Dang <dhdang@apm.com>
 +S:    Supported
 +F:    arch/arm64/boot/dts/apm/
 +
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:    Iyappan Subramanian <isubramanian@apm.com>
  M:    Keyur Chudgar <kchudgar@apm.com>
@@@ -828,13 -822,12 +828,13 @@@ F:      arch/arm/include/asm/floppy.
  
  ARM PMU PROFILING AND DEBUGGING
  M:    Will Deacon <will.deacon@arm.com>
 +R:    Mark Rutland <mark.rutland@arm.com>
  S:    Maintained
 -F:    arch/arm/kernel/perf_*
 +F:    arch/arm*/kernel/perf_*
  F:    arch/arm/oprofile/common.c
 -F:    arch/arm/kernel/hw_breakpoint.c
 -F:    arch/arm/include/asm/hw_breakpoint.h
 -F:    arch/arm/include/asm/perf_event.h
 +F:    arch/arm*/kernel/hw_breakpoint.c
 +F:    arch/arm*/include/asm/hw_breakpoint.h
 +F:    arch/arm*/include/asm/perf_event.h
  F:    drivers/perf/arm_pmu.c
  F:    include/linux/perf/arm_pmu.h
  
@@@ -925,7 -918,7 +925,7 @@@ M: Tsahee Zidenberg <tsahee@annapurnala
  S:    Maintained
  F:    arch/arm/mach-alpine/
  
 -ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 +ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
@@@ -1238,13 -1231,6 +1238,13 @@@ ARM/LPC18XX ARCHITECTUR
  M:    Joachim Eastwood <manabian@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    arch/arm/boot/dts/lpc43*
 +F:    drivers/clk/nxp/clk-lpc18xx*
 +F:    drivers/clocksource/time-lpc32xx.c
 +F:    drivers/i2c/busses/i2c-lpc2k.c
 +F:    drivers/memory/pl172.c
 +F:    drivers/mtd/spi-nor/nxp-spifi.c
 +F:    drivers/rtc/rtc-lpc24xx.c
  N:    lpc18xx
  
  ARM/MAGICIAN MACHINE SUPPORT
@@@ -1312,6 -1298,13 +1312,13 @@@ F:    arch/arm/mach-mediatek
  N:    mtk
  K:    mediatek
  
+ ARM/Mediatek USB3 PHY DRIVER
+ M:    Chunfeng Yun <chunfeng.yun@mediatek.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    drivers/phy/phy-mt65xx-usb3.c
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <gerg@uclinux.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1459,12 -1452,7 +1466,12 @@@ F:    arch/arm/mach-exynos*
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
  F:    drivers/spi/spi-s3c*
 +F:    drivers/soc/samsung/*
  F:    sound/soc/samsung/*
 +F:    Documentation/arm/Samsung/
 +F:    Documentation/devicetree/bindings/arm/samsung/
 +F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
 +F:    Documentation/devicetree/bindings/power/pd-samsung.txt
  N:    exynos
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
@@@ -1499,14 -1487,6 +1506,14 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/platform/s5p-tv/
  
 +ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
 +M:    Andrzej Pietrasiewicz <andrzej.p@samsung.com>
 +M:    Jacek Anaszewski <j.anaszewski@samsung.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/s5p-jpeg/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
@@@ -1519,6 -1499,8 +1526,6 @@@ F:      arch/arm/boot/dts/emev2
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
  F:    arch/arm/boot/dts/sh*
 -F:    arch/arm/configs/bockw_defconfig
 -F:    arch/arm/configs/marzen_defconfig
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
@@@ -1553,7 -1535,6 +1560,7 @@@ W:      http://www.stlinux.co
  S:    Maintained
  F:    arch/arm/mach-sti/
  F:    arch/arm/boot/dts/sti*
 +F:    drivers/char/hw_random/st-rng.c
  F:    drivers/clocksource/arm_global_timer.c
  F:    drivers/clocksource/clksrc_st_lpc.c
  F:    drivers/i2c/busses/i2c-st.c
@@@ -1633,10 -1614,7 +1640,10 @@@ M:    Masahiro Yamada <yamada.masahiro@soc
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/uniphier*
 +F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
 +F:    arch/arm/mm/cache-uniphier.c
 +F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
  F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
@@@ -1809,14 -1787,6 +1816,14 @@@ S:    Supporte
  F:    Documentation/aoe/
  F:    drivers/block/aoe/
  
 +ATHEROS 71XX/9XXX GPIO DRIVER
 +M:    Alban Bedel <albeu@free.fr>
 +W:    https://github.com/AlbanBedel/linux
 +T:    git git://github.com/AlbanBedel/linux
 +S:    Maintained
 +F:    drivers/gpio/gpio-ath79.c
 +F:    Documentation/devicetree/bindings/gpio/gpio-ath79.txt
 +
  ATHEROS ATH GENERIC UTILITIES
  M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2398,27 -2368,19 +2405,27 @@@ L:   linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/bnx2i/
  
 -BROADCOM CYGNUS/IPROC ARM ARCHITECTURE
 +BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <rjui@broadcom.com>
  M:    Scott Branden <sbranden@broadcom.com>
 +M:    Jon Mason <jonmason@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://github.com/broadcom/cygnus-linux.git
  S:    Maintained
  N:    iproc
  N:    cygnus
 +N:    nsp
  N:    bcm9113*
  N:    bcm9583*
 -N:    bcm583*
 +N:    bcm9585*
 +N:    bcm9586*
 +N:    bcm988312
  N:    bcm113*
 +N:    bcm583*
 +N:    bcm585*
 +N:    bcm586*
 +N:    bcm88312
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Gregory Fong <gregory.0xf0@gmail.com>
@@@ -2776,10 -2738,9 +2783,10 @@@ S:    Supporte
  F:    drivers/net/ethernet/cisco/enic/
  
  CISCO VIC LOW LATENCY NIC DRIVER
 -M:    Upinder Malhi <umalhi@cisco.com>
 +M:    Christian Benvenuti <benve@cisco.com>
 +M:    Dave Goodell <dgoodell@cisco.com>
  S:    Supported
 -F:    drivers/infiniband/hw/usnic
 +F:    drivers/infiniband/hw/usnic/
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -3414,7 -3375,6 +3421,7 @@@ M:      Support Opensource <support.opensour
  W:    http://www.dialog-semiconductor.com/products
  S:    Supported
  F:    Documentation/hwmon/da90??
 +F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    drivers/gpio/gpio-da90??.c
  F:    drivers/hwmon/da90??-hwmon.c
  F:    drivers/iio/adc/da91??-*.c
@@@ -3549,15 -3509,13 +3556,15 @@@ M:   Jonathan Corbet <corbet@lwn.net
  L:    linux-doc@vger.kernel.org
  S:    Maintained
  F:    Documentation/
 +F:    scripts/docproc.c
 +F:    scripts/kernel-doc*
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/acpi
  X:    Documentation/power
  X:    Documentation/spi
  X:    Documentation/DocBook/media
 -T:    git git://git.lwn.net/linux-2.6.git docs-next
 +T:    git git://git.lwn.net/linux.git docs-next
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@@ -3634,7 -3592,6 +3641,7 @@@ M:      Daniel Vetter <daniel.vetter@intel.c
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
  L:    dri-devel@lists.freedesktop.org
 +W:    https://01.org/linuxgraphics/
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://anongit.freedesktop.org/drm-intel
  S:    Supported
@@@ -4478,14 -4435,6 +4485,14 @@@ L:    linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/net/ethernet/freescale/ucc_geth*
  
 +FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 +M:    Claudiu Manoil <claudiu.manoil@freescale.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/gianfar*
 +X:    drivers/net/ethernet/freescale/gianfar_ptp.c
 +F:    Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
 +
  FREESCALE QUICC ENGINE UCC UART DRIVER
  M:    Timur Tabi <timur@tabi.org>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -5163,7 -5112,6 +5170,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/i2c/
  F:    Documentation/i2c/
  F:    drivers/i2c/
 +F:    drivers/i2c/*/
  F:    include/linux/i2c.h
  F:    include/linux/i2c-*.h
  F:    include/uapi/linux/i2c.h
@@@ -5505,6 -5453,12 +5512,6 @@@ W:     https://01.org/linux-acp
  S:    Supported
  F:    drivers/platform/x86/intel_menlow.c
  
 -INTEL IA32 MICROCODE UPDATE SUPPORT
 -M:    Borislav Petkov <bp@alien8.de>
 -S:    Maintained
 -F:    arch/x86/kernel/cpu/microcode/core*
 -F:    arch/x86/kernel/cpu/microcode/intel*
 -
  INTEL I/OAT DMA DRIVER
  M:    Dave Jiang <dave.jiang@intel.com>
  R:    Dan Williams <dan.j.williams@intel.com>
@@@ -5615,7 -5569,7 +5622,7 @@@ F:      drivers/net/wireless/iwlegacy
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <johannes.berg@intel.com>
  M:    Emmanuel Grumbach <emmanuel.grumbach@intel.com>
 -M:    Intel Linux Wireless <ilw@linux.intel.com>
 +M:    Intel Linux Wireless <linuxwifi@intel.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://intellinuxwireless.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
@@@ -6162,13 -6116,6 +6169,13 @@@ F:    Documentation/auxdisplay/ks010
  F:    drivers/auxdisplay/ks0108.c
  F:    include/linux/ks0108.h
  
 +L3MDEV
 +M:    David Ahern <dsa@cumulusnetworks.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/l3mdev
 +F:    include/net/l3mdev.h
 +
  LAPB module
  L:    linux-x25@vger.kernel.org
  S:    Orphan
@@@ -6319,14 -6266,6 +6326,14 @@@ F:    drivers/nvdimm/pmem.
  F:    include/linux/pmem.h
  F:    arch/*/include/asm/pmem.h
  
 +LIGHTNVM PLATFORM SUPPORT
 +M:    Matias Bjorling <mb@lightnvm.io>
 +W:    http://github/OpenChannelSSD
 +S:    Maintained
 +F:    drivers/lightnvm/
 +F:    include/linux/lightnvm.h
 +F:    include/uapi/linux/lightnvm.h
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
@@@ -6644,13 -6583,6 +6651,13 @@@ M:    Guenter Roeck <linux@roeck-us.net
  S:    Maintained
  F:    drivers/net/dsa/mv88e6352.c
  
 +MARVELL CRYPTO DRIVER
 +M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Arnaud Ebalard <arno@natisbad.org>
 +F:    drivers/crypto/marvell/
 +S:    Maintained
 +L:    linux-crypto@vger.kernel.org
 +
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:    Mirko Lindner <mlindner@marvell.com>
  M:    Stephen Hemminger <stephen@networkplumber.org>
@@@ -7061,7 -6993,6 +7068,7 @@@ M:      Alan Ott <alan@signal11.us
  L:    linux-wpan@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ieee802154/mrf24j40.c
 +F:    Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
  
  MSI LAPTOP SUPPORT
  M:    "Lee, Chun-Yi" <jlee@suse.com>
@@@ -7134,6 -7065,7 +7141,6 @@@ F:      drivers/media/i2c/mt9v032.
  F:    include/media/mt9v032.h
  
  MULTIFUNCTION DEVICES (MFD)
 -M:    Samuel Ortiz <sameo@linux.intel.com>
  M:    Lee Jones <lee.jones@linaro.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  S:    Supported
@@@ -7395,6 -7327,7 +7402,6 @@@ S:      Odd Fixe
  F:    drivers/net/
  F:    include/linux/if_*
  F:    include/linux/netdevice.h
 -F:    include/linux/arcdevice.h
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
@@@ -7487,10 -7420,10 +7494,10 @@@ NOKIA N900 POWER SUPPLY DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
  F:    include/linux/power/bq2415x_charger.h
 -F:    include/linux/power/bq27x00_battery.h
 +F:    include/linux/power/bq27xxx_battery.h
  F:    include/linux/power/isp1704_charger.h
  F:    drivers/power/bq2415x_charger.c
 -F:    drivers/power/bq27x00_battery.c
 +F:    drivers/power/bq27xxx_battery.c
  F:    drivers/power/isp1704_charger.c
  F:    drivers/power/rx51_battery.c
  
@@@ -7533,13 -7466,11 +7540,13 @@@ F:   drivers/video/fbdev/riva
  F:    drivers/video/fbdev/nvidia/
  
  NVM EXPRESS DRIVER
 -M:    Matthew Wilcox <willy@linux.intel.com>
 +M:    Keith Busch <keith.busch@intel.com>
 +M:    Jens Axboe <axboe@fb.com>
  L:    linux-nvme@lists.infradead.org
 -T:    git git://git.infradead.org/users/willy/linux-nvme.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 +W:    https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
  S:    Supported
 -F:    drivers/block/nvme*
 +F:    drivers/nvme/host/
  F:    include/linux/nvme.h
  
  NVMEM FRAMEWORK
@@@ -8034,14 -7965,6 +8041,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR ALTERA PCIE IP
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    rfi@lists.rocketboards.org (moderated for non-subscribers)
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/altera-pcie.txt
 +F:    drivers/pci/host/pcie-altera.c
 +
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:    Rob Herring <robh@kernel.org>
  L:    linux-pci@vger.kernel.org
@@@ -8143,14 -8066,6 +8150,14 @@@ L:    linux-pci@vger.kernel.or
  S:    Maintained
  F:    drivers/pci/host/*spear*
  
 +PCI MSI DRIVER FOR ALTERA MSI IP
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    rfi@lists.rocketboards.org (moderated for non-subscribers)
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 +F:    drivers/pci/host/pcie-altera-msi.c
 +
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
  M:    Duc Dang <dhdang@apm.com>
  L:    linux-pci@vger.kernel.org
@@@ -8159,13 -8074,6 +8166,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
  F:    drivers/pci/host/pci-xgene-msi.c
  
 +PCIE DRIVER FOR HISILICON
 +M:    Zhou Wang <wangzhou1@hisilicon.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
 +F:    drivers/pci/host/pcie-hisi.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -8272,13 -8180,6 +8279,13 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-at91.*
  
 +PIN CONTROLLER - ATMEL AT91 PIO4
 +M:    Ludovic Desroches <ludovic.desroches@atmel.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-gpio@vger.kernel.org
 +S:    Supported
 +F:    drivers/pinctrl/pinctrl-at91-pio4.*
 +
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@@ -8382,6 -8283,12 +8389,6 @@@ M:     "Rafael J. Wysocki" <rafael.j.wysock
  S:    Maintained
  F:    drivers/pnp/
  
 -PNXxxxx I2C DRIVER
 -M:    Vitaly Wool <vitalywool@gmail.com>
 -L:    linux-i2c@vger.kernel.org
 -S:    Maintained
 -F:    drivers/i2c/busses/i2c-pnx.c
 -
  PPP PROTOCOL DRIVERS AND COMPRESSORS
  M:    Paul Mackerras <paulus@samba.org>
  L:    linux-ppp@vger.kernel.org
@@@ -8634,16 -8541,6 +8641,16 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
  
 +QLOGIC QL4xxx ETHERNET DRIVER
 +M:    Yuval Mintz <Yuval.Mintz@qlogic.com>
 +M:    Ariel Elior <Ariel.Elior@qlogic.com>
 +M:    everest-linux-l2@qlogic.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/qlogic/qed/
 +F:    include/linux/qed/
 +F:    drivers/net/ethernet/qlogic/qede/
 +
  QNX4 FILESYSTEM
  M:    Anders Larsen <al@alarsen.net>
  W:    http://www.alarsen.net/linux/qnx4fs/
@@@ -8995,13 -8892,6 +9002,13 @@@ S:    Maintaine
  F:    drivers/net/wireless/rtlwifi/
  F:    drivers/net/wireless/rtlwifi/rtl8192ce/
  
 +RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 +M:    Jes Sorensen <Jes.Sorensen@redhat.com>
 +L:    linux-wireless@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211
 +S:    Maintained
 +F:    drivers/net/wireless/realtek/rtl8xxxu/
 +
  S3 SAVAGE FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -9075,13 -8965,6 +9082,13 @@@ F:    drivers/s390/net/*iucv
  F:    include/net/iucv/
  F:    net/iucv/
  
 +S390 IOMMU (PCI)
 +M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/iommu/s390-iommu.c
 +
  S3C24XX SD/MMC Driver
  M:    Ben Dooks <ben-linux@fluff.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -9301,16 -9184,6 +9308,16 @@@ W:    http://www.sunplus.co
  S:    Supported
  F:    arch/score/
  
 +SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 +M:    Sudeep Holla <sudeep.holla@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/arm,scpi.txt
 +F:    drivers/clk/clk-scpi.c
 +F:    drivers/cpufreq/scpi-cpufreq.c
 +F:    drivers/firmware/arm_scpi.c
 +F:    include/linux/scpi_protocol.h
 +
  SCSI CDROM DRIVER
  M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-scsi@vger.kernel.org
@@@ -10226,7 -10099,6 +10233,7 @@@ F:   include/net/switchdev.
  
  SYNOPSYS ARC ARCHITECTURE
  M:    Vineet Gupta <vgupta@synopsys.com>
 +L:    linux-snps-arc@lists.infraded.org
  S:    Supported
  F:    arch/arc/
  F:    Documentation/devicetree/bindings/arc/*
@@@ -10687,12 -10559,6 +10694,12 @@@ L: platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/toshiba_haps.c
  
 +TOSHIBA WMI HOTKEYS DRIVER
 +M:    Azael Avalos <coproscefalo@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/toshiba-wmi.c
 +
  TOSHIBA SMM DRIVER
  M:    Jonathan Buzzard <jonathan@buzzard.org.uk>
  W:    http://www.buzzard.org.uk/toshiba/
@@@ -10750,7 -10616,6 +10757,7 @@@ F:   drivers/media/pci/tw68
  TPM DEVICE DRIVER
  M:    Peter Huewe <peterhuewe@gmx.de>
  M:    Marcel Selhorst <tpmdd@selhorst.net>
 +M:    Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  R:    Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
@@@ -11235,12 -11100,6 +11242,12 @@@ S: Maintaine
  F:    Documentation/fb/uvesafb.txt
  F:    drivers/video/fbdev/uvesafb.*
  
 +VF610 NAND DRIVER
 +M:    Stefan Agner <stefan@agner.ch>
 +L:    linux-mtd@lists.infradead.org
 +S:    Supported
 +F:    drivers/mtd/nand/vf610_nfc.c
 +
  VFAT/FAT/MSDOS FILESYSTEM
  M:    OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
  S:    Maintained
@@@ -11271,12 -11130,6 +11278,12 @@@ S: Maintaine
  F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
 +VIRTUAL SERIO DEVICE DRIVER
 +M:    Stephen Chandler Paul <thatslyude@gmail.com>
 +S:    Maintained
 +F:    drivers/input/serio/userio.c
 +F:    include/uapi/linux/userio.h
 +
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit.shah@redhat.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -11354,13 -11207,6 +11361,13 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/via/via-velocity.*
  
 +VIRT LIB
 +M:    Alex Williamson <alex.williamson@redhat.com>
 +M:    Paolo Bonzini <pbonzini@redhat.com>
 +L:    kvm@vger.kernel.org
 +S:    Supported
 +F:    virt/lib/
 +
  VIVID VIRTUAL VIDEO DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -11449,6 -11295,7 +11456,6 @@@ M:   Shrijeet Mukherjee <shm@cumulusnetwo
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/vrf.c
 -F:    include/net/vrf.h
  F:    Documentation/networking/vrf.txt
  
  VT1211 HARDWARE MONITOR DRIVER
@@@ -11567,9 -11414,6 +11574,9 @@@ T:   git https://github.com/CirrusLogic/l
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
  F:    Documentation/hwmon/wm83??
 +F:    Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 +F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 +F:    Documentation/devicetree/bindings/mfd/arizona.txt
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
  F:    drivers/extcon/extcon-arizona.c
@@@ -11630,7 -11474,6 +11637,7 @@@ L:   platform-driver-x86@vger.kernel.or
  T:    git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86/
 +F:    drivers/platform/olpc/
  
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <tony.luck@intel.com>
@@@ -11639,11 -11482,6 +11646,11 @@@ L: linux-edac@vger.kernel.or
  S:    Maintained
  F:    arch/x86/kernel/cpu/mcheck/*
  
 +X86 MICROCODE UPDATE SUPPORT
 +M:    Borislav Petkov <bp@alien8.de>
 +S:    Maintained
 +F:    arch/x86/kernel/cpu/microcode/*
 +
  X86 VDSO
  M:    Andy Lutomirski <luto@amacapital.net>
  L:    linux-kernel@vger.kernel.org
index d13aa3f9bac48b70c81e20fca87741a40ca61b9c,14bd9ae3f476a2f8c9dd8672e5e21ed9125b9ad4..f776adcdaee8c3e354d73eb65c1ced6c9a752f30
@@@ -25,7 -25,6 +25,7 @@@
  #include <linux/mmc/host.h>
  #include <linux/regulator/machine.h>
  #include <linux/regulator/fixed.h>
 +#include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/dm9000.h>
  #include <linux/gpio_keys.h>
@@@ -109,14 -108,11 +109,14 @@@ static struct s3c2410_uartcfg crag6410_
        },
  };
  
 +static struct pwm_lookup crag6410_pwm_lookup[] = {
 +      PWM_LOOKUP("samsung-pwm", 0, "pwm-backlight", NULL, 100000,
 +                 PWM_POLARITY_NORMAL),
 +};
 +
  static struct platform_pwm_backlight_data crag6410_backlight_data = {
 -      .pwm_id         = 0,
        .max_brightness = 1000,
        .dft_brightness = 600,
 -      .pwm_period_ns  = 100000,       /* about 1kHz */
        .enable_gpio    = -1,
  };
  
@@@ -813,7 -809,7 +813,7 @@@ static const struct gpio_led_platform_d
        .num_leds = ARRAY_SIZE(gpio_leds),
  };
  
- static struct s3c_hsotg_plat crag6410_hsotg_pdata;
+ static struct dwc2_hsotg_plat crag6410_hsotg_pdata;
  
  static void __init crag6410_machine_init(void)
  {
        s3c_i2c0_set_platdata(&i2c0_pdata);
        s3c_i2c1_set_platdata(&i2c1_pdata);
        s3c_fb_set_platdata(&crag6410_lcd_pdata);
-       s3c_hsotg_set_platdata(&crag6410_hsotg_pdata);
+       dwc2_hsotg_set_platdata(&crag6410_hsotg_pdata);
  
        i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
        i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
        samsung_keypad_set_platdata(&crag6410_keypad_data);
        s3c64xx_spi0_set_platdata(NULL, 0, 2);
  
 +      pwm_add_table(crag6410_pwm_lookup, ARRAY_SIZE(crag6410_pwm_lookup));
        platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices));
  
        gpio_led_register_device(-1, &gpio_leds_pdata);
index 7b8a3699795c0e636210455535b36c7e57566606,719843dca510d5900a8560bacee9706650f5b2e6..acdfb5fac40f6f8124dd57b71a3b173ac2296c08
@@@ -14,7 -14,6 +14,7 @@@
  #include <linux/gpio.h>
  #include <linux/init.h>
  #include <linux/platform_device.h>
 +#include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/serial_core.h>
  #include <linux/serial_s3c.h>
@@@ -140,11 -139,6 +140,11 @@@ static struct platform_device smartq_us
        .dev.platform_data      = &smartq_usb_otg_vbus_pdata,
  };
  
 +static struct pwm_lookup smartq_pwm_lookup[] = {
 +      PWM_LOOKUP("samsung-pwm", 1, "pwm-backlight.0", NULL,
 +                 1000000000 / (1000 * 20), PWM_POLARITY_NORMAL),
 +};
 +
  static int smartq_bl_init(struct device *dev)
  {
      s3c_gpio_cfgpin(S3C64XX_GPF(15), S3C_GPIO_SFN(2));
  }
  
  static struct platform_pwm_backlight_data smartq_backlight_data = {
 -      .pwm_id         = 1,
        .max_brightness = 1000,
        .dft_brightness = 600,
 -      .pwm_period_ns  = 1000000000 / (1000 * 20),
        .enable_gpio    = -1,
        .init           = smartq_bl_init,
  };
@@@ -193,7 -189,7 +193,7 @@@ static struct s3c_hwmon_pdata smartq_hw
        },
  };
  
- static struct s3c_hsotg_plat smartq_hsotg_pdata;
+ static struct dwc2_hsotg_plat smartq_hsotg_pdata;
  
  static int __init smartq_lcd_setup_gpio(void)
  {
@@@ -386,7 -382,7 +386,7 @@@ void __init smartq_map_io(void
  void __init smartq_machine_init(void)
  {
        s3c_i2c0_set_platdata(NULL);
-       s3c_hsotg_set_platdata(&smartq_hsotg_pdata);
+       dwc2_hsotg_set_platdata(&smartq_hsotg_pdata);
        s3c_hwmon_set_platdata(&smartq_hwmon_pdata);
        s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);
        s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);
        WARN_ON(smartq_usb_host_init());
        WARN_ON(smartq_wifi_init());
  
 +      pwm_add_table(smartq_pwm_lookup, ARRAY_SIZE(smartq_pwm_lookup));
        platform_add_devices(smartq_devices, ARRAY_SIZE(smartq_devices));
  }
index 2722800d5c11ae6c760dbf436049c3c0029856f0,286c9bd676e1796154f65d08f85a899fb40f06c5..30fd27853072440a5a642d2cae86bcc2357d0247
@@@ -30,7 -30,6 +30,7 @@@
  #include <linux/smsc911x.h>
  #include <linux/regulator/fixed.h>
  #include <linux/regulator/machine.h>
 +#include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/platform_data/s3c-hsotg.h>
  
@@@ -624,16 -623,12 +624,16 @@@ static struct samsung_bl_gpio_info smdk
        .func = S3C_GPIO_SFN(2),
  };
  
 +static struct pwm_lookup smdk6410_pwm_lookup[] = {
 +      PWM_LOOKUP("samsung-pwm", 1, "pwm-backlight.0", NULL, 78770,
 +                 PWM_POLARITY_NORMAL),
 +};
 +
  static struct platform_pwm_backlight_data smdk6410_bl_data = {
 -      .pwm_id = 1,
        .enable_gpio = -1,
  };
  
- static struct s3c_hsotg_plat smdk6410_hsotg_pdata;
+ static struct dwc2_hsotg_plat smdk6410_hsotg_pdata;
  
  static void __init smdk6410_map_io(void)
  {
@@@ -664,7 -659,7 +664,7 @@@ static void __init smdk6410_machine_ini
        s3c_i2c0_set_platdata(NULL);
        s3c_i2c1_set_platdata(NULL);
        s3c_fb_set_platdata(&smdk6410_lcd_pdata);
-       s3c_hsotg_set_platdata(&smdk6410_hsotg_pdata);
+       dwc2_hsotg_set_platdata(&smdk6410_hsotg_pdata);
  
        samsung_keypad_set_platdata(&smdk6410_keypad_data);
  
  
        platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
  
 +      pwm_add_table(smdk6410_pwm_lookup, ARRAY_SIZE(smdk6410_pwm_lookup));
        samsung_bl_set(&smdk6410_bl_gpio_info, &smdk6410_bl_data);
  }
  
index ad53aed9b2806276defda453f5d3eda3c3cbfcc1,6ccbf60cdd5c1204f77072a396d9791c6bfdcc2a..7c9b63064ea07e5308935ddfd5d4cef3504d512b
@@@ -56,12 -56,23 +56,23 @@@ static const struct ci_hdrc_imx_platfor
                CI_HDRC_DISABLE_HOST_STREAMING,
  };
  
+ static const struct ci_hdrc_imx_platform_flag imx6ul_usb_data = {
+       .flags = CI_HDRC_SUPPORTS_RUNTIME_PM |
+               CI_HDRC_TURN_VBUS_EARLY_ON,
+ };
+ static const struct ci_hdrc_imx_platform_flag imx7d_usb_data = {
+       .flags = CI_HDRC_SUPPORTS_RUNTIME_PM,
+ };
  static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
        { .compatible = "fsl,imx28-usb", .data = &imx28_usb_data},
        { .compatible = "fsl,imx27-usb", .data = &imx27_usb_data},
        { .compatible = "fsl,imx6q-usb", .data = &imx6q_usb_data},
        { .compatible = "fsl,imx6sl-usb", .data = &imx6sl_usb_data},
        { .compatible = "fsl,imx6sx-usb", .data = &imx6sx_usb_data},
+       { .compatible = "fsl,imx6ul-usb", .data = &imx6ul_usb_data},
+       { .compatible = "fsl,imx7d-usb", .data = &imx7d_usb_data},
        { /* sentinel */ }
  };
  MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids);
@@@ -73,12 -84,6 +84,12 @@@ struct ci_hdrc_imx_data 
        struct imx_usbmisc_data *usbmisc_data;
        bool supports_runtime_pm;
        bool in_lpm;
 +      /* SoC before i.mx6 (except imx23/imx28) needs three clks */
 +      bool need_three_clks;
 +      struct clk *clk_ipg;
 +      struct clk *clk_ahb;
 +      struct clk *clk_per;
 +      /* --------------------------------- */
  };
  
  /* Common functions shared by usbmisc drivers */
@@@ -130,102 -135,6 +141,102 @@@ static struct imx_usbmisc_data *usbmisc
  }
  
  /* End of common functions shared by usbmisc drivers*/
 +static int imx_get_clks(struct device *dev)
 +{
 +      struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
 +      int ret = 0;
 +
 +      data->clk_ipg = devm_clk_get(dev, "ipg");
 +      if (IS_ERR(data->clk_ipg)) {
 +              /* If the platform only needs one clocks */
 +              data->clk = devm_clk_get(dev, NULL);
 +              if (IS_ERR(data->clk)) {
 +                      ret = PTR_ERR(data->clk);
 +                      dev_err(dev,
 +                              "Failed to get clks, err=%ld,%ld\n",
 +                              PTR_ERR(data->clk), PTR_ERR(data->clk_ipg));
 +                      return ret;
 +              }
 +              return ret;
 +      }
 +
 +      data->clk_ahb = devm_clk_get(dev, "ahb");
 +      if (IS_ERR(data->clk_ahb)) {
 +              ret = PTR_ERR(data->clk_ahb);
 +              dev_err(dev,
 +                      "Failed to get ahb clock, err=%d\n", ret);
 +              return ret;
 +      }
 +
 +      data->clk_per = devm_clk_get(dev, "per");
 +      if (IS_ERR(data->clk_per)) {
 +              ret = PTR_ERR(data->clk_per);
 +              dev_err(dev,
 +                      "Failed to get per clock, err=%d\n", ret);
 +              return ret;
 +      }
 +
 +      data->need_three_clks = true;
 +      return ret;
 +}
 +
 +static int imx_prepare_enable_clks(struct device *dev)
 +{
 +      struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
 +      int ret = 0;
 +
 +      if (data->need_three_clks) {
 +              ret = clk_prepare_enable(data->clk_ipg);
 +              if (ret) {
 +                      dev_err(dev,
 +                              "Failed to prepare/enable ipg clk, err=%d\n",
 +                              ret);
 +                      return ret;
 +              }
 +
 +              ret = clk_prepare_enable(data->clk_ahb);
 +              if (ret) {
 +                      dev_err(dev,
 +                              "Failed to prepare/enable ahb clk, err=%d\n",
 +                              ret);
 +                      clk_disable_unprepare(data->clk_ipg);
 +                      return ret;
 +              }
 +
 +              ret = clk_prepare_enable(data->clk_per);
 +              if (ret) {
 +                      dev_err(dev,
 +                              "Failed to prepare/enable per clk, err=%d\n",
 +                              ret);
 +                      clk_disable_unprepare(data->clk_ahb);
 +                      clk_disable_unprepare(data->clk_ipg);
 +                      return ret;
 +              }
 +      } else {
 +              ret = clk_prepare_enable(data->clk);
 +              if (ret) {
 +                      dev_err(dev,
 +                              "Failed to prepare/enable clk, err=%d\n",
 +                              ret);
 +                      return ret;
 +              }
 +      }
 +
 +      return ret;
 +}
 +
 +static void imx_disable_unprepare_clks(struct device *dev)
 +{
 +      struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
 +
 +      if (data->need_three_clks) {
 +              clk_disable_unprepare(data->clk_per);
 +              clk_disable_unprepare(data->clk_ahb);
 +              clk_disable_unprepare(data->clk_ipg);
 +      } else {
 +              clk_disable_unprepare(data->clk);
 +      }
 +}
  
  static int ci_hdrc_imx_probe(struct platform_device *pdev)
  {
        if (!data)
                return -ENOMEM;
  
 +      platform_set_drvdata(pdev, data);
        data->usbmisc_data = usbmisc_get_init_data(&pdev->dev);
        if (IS_ERR(data->usbmisc_data))
                return PTR_ERR(data->usbmisc_data);
  
 -      data->clk = devm_clk_get(&pdev->dev, NULL);
 -      if (IS_ERR(data->clk)) {
 -              dev_err(&pdev->dev,
 -                      "Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
 -              return PTR_ERR(data->clk);
 -      }
 +      ret = imx_get_clks(&pdev->dev);
 +      if (ret)
 +              return ret;
  
 -      ret = clk_prepare_enable(data->clk);
 -      if (ret) {
 -              dev_err(&pdev->dev,
 -                      "Failed to prepare or enable clock, err=%d\n", ret);
 +      ret = imx_prepare_enable_clks(&pdev->dev);
 +      if (ret)
                return ret;
 -      }
  
        data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0);
        if (IS_ERR(data->phy)) {
                goto disable_device;
        }
  
 -      platform_set_drvdata(pdev, data);
 -
        if (data->supports_runtime_pm) {
                pm_runtime_set_active(&pdev->dev);
                pm_runtime_enable(&pdev->dev);
  disable_device:
        ci_hdrc_remove_device(data->ci_pdev);
  err_clk:
 -      clk_disable_unprepare(data->clk);
 +      imx_disable_unprepare_clks(&pdev->dev);
        return ret;
  }
  
@@@ -324,7 -240,7 +335,7 @@@ static int ci_hdrc_imx_remove(struct pl
                pm_runtime_put_noidle(&pdev->dev);
        }
        ci_hdrc_remove_device(data->ci_pdev);
 -      clk_disable_unprepare(data->clk);
 +      imx_disable_unprepare_clks(&pdev->dev);
  
        return 0;
  }
@@@ -336,7 -252,7 +347,7 @@@ static int imx_controller_suspend(struc
  
        dev_dbg(dev, "at %s\n", __func__);
  
 -      clk_disable_unprepare(data->clk);
 +      imx_disable_unprepare_clks(dev);
        data->in_lpm = true;
  
        return 0;
@@@ -354,7 -270,7 +365,7 @@@ static int imx_controller_resume(struc
                return 0;
        }
  
 -      ret = clk_prepare_enable(data->clk);
 +      ret = imx_prepare_enable_clks(dev);
        if (ret)
                return ret;
  
        return 0;
  
  clk_disable:
 -      clk_disable_unprepare(data->clk);
 +      imx_disable_unprepare_clks(dev);
        return ret;
  }
  
index 42894f58016eab5fae91534cdefec3fc3bb77e3e,9cc6a13d5e5b04893658b3ab83f507ab73c58658..f7771d86ad6c8d19e2016773c1b5ba4b2f3f33eb
@@@ -114,7 -114,6 +114,7 @@@ struct gs_port 
        struct gs_buf           port_write_buf;
        wait_queue_head_t       drain_wait;     /* wait while writes drain */
        bool                    write_busy;
 +      wait_queue_head_t       close_wait;
  
        /* REVISIT this state ... */
        struct usb_cdc_line_coding port_line_coding;    /* 8-N-1 etc */
@@@ -877,7 -876,6 +877,6 @@@ static void gs_close(struct tty_struct 
        else
                gs_buf_clear(&port->port_write_buf);
  
-       tty->driver_data = NULL;
        port->port.tty = NULL;
  
        port->openclose = false;
        pr_debug("gs_close: ttyGS%d (%p,%p) done!\n",
                        port->port_num, tty, file);
  
 -      wake_up(&port->port.close_wait);
 +      wake_up(&port->close_wait);
  exit:
        spin_unlock_irq(&port->port_lock);
  }
@@@ -1045,7 -1043,6 +1044,7 @@@ gs_port_alloc(unsigned port_num, struc
        tty_port_init(&port->port);
        spin_lock_init(&port->port_lock);
        init_waitqueue_head(&port->drain_wait);
 +      init_waitqueue_head(&port->close_wait);
  
        tasklet_init(&port->push, gs_rx_push, (unsigned long) port);
  
@@@ -1076,7 -1073,7 +1075,7 @@@ static void gserial_free_port(struct gs
  {
        tasklet_kill(&port->push);
        /* wait for old opens to finish */
 -      wait_event(port->port.close_wait, gs_closed(port));
 +      wait_event(port->close_wait, gs_closed(port));
        WARN_ON(port->port_usb != NULL);
        tty_port_destroy(&port->port);
        kfree(port);
@@@ -1226,7 -1223,6 +1225,6 @@@ int gserial_connect(struct gserial *gse
  
  fail_out:
        usb_ep_disable(gser->in);
-       gser->in->driver_data = NULL;
        return status;
  }
  EXPORT_SYMBOL_GPL(gserial_connect);
@@@ -1266,10 -1262,7 +1264,7 @@@ void gserial_disconnect(struct gserial 
  
        /* disable endpoints, aborting down any active I/O */
        usb_ep_disable(gser->out);
-       gser->out->driver_data = NULL;
        usb_ep_disable(gser->in);
-       gser->in->driver_data = NULL;
  
        /* finally, free any unused/unusable I/O buffers */
        spin_lock_irqsave(&port->port_lock, flags);
index e649d8d370f8954435b79728e95db462795add5f,9127ebbaa48761c9321f58254e7a9241d3200769..3c8825b67298fafe60f22c803206f9f0789fc8f7
@@@ -9,17 -9,22 +9,8 @@@
  
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
 -#include <linux/device.h>
 -#include <linux/i2c.h>
 -#include <linux/leds.h>
 -#include <linux/spi/spi.h>
 -#include <linux/usb/atmel_usba_udc.h>
 -#include <linux/atmel-mci.h>
 -#include <sound/atmel-ac97c.h>
  #include <linux/serial.h>
 -#include <linux/platform_data/macb.h>
 -
 -/*
 - * at91: 6 USARTs and one DBGU port (SAM9260)
 - * avr32: 4
 - */
 -#define ATMEL_MAX_UART        7
  
-  /* USB Device */
- struct at91_udc_data {
-       int     vbus_pin;               /* high == host powering us */
-       u8      vbus_active_low;        /* vbus polarity */
-       u8      vbus_polled;            /* Use polling, not interrupt */
-       int     pullup_pin;             /* active == D+ pulled up */
-       u8      pullup_active_low;      /* true == pullup_pin is active low */
- };
   /* Compact Flash */
  struct at91_cf_data {
        int     irq_pin;                /* I/O IRQ */
@@@ -60,6 -65,11 +51,6 @@@ struct atmel_uart_data 
        struct serial_rs485     rs485;          /* rs485 settings */
  };
  
 -/* CAN */
 -struct at91_can_data {
 -      void (*transceiver_switch)(int on);
 -};
 -
  /* FIXME: this needs a better location, but gets stuff building again */
  extern int at91_suspend_entering_slow_clock(void);