]> Git Repo - linux.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <[email protected]>
Sat, 9 Aug 2014 00:39:48 +0000 (17:39 -0700)
committerLinus Torvalds <[email protected]>
Sat, 9 Aug 2014 00:39:48 +0000 (17:39 -0700)
Pull input updates from Dmitry Torokhov:
 - big update to Wacom driver by Benjamin Tissoires, converting it to
   HID infrastructure and unifying USB and Bluetooth models
 - large update to ALPS driver by Hans de Goede, which adds support for
   newer touchpad models as well as cleans up and restructures the code
 - more changes to Atmel MXT driver, including device tree support
 - new driver for iPaq x3xxx touchscreen
 - driver for serial Wacom tablets
 - driver for Microchip's CAP1106
 - assorted cleanups and improvements to existing drover and input core

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (93 commits)
  Input: wacom - update the ABI doc according to latest changes
  Input: wacom - only register once the MODULE_* macros
  Input: HID - remove hid-wacom Bluetooth driver
  Input: wacom - add copyright note and bump version to 2.0
  Input: wacom - remove passing id for wacom_set_report
  Input: wacom - check for bluetooth protocol while setting OLEDs
  Input: wacom - handle Intuos 4 BT in wacom.ko
  Input: wacom - handle Graphire BT tablets in wacom.ko
  Input: wacom - prepare the driver to include BT devices
  Input: hyperv-keyboard - register as a wakeup source
  Input: imx_keypad - remove ifdef round PM methods
  Input: jornada720_ts - get rid of space indentation and use tab
  Input: jornada720_ts - switch to using managed resources
  Input: alps - Rushmore and v7 resolution support
  Input: mcs5000_ts - remove ifdef around power management methods
  Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEP
  Input: ads7846 - release resources on failure for clean exit
  Input: wacom - add support for 0x12C ISDv4 sensor
  Input: atmel_mxt_ts - use deep sleep mode when stopped
  ARM: dts: am437x-gp-evm: Update binding for touchscreen size
  ...

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/am43x-epos-evm.dts
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
include/linux/hid.h

index 3dc9188ce02313b198bea97a1b38e0de809199d9,91bd2287f0c779aad51acb78298340ce03713169..ac7269f90764da1193f064dad2af7193398b5d8f
@@@ -6,7 -6,6 +6,7 @@@ using them to avoid name-space collisio
  abilis        Abilis Systems
  active-semi   Active-Semi International Inc
  ad    Avionic Design GmbH
 +adapteva      Adapteva, Inc.
  adi   Analog Devices, Inc.
  aeroflexgaisler       Aeroflex Gaisler AB
  ak    Asahi Kasei Corp.
@@@ -43,7 -42,6 +43,7 @@@ dmo   Data Modul A
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
  emmicro       EM Microelectronic
 +epcos EPCOS AG
  epfl  Ecole Polytechnique Fédérale de Lausanne
  epson Seiko Epson Corp.
  est   ESTeem Wireless Modems
@@@ -73,14 -71,12 +73,14 @@@ karo       Ka-Ro electronics Gmb
  keymile       Keymile GmbH
  lacie LaCie
  lantiq        Lantiq Semiconductor
 +lenovo        Lenovo Group Ltd.
  lg    LG Corporation
  linux Linux-specific binding
  lsi   LSI Corp. (LSI Logic)
  lltc  Linear Technology Corporation
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
 +mediatek      MediaTek Inc.
  micrel        Micrel Inc.
  microchip     Microchip Technology Inc.
  mosaixtech    Mosaix Technologies, Inc.
@@@ -103,6 -99,7 +103,7 @@@ panasonic   Panasonic Corporatio
  phytec        PHYTEC Messtechnik GmbH
  picochip      Picochip Ltd
  plathome      Plat'Home Co., Ltd.
+ pixcir  PIXCIR MICROELECTRONICS Co., Ltd
  powervr       PowerVR (deprecated, use img)
  qca   Qualcomm Atheros, Inc.
  qcom  Qualcomm Technologies, Inc
@@@ -126,7 -123,6 +127,7 @@@ sii        Seiko Instruments, Inc
  sirf  SiRF Technology, Inc.
  smsc  Standard Microsystems Corporation
  snps  Synopsys, Inc.
 +solidrun      SolidRun
  spansion      Spansion Inc.
  st    STMicroelectronics
  ste   ST-Ericsson
diff --combined MAINTAINERS
index 30873e781dfa9584d22c002ef0f41aa5e571cb75,170472022f104f6797ba5b832bdfa03a11bd413c..3bb6df5d9094dc356764641a33639f02dd22e7f5
@@@ -70,8 -70,6 +70,8 @@@ Descriptions of section entries
  
        P: Person (obsolete)
        M: Mail patches to: FullName <address@domain>
 +      R: Designated reviewer: FullName <address@domain>
 +         These reviewers should be CCed on patches.
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
        Q: Patchwork web based patch tracking system site
@@@ -150,14 -148,6 +150,14 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/scsi/53c700*
  
 +6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 +M:    Alexander Aring <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    net/6lowpan/
 +F:    include/net/6lowpan.h
 +
  6PACK NETWORK DRIVER FOR AX.25
  M:    Andreas Koensgen <[email protected]>
  L:    [email protected]
@@@ -524,16 -514,6 +524,16 @@@ S:       Supporte
  F:    fs/aio.c
  F:    include/linux/*aio*.h
  
 +AIRSPY MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/airspy/
 +
  ALCATEL SPEEDTOUCH USB DRIVER
  M:    Duncan Sands <[email protected]>
  L:    [email protected]
@@@ -597,7 -577,7 +597,7 @@@ AMD GEODE CS5536 USB DEVICE CONTROLLER 
  M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    drivers/usb/gadget/amd5536udc.*
 +F:    drivers/usb/gadget/udc/amd5536udc.*
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
  P:    Andres Salomon <[email protected]>
@@@ -621,7 -601,7 +621,7 @@@ AMD MICROCODE UPDATE SUPPOR
  M:    Andreas Herrmann <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    arch/x86/kernel/microcode_amd.c
 +F:    arch/x86/kernel/cpu/microcode/amd*
  
  AMD XGBE DRIVER
  M:    Tom Lendacky <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
  S:    Maintained
  F:    arch/arm/mach-prima2/
 -F:    drivers/clk/clk-prima2.c
 +F:    drivers/clk/sirf/
  F:    drivers/clocksource/timer-prima2.c
  F:    drivers/clocksource/timer-marco.c
  N:    [^a-z]sirf
@@@ -985,14 -965,6 +985,14 @@@ F:       arch/arm/mach-pxa/hx4700.
  F:    arch/arm/mach-pxa/include/mach/hx4700.h
  F:    sound/soc/pxa/hx4700.c
  
 +ARM/HISILICON SOC SUPPORT
 +M:    Wei Xu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://www.hisilicon.com
 +S:    Supported
 +T:    git git://github.com/hisilicon/linux-hisi.git
 +F:    arch/arm/mach-hisi/
 +
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <[email protected]>
  W:    www.jlime.com
  S:    Maintained
  F:    arch/arm/mach-berlin/
  
 -ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 +ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-dove/
 -F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
@@@ -1164,7 -1137,6 +1164,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
 +F:    drivers/pinctrl/nomadik/
  F:    drivers/i2c/busses/i2c-nomadik.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
@@@ -1186,7 -1158,8 +1186,7 @@@ F:      drivers/mmc/host/msm_sdcc.
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
 -F:    drivers/mfd/ssbi/
 -F:    include/linux/mfd/pm8xxx/
 +F:    drivers/mfd/ssbi.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1383,7 -1356,6 +1383,7 @@@ F:      drivers/pinctrl/pinctrl-st.
  F:    drivers/media/rc/st_rc.c
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/tty/serial/st-asc.c
 +F:    drivers/mmc/host/sdhci-st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -1443,8 -1415,7 +1443,8 @@@ F:      drivers/mfd/abx500
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/mfd/db8500*
 -F:    drivers/pinctrl/pinctrl-nomadik*
 +F:    drivers/pinctrl/nomadik/pinctrl-ab*
 +F:    drivers/pinctrl/nomadik/pinctrl-nomadik*
  F:    drivers/rtc/rtc-ab8500.c
  F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
@@@ -1700,7 -1671,7 +1700,7 @@@ ATMEL USBA UDC DRIVE
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    drivers/usb/gadget/atmel_usba_udc.*
 +F:    drivers/usb/gadget/udc/atmel_usba_udc.*
  
  ATMEL WIRELESS DRIVER
  M:    Simon Kelley <[email protected]>
@@@ -1823,13 -1794,6 +1823,13 @@@ W:    http://bcache.evilpiepirate.or
  S:    Maintained:
  F:    drivers/md/bcache/
  
 +BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
 +M: Kevin McKinney <[email protected]>
 +M: Matthias Beyer <[email protected]>
 +S: Maintained
 +F: drivers/staging/bcm*
 +
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
@@@ -1948,13 -1912,6 +1948,13 @@@ S:    Supporte
  F:    drivers/net/bonding/
  F:    include/uapi/linux/if_bonding.h
  
 +BPF (Safe dynamic programs and tools)
 +M:    Alexei Starovoitov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    kernel/bpf/
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Gary Zambrano <[email protected]>
  L:    [email protected]
@@@ -1968,8 -1925,7 +1968,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/genet/
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Michael Chan <[email protected]>
 +M:    Sony Chacko <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2.*
@@@ -1992,7 -1948,7 +1992,7 @@@ F:      arch/arm/boot/dts/bcm113
  F:    arch/arm/boot/dts/bcm216*
  F:    arch/arm/boot/dts/bcm281*
  F:    arch/arm/configs/bcm_defconfig
 -F:    drivers/mmc/host/sdhci_bcm_kona.c
 +F:    drivers/mmc/host/sdhci-bcm-kona.c
  F:    drivers/clocksource/bcm_kona_timer.c
  
  BROADCOM BCM2835 ARM ARCHICTURE
@@@ -2013,16 -1969,8 +2013,16 @@@ F:    arch/arm/mach-bcm/bcm_5301x.
  F:    arch/arm/boot/dts/bcm5301x.dtsi
  F:    arch/arm/boot/dts/bcm470*
  
 +BROADCOM BCM7XXX ARM ARCHITECTURE
 +M:    Marc Carino <[email protected]>
 +M:    Brian Norris <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-bcm/*brcmstb*
 +F:    arch/arm/boot/dts/bcm7*.dts*
 +
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Nithin Nayak Sujir <nsujir@broadcom.com>
 +M:    Prashant Sreedharan <prashant@broadcom.com>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -2039,13 -1987,13 +2039,13 @@@ S:   Supporte
  F:    drivers/net/wireless/brcm80211/
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    Eddie Wai <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
  BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 -M:    Eddie Wai <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2i/
  S:    Maintained
  F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
  
 -CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/host/ohci-ep93xx.c
 -
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <[email protected]>
  M:    Paul Handrigan <[email protected]>
@@@ -2426,7 -2380,7 +2426,7 @@@ W:      http://linux-cifs.samba.org
  Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
 -F:    Documentation/filesystems/cifs.txt
 +F:    Documentation/filesystems/cifs/
  F:    fs/cifs/
  
  COMPACTPCI HOTPLUG CORE
@@@ -2567,8 -2521,8 +2567,8 @@@ F:      arch/x86/kernel/cpuid.
  F:    arch/x86/kernel/msr.c
  
  CPU POWER MONITORING SUBSYSTEM
 -M:    Dominik Brodowski <[email protected]>
  M:    Thomas Renninger <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    tools/power/cpupower/
  
@@@ -2903,7 -2857,6 +2903,7 @@@ F:      drivers/staging/dgnc
  DIGI EPCA PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
  M:    Mark Hounschell <[email protected]>
 +M:    Daeseok Youn <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/dgap/
@@@ -2960,10 -2913,8 +2960,10 @@@ S:    Maintaine
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
 -F:    drivers/base/dma-buf*
 +F:    drivers/dma-buf/
  F:    include/linux/dma-buf*
 +F:    include/linux/reservation.h
 +F:    include/linux/*fence.h
  F:    Documentation/dma-buf-sharing.txt
  T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
  
@@@ -3058,6 -3009,7 +3058,6 @@@ L:      [email protected]
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
  F:    drivers/gpu/drm/radeon/
 -F:    include/drm/radeon*
  F:    include/uapi/drm/radeon*
  
  DRM PANEL DRIVERS
@@@ -3251,12 -3203,26 +3251,12 @@@ T:   git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/e4000*
  
 -EATA-DMA SCSI DRIVER
 -M:    Michael Neuffer <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/eata*
 -
  EATA ISA/EISA/PCI SCSI DRIVER
  M:    Dario Ballabio <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/eata.c
  
 -EATA-PIO SCSI DRIVER
 -M:    Michael Neuffer <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/eata_pio.*
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -3384,13 -3350,6 +3384,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/i82975x_edac.c
  
 +EDAC-IE31200
 +M:    Jason Baron <[email protected]>
 +L:    [email protected]
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +F:    drivers/edac/ie31200_edac.c
 +
  EDAC-MPC85XX
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
@@@ -3431,7 -3390,7 +3431,7 @@@ M:      Matt Fleming <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
  S:    Maintained
 -F:    Documentation/x86/efi-stub.txt
 +F:    Documentation/efi-stub.txt
  F:    arch/ia64/kernel/efi.c
  F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/x86/include/asm/efi.h
@@@ -3818,7 -3777,7 +3818,7 @@@ M:      Li Yang <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/fsl*
 +F:    drivers/usb/gadget/udc/fsl*
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
@@@ -4017,12 -3976,6 +4017,12 @@@ F:    Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/uapi/linux/gigaset_dev.h
  
 +GO7007 MPEG CODEC
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/usb/go7007/
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Alexandre Courbot <[email protected]>
@@@ -4251,7 -4204,7 +4251,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Maintained
  F:    Documentation/timers/
 -F:    kernel/hrtimer.c
 +F:    kernel/time/hrtimer.c
  F:    kernel/time/clockevents.c
  F:    kernel/time/tick*.*
  F:    kernel/time/timer_*.c
@@@ -4507,7 -4460,10 +4507,7 @@@ S:     Supporte
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
  IBM ServeRAID RAID DRIVER
 -P:    Jack Hammer
 -M:    Dave Jeffery <[email protected]>
 -W:    http://www.developer.ibm.com/welcome/netfinity/serveraid.html
 -S:    Supported
 +S:    Orphan
  F:    drivers/scsi/ips.*
  
  ICH LPC AND GPIO DRIVER
@@@ -4704,8 -4660,8 +4704,8 @@@ F:      drivers/platform/x86/intel_menlow.
  INTEL IA32 MICROCODE UPDATE SUPPORT
  M:    Tigran Aivazian <[email protected]>
  S:    Maintained
 -F:    arch/x86/kernel/microcode_core.c
 -F:    arch/x86/kernel/microcode_intel.c
 +F:    arch/x86/kernel/cpu/microcode/core*
 +F:    arch/x86/kernel/cpu/microcode/intel*
  
  INTEL I/OAT DMA DRIVER
  M:    Dan Williams <[email protected]>
@@@ -5110,6 -5066,13 +5110,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/k8temp
  F:    drivers/hwmon/k8temp.c
  
 -KTAP
 -M:    Jovi Zhangwei <[email protected]>
 -W:    http://www.ktap.org
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/ktap/
 -
  KCONFIG
  M:    "Yann E. MORIN" <[email protected]>
  L:    [email protected]
@@@ -5164,6 -5127,7 +5164,6 @@@ L:      [email protected]
  W:    http://nfs.sourceforge.net/
  S:    Supported
  F:    fs/nfsd/
 -F:    include/linux/nfsd/
  F:    include/uapi/linux/nfsd/
  F:    fs/lockd/
  F:    fs/nfs_common/
@@@ -5418,7 -5382,6 +5418,7 @@@ F:      arch/powerpc/boot/rs6000.
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Benjamin Herrenschmidt <[email protected]>
  M:    Paul Mackerras <[email protected]>
 +M:    Michael Ellerman <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
@@@ -5460,17 -5423,16 +5460,17 @@@ F:   arch/powerpc/*/*/*virtex
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
  M:    Vitaly Bordug <[email protected]>
 -M:    Marcelo Tosatti <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 +M:    Scott Wood <[email protected]>
  M:    Kumar Gala <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
  S:    Maintained
  F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
@@@ -5693,6 -5655,16 +5693,6 @@@ F:     Documentation/networking/mac80211-in
  F:    include/net/mac80211.h
  F:    net/mac80211/
  
 -MAC80211 PID RATE CONTROL
 -M:    Stefano Brivio <[email protected]>
 -M:    Mattias Nissler <[email protected]>
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 -S:    Maintained
 -F:    net/mac80211/rc80211_pid*
 -
  MACVLAN DRIVER
  M:    Patrick McHardy <[email protected]>
  L:    [email protected]
@@@ -5737,8 -5709,7 +5737,8 @@@ S:      Maintaine
  F:    drivers/net/ethernet/marvell/mvneta.*
  
  MARVELL MWIFIEX WIRELESS DRIVER
 -M:    Bing Zhao <[email protected]>
 +M:    Amitkumar Karwar <[email protected]>
 +M:    Avinash Patil <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mwifiex/
@@@ -5884,6 -5855,7 +5884,6 @@@ F:      drivers/clocksource/metag_generic.
  F:    drivers/irqchip/irq-metag.c
  F:    drivers/irqchip/irq-metag-ext.c
  F:    drivers/tty/metag_da.c
 -F:    fs/imgdafs/
  
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
@@@ -5983,9 -5955,9 +5983,9 @@@ W:      http://palosaari.fi/linux
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/staging/media/msi3101/msi001*
 +F:    drivers/media/tuners/msi001*
  
 -MSI3101 MEDIA DRIVER
 +MSI2500 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
  W:    http://linuxtv.org/
@@@ -5993,7 -5965,7 +5993,7 @@@ W:      http://palosaari.fi/linux
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/staging/media/msi3101/sdr-msi3101*
 +F:    drivers/media/usb/msi2500/
  
  MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <[email protected]>
@@@ -6030,7 -6002,8 +6030,7 @@@ F:      include/media/mt9v032.
  MULTIFUNCTION DEVICES (MFD)
  M:    Samuel Ortiz <[email protected]>
  M:    Lee Jones <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  S:    Supported
  F:    drivers/mfd/
  F:    include/linux/mfd/
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  
 -OMAP IMAGE SIGNAL PROCESSOR (ISP)
 +OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/platform/omap3isp/
 +F:    drivers/staging/media/omap4iss/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <[email protected]>
@@@ -6879,12 -6851,6 +6879,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
  F:    drivers/pci/host/pci-host-generic.c
  
 +PCIE DRIVER FOR ST SPEAR13XX
 +M:    Mohit Kumar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pci/host/*spear*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -6974,9 -6940,9 +6974,9 @@@ M:      Jamie Iles <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/jamieiles/linux-2.6-ji.git
  S:    Supported
 +F:    arch/arm/boot/dts/picoxcell*
  F:    arch/arm/mach-picoxcell/
 -F:    drivers/*/picoxcell*
 -F:    drivers/*/*/picoxcell*
 +F:    drivers/crypto/picoxcell*
  
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-at91.c
  
 +PIN CONTROLLER - RENESAS
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pinctrl/sh-pfc/
 +
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
  M:    Thomas Abraham <[email protected]>
@@@ -7060,16 -7020,14 +7060,16 @@@ POSIX CLOCKS and TIMER
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 -S:    Supported
 +S:    Maintained
  F:    fs/timerfd.c
  F:    include/linux/timer*
 -F:    kernel/*timer*
 +F:    kernel/time/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 +M:    Sebastian Reichel <[email protected]>
  M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    David Woodhouse <[email protected]>
 +L:    [email protected]
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
  F:    include/linux/power_supply.h
@@@ -7201,7 -7159,7 +7201,7 @@@ F:      drivers/ptp/
  F:    include/linux/ptp_cl*
  
  PTRACE SUPPORT
 -M:    Roland McGrath <roland@redhat.com>
 +M:    Roland McGrath <roland@hack.frob.com>
  M:    Oleg Nesterov <[email protected]>
  S:    Maintained
  F:    include/asm-generic/syscall.h
@@@ -7251,7 -7209,7 +7251,7 @@@ S:      Maintaine
  F:    arch/arm/mach-pxa/
  F:    drivers/pcmcia/pxa2xx*
  F:    drivers/spi/spi-pxa2xx*
 -F:    drivers/usb/gadget/pxa2*
 +F:    drivers/usb/gadget/udc/pxa2*
  F:    include/sound/pxa2xx-lib.h
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
@@@ -7260,7 -7218,7 +7260,7 @@@ PXA3xx NAND FLASH DRIVE
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/pxa3xx-nand.c
 +F:    drivers/mtd/nand/pxa3xx_nand.c
  
  MMP SUPPORT
  M:    Eric Miao <[email protected]>
@@@ -7279,12 -7237,6 +7279,12 @@@ M:    Robert Jarzmik <robert.jarzmik@free.
  L:    [email protected]
  S:    Maintained
  
 +QAT DRIVER
 +M:      Tadeusz Struk <[email protected]>
 +L:      [email protected]
 +S:      Supported
 +F:      drivers/crypto/qat/
 +
  QIB DRIVER
  M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
@@@ -7466,20 -7418,16 +7466,20 @@@ S:   Orpha
  F:    drivers/net/wireless/ray*
  
  RCUTORTURE MODULE
 -M:    Josh Triplett <josh@freedesktop.org>
 +M:    Josh Triplett <josh@joshtriplett.org>
  M:    "Paul E. McKenney" <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/torture.txt
 -F:    kernel/rcu/torture.c
 +F:    kernel/rcu/rcutorture.c
  
  RCUTORTURE TEST FRAMEWORK
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
 +R:    Lai Jiangshan <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@@ -7502,11 -7450,8 +7502,11 @@@ S:    Supporte
  F:    net/rds/
  
  READ-COPY UPDATE (RCU)
 -M:    Dipankar Sarma <[email protected]>
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
 +R:    Lai Jiangshan <[email protected]>
  L:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
@@@ -7516,7 -7461,7 +7516,7 @@@ X:      Documentation/RCU/torture.tx
  F:    include/linux/rcu*
  X:    include/linux/srcu.h
  F:    kernel/rcu/
 -X:    kernel/rcu/torture.c
 +X:    kernel/torture.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <[email protected]>
@@@ -7528,13 -7473,6 +7528,13 @@@ F:    drivers/rtc
  F:    include/linux/rtc.h
  F:    include/uapi/linux/rtc.h
  
 +REALTEK AUDIO CODECS
 +M:    Bard Liao <[email protected]>
 +M:    Oder Chiou <[email protected]>
 +S:    Maintained
 +F:    sound/soc/codecs/rt*
 +F:    include/sound/rt*.h
 +
  REISERFS FILE SYSTEM
  L:    [email protected]
  S:    Supported
@@@ -7644,7 -7582,7 +7644,7 @@@ W:      http://palosaari.fi/linux
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/staging/media/rtl2832u_sdr/rtl2832_sdr*
 +F:    drivers/media/dvb-frontends/rtl2832_sdr*
  
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <[email protected]>
@@@ -7878,11 -7816,6 +7878,11 @@@ S:    Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 +THUNDERBOLT DRIVER
 +M:    Andreas Noever <[email protected]>
 +S:    Maintained
 +F:    drivers/thunderbolt/
 +
  TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -8018,16 -7951,6 +8018,16 @@@ S:    Maintaine
  F:    drivers/mmc/host/sdhci.*
  F:    drivers/mmc/host/sdhci-pltfm.[ch]
  
 +SECURE COMPUTING
 +M:    Kees Cook <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
 +S:    Supported
 +F:    kernel/seccomp.c
 +F:    include/uapi/linux/seccomp.h
 +F:    include/linux/seccomp.h
 +K:    \bsecure_computing
 +K:    \bTIF_SECCOMP\b
 +
  SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
  M:    Anton Vorontsov <[email protected]>
  L:    [email protected]
@@@ -8096,16 -8019,6 +8096,16 @@@ F:    drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
 +SERIAL ATA AHCI PLATFORM devices support
 +M:    Hans de Goede <[email protected]>
 +M:    Tejun Heo <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Supported
 +F:    drivers/ata/ahci_platform.c
 +F:    drivers/ata/libahci_platform.c
 +F:    include/linux/ahci_platform.h
 +
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
  M:    Jayamohan Kallickal <[email protected]>
  L:    [email protected]
@@@ -8321,9 -8234,6 +8321,9 @@@ F:      mm/sl?b
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <[email protected]>
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
  L:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
@@@ -8423,12 -8333,6 +8423,12 @@@ M:    Chris Boot <[email protected]
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
 +SOFTLOGIC 6x10 MPEG CODEC
 +M:    Ismael Luceno <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/media/pci/solo6x10/
 +
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Neil Brown <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/staging/
  
 -STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
 -M:    Henk de Groot <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/wlags49_h2/
 -F:    drivers/staging/wlags49_h25/
 -
 -STAGING - ASUS OLED
 -M:    Jakub Schmidtke <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/asus_oled/
 -
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
  M:    H Hartley Sweeten <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
 -STAGING - CRYSTAL HD VIDEO DECODER
 -M:    Naren Sankar <[email protected]>
 -M:    Jarod Wilson <[email protected]>
 -M:    Scott Davilla <[email protected]>
 -M:    Manu Abraham <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/crystalhd/
 -
 -STAGING - ECHO CANCELLER
 -M:    Steve Underwood <[email protected]>
 -M:    David Rowe <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/echo/
 -
  STAGING - ET131X NETWORK DRIVER
  M:    Mark Einon <[email protected]>
  S:    Odd Fixes
@@@ -8635,6 -8564,16 +8635,6 @@@ M:     Marek Belisko <[email protected]
  S:    Odd Fixes
  F:    drivers/staging/ft1000/
  
 -STAGING - FRONTIER TRANZPORT AND ALPHATRACK
 -M:    David Täht <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/frontier/
 -
 -STAGING - GO7007 MPEG CODEC
 -M:    Hans Verkuil <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/media/go7007/
 -
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/rtl8723au/
  
 -STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 -M:    Teddy Wang <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/sm7xxfb/
 -
  STAGING - SLICOSS
  M:    Lior Dotan <[email protected]>
  M:    Christopher Harrer <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/slicoss/
  
 -STAGING - SOFTLOGIC 6x10 MPEG CODEC
 -M:    Ismael Luceno <[email protected]>
 -S:    Supported
 -F:    drivers/staging/media/solo6x10/
 -
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
  M:    William Hubbs <[email protected]>
  M:    Chris Brannon <[email protected]>
  M:    Kirk Reiser <[email protected]>
  M:    Samuel Thibault <[email protected]>
 -L:    speakup@braille.uwo.ca
 +L:    speakup@linux-speakup.org
  W:    http://www.linux-speakup.org/
  S:    Odd Fixes
  F:    drivers/staging/speakup/
  
 -STAGING - TI DSP BRIDGE DRIVERS
 -M:    Omar Ramirez Luna <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/tidspbridge/
 -
 -STAGING - USB ENE SM/MS CARD READER DRIVER
 -M:    Al Cho <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/keucr/
 -
  STAGING - VIA VT665X DRIVERS
  M:    Forest Bond <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/vt665?/
  
 -STAGING - WINBOND IS89C35 WLAN USB DRIVER
 -M:    Pavel Machek <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/winbond/
 -
  STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
  M:    Arnaud Patard <[email protected]>
  S:    Odd Fixes
@@@ -8942,7 -8906,7 +8942,7 @@@ M:      Stephen Warren <[email protected]
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
  S:    Supported
  N:    [^a-z]tegra
  
  S:    Supported
  F:    drivers/thermal/ti-soc-thermal/
  
 +TI CLOCK DRIVER
 +M:    Tero Kristo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clk/ti/
 +F:    include/linux/clk/ti.h
 +
  TI FLASH MEDIA INTERFACE DRIVER
  M:    Alex Dubov <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
  
 -USB SN9C1xx DRIVER
 -M:    Luca Risolia <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://www.linux-projects.org
 -S:    Maintained
 -F:    drivers/staging/media/sn9c102/
 -
  USB SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -9605,8 -9571,8 +9605,8 @@@ USB WEBCAM GADGE
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/*uvc*.c
 -F:    drivers/usb/gadget/webcam.c
 +F:    drivers/usb/gadget/function/*uvc*.c
 +F:    drivers/usb/gadget/legacy/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
  M:    Jussi Kivilinna <[email protected]>
@@@ -9877,6 -9843,13 +9877,13 @@@ M:    Pierre Ossman <[email protected]
  S:    Maintained
  F:    drivers/mmc/host/wbsd.*
  
+ WACOM PROTOCOL 4 SERIAL TABLETS
+ M:    Julian Squires <[email protected]>
+ M:    Hans de Goede <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/input/tablet/wacom_serial4.c
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <[email protected]>
  L:    [email protected]
@@@ -10064,13 -10037,6 +10071,13 @@@ S: Supporte
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
 +XEN BLOCK SUBSYSTEM
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/block/xen-blkback/*
 +F:    drivers/block/xen*
 +
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
index f0422c2a746862095cab8a5a1d794a2cdfbd63be,2674132396e3df388b4dc19ba518543f46ecff84..646a6eade788f0114847bfa254f9bb7fcff272be
  };
  
  &i2c0 {
 -        status = "okay";
 -        pinctrl-names = "default";
 -        pinctrl-0 = <&i2c0_pins>;
 +      status = "okay";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&i2c0_pins>;
 +      clock-frequency = <400000>;
 +
 +      tps65218: tps65218@24 {
 +              reg = <0x24>;
 +              compatible = "ti,tps65218";
 +              interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
 +              interrupt-parent = <&gic>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
 +
 +              dcdc1: regulator-dcdc1 {
 +                      compatible = "ti,tps65218-dcdc1";
 +                      regulator-name = "vdd_core";
 +                      regulator-min-microvolt = <912000>;
 +                      regulator-max-microvolt = <1144000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +
 +              dcdc2: regulator-dcdc2 {
 +                      compatible = "ti,tps65218-dcdc2";
 +                      regulator-name = "vdd_mpu";
 +                      regulator-min-microvolt = <912000>;
 +                      regulator-max-microvolt = <1378000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +
 +              dcdc3: regulator-dcdc3 {
 +                      compatible = "ti,tps65218-dcdc3";
 +                      regulator-name = "vdcdc3";
 +                      regulator-min-microvolt = <1350000>;
 +                      regulator-max-microvolt = <1350000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +              dcdc5: regulator-dcdc5 {
 +                      compatible = "ti,tps65218-dcdc5";
 +                      regulator-name = "v1_0bat";
 +                      regulator-min-microvolt = <1000000>;
 +                      regulator-max-microvolt = <1000000>;
 +              };
 +
 +              dcdc6: regulator-dcdc6 {
 +                      compatible = "ti,tps65218-dcdc6";
 +                      regulator-name = "v1_8bat";
 +                      regulator-min-microvolt = <1800000>;
 +                      regulator-max-microvolt = <1800000>;
 +              };
 +
 +              ldo1: regulator-ldo1 {
 +                      compatible = "ti,tps65218-ldo1";
 +                      regulator-min-microvolt = <1800000>;
 +                      regulator-max-microvolt = <1800000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +      };
  };
  
  &i2c1 {
 -        status = "okay";
 -        pinctrl-names = "default";
 -        pinctrl-0 = <&i2c1_pins>;
 -
 +      status = "okay";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&i2c1_pins>;
        pixcir_ts@5c {
                compatible = "pixcir,pixcir_tangoc";
                pinctrl-names = "default";
  
                attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
  
-               x-size = <1024>;
-               y-size = <600>;
+               touchscreen-size-x = <1024>;
+               touchscreen-size-y = <600>;
        };
  };
  
index f1ee749575128271e82b4b9c06e2ee4caad432da,b742200f7672edd9bd5b45bf3331b224d80f9437..ed7dd23959155598aba377c27d727e8dc481c551
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins>;
 +      clock-frequency = <400000>;
 +
 +      tps65218: tps65218@24 {
 +              reg = <0x24>;
 +              compatible = "ti,tps65218";
 +              interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
 +              interrupt-parent = <&gic>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
 +
 +              dcdc1: regulator-dcdc1 {
 +                      compatible = "ti,tps65218-dcdc1";
 +                      regulator-name = "vdd_core";
 +                      regulator-min-microvolt = <912000>;
 +                      regulator-max-microvolt = <1144000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +
 +              dcdc2: regulator-dcdc2 {
 +                      compatible = "ti,tps65218-dcdc2";
 +                      regulator-name = "vdd_mpu";
 +                      regulator-min-microvolt = <912000>;
 +                      regulator-max-microvolt = <1378000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +
 +              dcdc3: regulator-dcdc3 {
 +                      compatible = "ti,tps65218-dcdc3";
 +                      regulator-name = "vdcdc3";
 +                      regulator-min-microvolt = <1350000>;
 +                      regulator-max-microvolt = <1350000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +
 +              dcdc5: regulator-dcdc5 {
 +                      compatible = "ti,tps65218-dcdc5";
 +                      regulator-name = "v1_0bat";
 +                      regulator-min-microvolt = <1000000>;
 +                      regulator-max-microvolt = <1000000>;
 +              };
 +
 +              dcdc6: regulator-dcdc6 {
 +                      compatible = "ti,tps65218-dcdc6";
 +                      regulator-name = "v1_8bat";
 +                      regulator-min-microvolt = <1800000>;
 +                      regulator-max-microvolt = <1800000>;
 +              };
 +
 +              ldo1: regulator-ldo1 {
 +                      compatible = "ti,tps65218-ldo1";
 +                      regulator-min-microvolt = <1800000>;
 +                      regulator-max-microvolt = <1800000>;
 +                      regulator-boot-on;
 +                      regulator-always-on;
 +              };
 +      };
  
        at24@50 {
                compatible = "at24,24c256";
  
                attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
  
-               x-size = <1024>;
-               y-size = <600>;
+               touchscreen-size-x = <1024>;
+               touchscreen-size-y = <600>;
        };
  };
  
diff --combined drivers/hid/Kconfig
index ec48c823b1571e1f298f195f321c8bd287502198,4ed682cd1236610f6b0c7271e239d2ff7addd22a..c18d5d71062d48828148e128ac3019d06a090e99
@@@ -261,20 -261,6 +261,20 @@@ config HOLTEK_F
          Say Y here if you have a Holtek On Line Grip based game controller
          and want to have force feedback support for it.
  
 +config HID_GT683R
 +      tristate "MSI GT68xR LED support"
 +      depends on LEDS_CLASS && USB_HID
 +      ---help---
 +      Say Y here if you want to enable support for the three MSI GT68xR LEDs
 +
 +      This driver support following modes:
 +        - Normal: LEDs are fully on when enabled
 +        - Audio:  LEDs brightness depends on sound level
 +        - Breathing: LEDs brightness varies at human breathing rate
 +
 +      Currently the following devices are know to be supported:
 +        - MSI GT683R
 +
  config HID_HUION
        tristate "Huion tablets"
        depends on USB_HID
@@@ -345,20 -331,18 +345,20 @@@ config HID_LCPOWE
        ---help---
        Support for LC-Power RC1000MCE RF remote control.
  
 -config HID_LENOVO_TPKBD
 -      tristate "Lenovo ThinkPad USB Keyboard with TrackPoint"
 +config HID_LENOVO
 +      tristate "Lenovo / Thinkpad devices"
        depends on HID
        select NEW_LEDS
        select LEDS_CLASS
        ---help---
 -      Support for the Lenovo ThinkPad USB Keyboard with TrackPoint.
 +      Support for Lenovo devices that are not fully compliant with HID standard.
  
 -      Say Y here if you have a Lenovo ThinkPad USB Keyboard with TrackPoint
 -      and would like to use device-specific features like changing the
 -      sensitivity of the trackpoint, using the microphone mute button or
 -      controlling the mute and microphone mute LEDs.
 +      Say Y if you want support for the non-compliant features of the Lenovo
 +      Thinkpad standalone keyboards, e.g:
 +      - ThinkPad USB Keyboard with TrackPoint (supports extra LEDs and trackpoint
 +        configuration)
 +      - ThinkPad Compact Bluetooth Keyboard with TrackPoint (supports Fn keys)
 +      - ThinkPad Compact USB Keyboard with TrackPoint (supports Fn keys)
  
  config HID_LOGITECH
        tristate "Logitech devices" if EXPERT
@@@ -764,12 -748,17 +764,17 @@@ config THRUSTMASTER_F
          Rumble Force or Force Feedback Wheel.
  
  config HID_WACOM
-       tristate "Wacom Bluetooth devices support"
+       tristate "Wacom Intuos/Graphire tablet support (USB)"
        depends on HID
-       depends on LEDS_CLASS
        select POWER_SUPPLY
-       ---help---
-       Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.
+       select NEW_LEDS
+       select LEDS_CLASS
+       help
+         Say Y here if you want to use the USB or BT version of the Wacom Intuos
+         or Graphire tablet.
+         To compile this driver as a module, choose M here: the
+         module will be called wacom.
  
  config HID_WIIMOTE
        tristate "Nintendo Wii / Wii U peripherals"
@@@ -801,7 -790,7 +806,7 @@@ config HID_XINM
        depends on HID
        ---help---
        Support for Xin-Mo devices that are not fully compliant with the HID
 -      standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
 +      standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
        if you have a Xin-Mo Dual Arcade controller.
  
  config HID_ZEROPLUS
diff --combined drivers/hid/Makefile
index a69f0adb5c76ad8789884cb151d3f7315b26ea94,e38c772ace7611baae42015eef0c9c3d2feec231..4dbac7f8530c3b072ba9b5f43f9059f2cfbb962c
@@@ -48,7 -48,6 +48,7 @@@ obj-$(CONFIG_HID_EMS_FF)      += hid-emsff.
  obj-$(CONFIG_HID_ELECOM)      += hid-elecom.o
  obj-$(CONFIG_HID_ELO)         += hid-elo.o
  obj-$(CONFIG_HID_EZKEY)               += hid-ezkey.o
 +obj-$(CONFIG_HID_GT683R)      += hid-gt683r.o
  obj-$(CONFIG_HID_GYRATION)    += hid-gyration.o
  obj-$(CONFIG_HID_HOLTEK)      += hid-holtek-kbd.o
  obj-$(CONFIG_HID_HOLTEK)      += hid-holtek-mouse.o
@@@ -60,7 -59,7 +60,7 @@@ obj-$(CONFIG_HID_KENSINGTON)  += hid-ken
  obj-$(CONFIG_HID_KEYTOUCH)    += hid-keytouch.o
  obj-$(CONFIG_HID_KYE)         += hid-kye.o
  obj-$(CONFIG_HID_LCPOWER)       += hid-lcpower.o
 -obj-$(CONFIG_HID_LENOVO_TPKBD)        += hid-lenovo-tpkbd.o
 +obj-$(CONFIG_HID_LENOVO)      += hid-lenovo.o
  obj-$(CONFIG_HID_LOGITECH)    += hid-logitech.o
  obj-$(CONFIG_HID_LOGITECH_DJ) += hid-logitech-dj.o
  obj-$(CONFIG_HID_MAGICMOUSE)    += hid-magicmouse.o
@@@ -116,7 -115,9 +116,9 @@@ obj-$(CONFIG_HID_UCLOGIC)  += hid-uclogi
  obj-$(CONFIG_HID_XINMO)               += hid-xinmo.o
  obj-$(CONFIG_HID_ZEROPLUS)    += hid-zpff.o
  obj-$(CONFIG_HID_ZYDACRON)    += hid-zydacron.o
- obj-$(CONFIG_HID_WACOM)               += hid-wacom.o
+ wacom-objs                    := wacom_wac.o wacom_sys.o
+ obj-$(CONFIG_HID_WACOM)               += wacom.o
  obj-$(CONFIG_HID_WALTOP)      += hid-waltop.o
  obj-$(CONFIG_HID_WIIMOTE)     += hid-wiimote.o
  obj-$(CONFIG_HID_SENSOR_HUB)  += hid-sensor-hub.o
diff --combined drivers/hid/hid-core.c
index b52baa120ffa88a41a93ee5f89daa4dcf9c2bf92,b3181ea8f86020adf7a91dec543f82407f27fea9..12b6e67d9de0861d3599ceac272544d266ba1660
@@@ -783,12 -783,19 +783,21 @@@ static int hid_scan_report(struct hid_d
        * Vendor specific handlings
        */
        if ((hid->vendor == USB_VENDOR_ID_SYNAPTICS) &&
 -          (hid->group == HID_GROUP_GENERIC))
 +          (hid->group == HID_GROUP_GENERIC) &&
 +          /* only bind to the mouse interface of composite USB devices */
 +          (hid->bus != BUS_USB || hid->type == HID_TYPE_USBMOUSE))
                /* hid-rmi should take care of them, not hid-generic */
                hid->group = HID_GROUP_RMI;
  
+       /*
+        * Vendor specific handlings
+        */
+       switch (hid->vendor) {
+       case USB_VENDOR_ID_WACOM:
+               hid->group = HID_GROUP_WACOM;
+               break;
+       }
        vfree(parser);
        return 0;
  }
@@@ -1784,7 -1791,7 +1793,7 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
 -      { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },
 -#if IS_ENABLED(CONFIG_HID_LENOVO_TPKBD)
 +#if IS_ENABLED(CONFIG_HID_LENOVO)
        { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CUSBKBD) },
 +      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) },
  #endif
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO) },
-       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
-       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_Q_PAD) },
@@@ -2271,7 -2273,6 +2278,7 @@@ static const struct hid_device_id hid_i
        { HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_SPEAK_410) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_SPEAK_510) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_GN9350E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },
        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_WACOM, HID_ANY_ID) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
diff --combined include/linux/hid.h
index fca74f1d5c84d28533321c4ad8f1e2379a9f9d96,07fa80671db0170e4d6658bb5d0386ab6567899a..f53c4a9cca1d74568afceedf7a6393b4a7491557
@@@ -167,7 -167,6 +167,7 @@@ struct hid_item 
  #define HID_UP_MSVENDOR               0xff000000
  #define HID_UP_CUSTOM         0x00ff0000
  #define HID_UP_LOGIVENDOR     0xffbc0000
 +#define HID_UP_LNVENDOR               0xffa00000
  #define HID_UP_SENSOR         0x00200000
  
  #define HID_USAGE             0x0000ffff
   */
  #define HID_GROUP_RMI                         0x0100
  
+ /*
+  * Vendor specific HID device groups
+  */
+ #define HID_GROUP_WACOM                               0x0101
  /*
   * This is the global environment of the parser. This information is
   * persistent for main-items. The global environment can be saved and
This page took 0.248119 seconds and 4 git commands to generate.