]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9076b09 074b6a8)
Merge tag 'iio-for-3.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...
authorGreg Kroah-Hartman <[email protected]>
Sun, 22 Sep 2013 18:30:12 +0000 (11:30 -0700)
committerGreg Kroah-Hartman <[email protected]>
Sun, 22 Sep 2013 18:30:12 +0000 (11:30 -0700)
Jonathan writes:

First round of new drivers, functionality and cleanups for IIO in the 3.13 cycle

A number of new drivers and some new functionality + a lot of cleanups
all over IIO.

New Core Elements

1) New INT_TIME info_mask element for integration time, which may have
   different effects on measurement noise and similar, than an amplifier
   and hence is different from existing SCALE.  Already existed in some
   drivers as a custom attribute.

2) Introduce a iio_push_buffers_with_timestamp helper to cover the common
   case of filling the last 64 bits of data to be passed to the buffer with
   a timestamp.  Applied to lots of drivers. Cuts down on repeated code and
   moves a slightly fiddly bit of logic into a single location.

3) Introduce info_mask_[shared_by_dir/shared_by_all] elements to allow support
   of elements such as sampling_frequency which is typically shared by all
   input channels on a device.  This reduces code and makes these controls
   available from in kernel consumers of IIO devices.

New drivers

1) MCP3422/3/4 ADC

2) TSL4531 ambient light sensor

3) TCS3472/5 color light sensor

4) GP2AP020A00F ambient light / proximity sensor

5) LPS001WP support added to ST pressure sensor driver.

New driver functionality

1) ti_am335x_adc Add buffered sampling support.
   This device has a hardware fifo that is fed directly into an IIO kfifo
   buffer based on a watershed interrupt.  Note this will act as an example
   of how to handle this increasingly common type of device.
   The only previous example - sca3000 - take a less than optimal approach
   which is largely why it is still in staging.
   A couple of little cleanups for that new functionality followed later.

Core cleanups:

1) MAINTAINERS - Sachin actually brought my email address up to date because
   I said I'd do it and never got around to it :)

2) Assign buffer list elements as single element lists to simplify the
   iio_buffer_is_active logic.

3) wake_up_interruptible_poll instead of wake_up_interruptible to only wake
   up threads waiting for poll notifications.

4) Add O_CLOEXEC flag to anon_inode_get_fd call for IIO event interface.

5) Change iio_push_to_buffers to take a void * pointer so as to avoid some
   annoying and unnecessary type casts.

6) iio_compute_scan_bytes incorrectly took a long rather than unsigned long.

7) Various minor tidy ups.

Driver cleanups (in no particular order)

1) Another set of devm_ allocations patches from Sachin Kamat.

2) tsl2x7x - 0 to NULL cleanup.

3) hmc5843 - fix missing > in MODULE_AUTHOR

4) Set of strict_strto* to kstrto* conversions.

5) mxs-lradc - fix ordering of resource removal to match creation

6) mxs-lradc - add MODULE_ALIAS

7) adc7606 - drop a work pending test duplicated in core functions.

8) hmc5843 - devm_ allocation patch

9) Series of redundant breaks removed.

10) ad2s1200 - pr_err -> dev_err

11) adjd_s311 - use INT_TIME

12)  ST sensors - large set of cleanups from Lee Jones and removed restriction
    to using only triggers provided by the st_sensors themselves from
    Dennis Ciocca.

13) dummy and tmp006 provide sampling_frequency via info_mask_shared_by_all.

14) tcs3472 - fix incorrect buffer size and wrong device pointer used in
    suspend / resume functions.

15) max1363 - use defaults for buffer setup ops as provided by the triggered
    buffer helpers as they are the same as were specified in max1363 driver.

16) Trivial tidy ups in a number of other drivers.

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/iio/light/adjd_s311.c patch | diff1 | diff2 | blob | history
include/linux/mfd/ti_am335x_tscadc.h patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index e61c2e83fc2b3b1f7570cff0cc6dc12d87aa8059,7f51a345ed8ec755e8cdd2616d8bf650dab30076..e8ee569fdce5b77eef43d131bbf468706bee9e61
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -580,24 -580,12 +580,24 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7511 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7511*
 +
  ANALOG DEVICES INC ADV7604 DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
  
 +ANALOG DEVICES INC ADV7842 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7842*
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  L:    [email protected]
@@@ -607,7 -595,6 +607,7 @@@ S: Supporte
  F:    sound/soc/codecs/adau*
  F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
 +F:    sound/soc/codecs/ad7*
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
@@@ -651,12 -638,6 +651,12 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APTINA CAMERA SENSOR PLL
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/aptina-pll.*
 +
  ARASAN COMPACT FLASH PATA CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -832,7 -813,7 +832,7 @@@ F: arch/arm/mach-prima2
  F:    drivers/dma/sirf-dma.c
  F:    drivers/i2c/busses/i2c-sirf.c
  F:    drivers/mmc/host/sdhci-sirf.c
 -F:    drivers/pinctrl/pinctrl-sirf.c
 +F:    drivers/pinctrl/sirf/
  F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -933,24 -914,24 +933,24 @@@ F:      arch/arm/mach-pxa/colibri-pxa270-inc
  
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -975,7 -956,7 +975,7 @@@ F: drivers/pcmcia/pxa2xx_stargate2.
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1028,7 -1009,7 +1028,7 @@@ F:      arch/arm/mach-orion5x/ts78xx-
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -F:    arch/arm/mach-ks8695
 +F:    arch/arm/mach-ks8695/
  S:    Odd Fixes
  
  ARM/MIOA701 MACHINE SUPPORT
@@@ -1048,6 -1029,7 +1048,6 @@@ M:      STEricsson <STEricsson_nomadik_linux
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
 -F:    arch/arm/plat-nomadik/
  F:    drivers/i2c/busses/i2c-nomadik.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
@@@ -1069,7 -1051,7 +1069,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/ssbi/
 +F:    drivers/mfd/ssbi/
  F:    include/linux/mfd/pm8xxx/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
  S:    Maintained
@@@ -1155,6 -1137,7 +1155,6 @@@ L:      [email protected] (m
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/plat-samsung/
 -F:    arch/arm/plat-s3c24xx/
  F:    arch/arm/mach-s3c24*/
  F:    arch/arm/mach-s3c64xx/
  F:    drivers/*/*s3c2410*
@@@ -1177,6 -1160,8 +1177,6 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/mach-s5pv210/mach-aquila.c
  F:    arch/arm/mach-s5pv210/mach-goni.c
 -F:    arch/arm/mach-exynos/mach-universal_c210.c
 -F:    arch/arm/mach-exynos/mach-nuri.c
  
  ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
  M:    Kyungmin Park <[email protected]>
@@@ -1316,12 -1301,13 +1316,12 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/vt8500_timer.c
 -F:    drivers/gpio/gpio-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
  F:    drivers/rtc/rtc-vt8500.c
  F:    drivers/tty/serial/vt8500_serial.c
 -F:    drivers/usb/host/ehci-vt8500.c
 +F:    drivers/usb/host/ehci-platform.c
  F:    drivers/usb/host/uhci-platform.c
  F:    drivers/video/vt8500lcdfb.*
  F:    drivers/video/wm8505fb*
@@@ -1382,7 -1368,7 +1382,7 @@@ F:      drivers/platform/x86/asus*.
  F:    drivers/platform/x86/eeepc*.c
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  W:    http://sourceforge.net/projects/xscaleiop
  S:    Maintained
  F:    Documentation/crypto/async-tx-api.txt
@@@ -1561,13 -1547,6 +1561,13 @@@ W:    http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel*
  
 +ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 +M:      Bradley Grove <[email protected]>
 +L:      [email protected]
 +W:      http://www.attotech.com
 +S:      Supported
 +F:      drivers/scsi/esas2r
 +
  AUDIT SUBSYSTEM
  M:    Al Viro <[email protected]>
  M:    Eric Paris <[email protected]>
@@@ -1811,17 -1790,6 +1811,17 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
  
 +BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
 +M:    Christian Daudt <[email protected]>
 +T:    git git://git.github.com/broadcom/bcm11351
 +S:    Maintained
 +F:    arch/arm/mach-bcm/
 +F:    arch/arm/boot/dts/bcm113*
 +F:    arch/arm/boot/dts/bcm281*
 +F:    arch/arm/configs/bcm_defconfig
 +F:    drivers/mmc/host/sdhci_bcm_kona.c
 +F:    drivers/clocksource/bcm_kona_timer.c
 +
  BROADCOM BCM2835 ARM ARCHICTURE
  M:    Stephen Warren <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1855,12 -1823,6 +1855,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
 +BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 +M:    Eddie Wai <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/bnx2i/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
@@@ -2042,10 -2004,10 +2042,10 @@@ W:   http://ceph.com
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
  S:    Supported
  F:    Documentation/filesystems/ceph.txt
 -F:    fs/ceph
 -F:    net/ceph
 -F:    include/linux/ceph
 -F:    include/linux/crush
 +F:    fs/ceph/
 +F:    net/ceph/
 +F:    include/linux/ceph/
 +F:    include/linux/crush/
  
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
  L:    [email protected]
@@@ -2114,8 -2076,7 +2114,8 @@@ F:      drivers/usb/chipidea
  
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
 -M:    Roopa Prabhu <[email protected]>
 +M:    Sujith Sankar <[email protected]>
 +M:    Govindarajulu Varadarajan <[email protected]>
  M:    Neel Patel <[email protected]>
  M:    Nishank Trivedi <[email protected]>
  S:    Supported
@@@ -2151,13 -2112,6 +2151,13 @@@ M:    Russell King <[email protected]
  S:    Maintained
  F:    include/linux/clk.h
  
 +CLOCKSOURCE, CLOCKEVENT DRIVERS
 +M:    Daniel Lezcano <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +S:    Supported
 +F:    drivers/clocksource
 +
  CISCO FCOE HBA DRIVER
  M:    Hiral Patel <[email protected]>
  M:    Suma Ramars <[email protected]>
@@@ -2314,15 -2268,6 +2314,15 @@@ F:    drivers/cpufreq/arm_big_little.
  F:    drivers/cpufreq/arm_big_little.c
  F:    drivers/cpufreq/arm_big_little_dt.c
  
 +CPUIDLE DRIVER - ARM BIG LITTLE
 +M:      Lorenzo Pieralisi <[email protected]>
 +M:      Daniel Lezcano <[email protected]>
 +L:      [email protected]
 +L:      [email protected]
 +T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +S:      Maintained
 +F:      drivers/cpuidle/cpuidle-big_little.c
 +
  CPUIDLE DRIVERS
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
@@@ -2342,7 -2287,7 +2342,7 @@@ CPU POWER MONITORING SUBSYSTE
  M:    Dominik Brodowski <[email protected]>
  M:    Thomas Renninger <[email protected]>
  S:    Maintained
 -F:    tools/power/cpupower
 +F:    tools/power/cpupower/
  
  CPUSETS
  M:    Li Zefan <[email protected]>
@@@ -2509,9 -2454,9 +2509,9 @@@ S:      Maintaine
  F:    drivers/media/common/cypress_firmware*
  
  CYTTSP TOUCHSCREEN DRIVER
 -M:    Javier Martinez Canillas <[email protected]>
 +M:    Ferruh Yigit <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
@@@ -2698,7 -2643,7 +2698,7 @@@ T:      git git://git.linaro.org/people/sumi
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  S:    Supported
  F:    drivers/dma/
  F:    include/linux/dma*
@@@ -2780,7 -2725,7 +2780,7 @@@ L:      [email protected]
  L:    [email protected]
  T:    git git://people.freedesktop.org/~danvet/drm-intel
  S:    Supported
 -F:    drivers/gpu/drm/i915
 +F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
  F:    include/uapi/drm/i915*
  
@@@ -2792,7 -2737,7 +2792,7 @@@ M:      Kyungmin Park <kyungmin.park@samsung
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
  S:    Supported
 -F:    drivers/gpu/drm/exynos
 +F:    drivers/gpu/drm/exynos/
  F:    include/drm/exynos*
  F:    include/uapi/drm/exynos*
  
@@@ -3045,7 -2990,7 +3045,7 @@@ M:      Mauro Carvalho Chehab <m.chehab@sams
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
 -F:    drivers/edac/ghes-edac.c
 +F:    drivers/edac/ghes_edac.c
  
  EDAC-I82443BXGX
  M:    Tim Small <[email protected]>
@@@ -3651,8 -3596,8 +3651,8 @@@ M:      Arnd Bergmann <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
  S:    Maintained
 -F:    include/asm-generic
 -F:    include/uapi/asm-generic
 +F:    include/asm-generic/
 +F:    include/uapi/asm-generic/
  
  GENERIC UIO DRIVER FOR PCI DEVICES
  M:    "Michael S. Tsirkin" <[email protected]>
@@@ -3694,8 -3639,7 +3694,8 @@@ GRE DEMULTIPLEXER DRIVE
  M:    Dmitry Kozlov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    net/ipv4/gre.c
 +F:    net/ipv4/gre_demux.c
 +F:    net/ipv4/gre_offload.c
  F:    include/net/gre.h
  
  GRETH 10/100/1G Ethernet MAC device driver
@@@ -3773,7 -3717,7 +3773,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
  S:    Odd Fixes
 -F:    drivers/media/usb/hdpvr
 +F:    drivers/media/usb/hdpvr/
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Andi Kleen <[email protected]>
@@@ -4157,13 -4101,6 +4157,13 @@@ W:    http://launchpad.net/ideapad-lapto
  S:    Maintained
  F:    drivers/platform/x86/ideapad-laptop.c
  
 +IDEAPAD LAPTOP SLIDEBAR DRIVER
 +M:    Andrey Moiseev <[email protected]>
 +L:    [email protected]
 +W:    https://github.com/o2genum/ideapad-slidebar
 +S:    Maintained
 +F:    drivers/input/misc/ideapad_slidebar.c
 +
  IDE/ATAPI DRIVERS
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
@@@ -4195,7 -4132,7 +4195,7 @@@ S:      Maintaine
  F:    drivers/media/rc/iguanair.c
  
  IIO SUBSYSTEM AND DRIVERS
- M:    Jonathan Cameron <jic23@cam.ac.uk>
+ M:    Jonathan Cameron <jic23@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/
@@@ -4331,7 -4268,7 +4331,7 @@@ F:      arch/x86/kernel/microcode_core.
  F:    arch/x86/kernel/microcode_intel.c
  
  INTEL I/OAT DMA DRIVER
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  S:    Maintained
  F:    drivers/dma/ioat*
  
@@@ -4344,7 -4281,7 +4344,7 @@@ F:      drivers/iommu/intel-iommu.
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
 -M:    Dan Williams <djbw@fb.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
@@@ -4363,7 -4300,7 +4363,7 @@@ M:      Deepak Saxena <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
 +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e)
  M:    Jeff Kirsher <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
  M:    Bruce Allan <[email protected]>
@@@ -4388,7 -4325,6 +4388,7 @@@ F:      Documentation/networking/igbvf.tx
  F:    Documentation/networking/ixgb.txt
  F:    Documentation/networking/ixgbe.txt
  F:    Documentation/networking/ixgbevf.txt
 +F:    Documentation/networking/i40e.txt
  F:    drivers/net/ethernet/intel/
  
  INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
@@@ -4429,7 -4365,7 +4429,7 @@@ F:      drivers/net/wireless/iwlegacy
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <[email protected]>
 -M:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
 +M:    Emmanuel Grumbach <emmanuel.grumbach@intel.com>
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
  W:    http://intellinuxwireless.org
@@@ -4582,7 -4518,7 +4582,7 @@@ S:      Supporte
  W:    http://www.openfabrics.org
  W:    www.open-iscsi.org
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -F:    drivers/infiniband/ulp/iser
 +F:    drivers/infiniband/ulp/iser/
  
  ISDN SUBSYSTEM
  M:    Karsten Keil <[email protected]>
@@@ -4636,7 -4572,7 +4636,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/media/tuners/it913x*
 +F:    drivers/media/tuners/tuner_it913x*
  
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
@@@ -5460,7 -5396,6 +5460,7 @@@ F:      drivers/watchdog/mena21_wdt.
  
  METAG ARCHITECTURE
  M:    James Hogan <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    arch/metag/
  F:    Documentation/metag/
@@@ -5562,7 -5497,7 +5562,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 -MT9M032 SENSOR DRIVER
 +MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5570,7 -5505,7 +5570,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9m032.c
  F:    include/media/mt9m032.h
  
 -MT9P031 SENSOR DRIVER
 +MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5578,7 -5513,7 +5578,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/mt9p031.h
  
 -MT9T001 SENSOR DRIVER
 +MT9T001 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5586,7 -5521,7 +5586,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/mt9t001.h
  
 -MT9V032 SENSOR DRIVER
 +MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5646,9 -5581,9 +5646,9 @@@ S:      Maintaine
  F:    drivers/media/tuners/mxl5007t.*
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 -M:    Andrew Gallatin <gallatin@myri.com>
 +M:    Hyong-Youb Kim <hykim@myri.com>
  L:    [email protected]
 -W:    http://www.myri.com/scs/download-Myri10GE.html
 +W:    https://www.myricom.com/support/downloads/myri10ge.html
  S:    Supported
  F:    drivers/net/ethernet/myricom/myri10ge/
  
@@@ -5857,7 -5792,7 +5857,7 @@@ M:      Aloisio Almeida Jr <aloisio.almeida@
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    net/nfc/
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
@@@ -5908,8 -5843,6 +5908,8 @@@ F:      drivers/scsi/nsp32
  NTB DRIVER
  M:    Jon Mason <[email protected]>
  S:    Supported
 +W:    https://github.com/jonmason/ntb/wiki
 +T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/
  F:    drivers/net/ntb_netdev.c
  F:    include/linux/ntb.h
@@@ -5951,7 -5884,7 +5951,7 @@@ F:      drivers/i2c/busses/i2c-omap.
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5972,12 -5905,15 +5972,12 @@@ S:   Maintaine
  F:    arch/arm/*omap*/*pm*
  F:    drivers/cpufreq/omap-cpufreq.c
  
 -OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
 +OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
  M:    Rajendra Nayak <[email protected]>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
 -F:    arch/arm/mach-omap2/powerdomain44xx.c
 -F:    arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
 -F:    arch/arm/mach-omap2/clockdomain44xx.c
 +F:    arch/arm/mach-omap2/prm*
  
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <[email protected]>
@@@ -6028,14 -5964,14 +6028,14 @@@ S:   Maintaine
  F:    drivers/char/hw_random/omap-rng.c
  
  OMAP HWMOD SUPPORT
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
  OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -6130,7 -6066,7 +6130,7 @@@ M:      Rob Herring <[email protected]
  M:    Pawel Moll <[email protected]>
  M:    Mark Rutland <[email protected]>
  M:    Stephen Warren <[email protected]>
 -M:    Ian Campbell <i[email protected]>
 +M:    Ian Campbell <i[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/
@@@ -6143,7 -6079,7 +6143,7 @@@ W:      http://openrisc.ne
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://openrisc.net/~jonas/linux
 -F:    arch/openrisc
 +F:    arch/openrisc/
  
  OPENVSWITCH
  M:    Jesse Gross <[email protected]>
@@@ -6339,13 -6275,6 +6339,13 @@@ F:    Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  
 +PCI DRIVER FOR NVIDIA TEGRA
 +M:    Thierry Reding <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 +F:    drivers/pci/host/pci-tegra.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -6434,7 -6363,7 +6434,7 @@@ 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/mach-picoxcell
 +F:    arch/arm/mach-picoxcell/
  F:    drivers/*/picoxcell*
  F:    drivers/*/*/picoxcell*
  
@@@ -6707,7 -6636,7 +6707,7 @@@ F:      drivers/spi/spi-pxa2xx
  F:    drivers/usb/gadget/pxa2*
  F:    include/sound/pxa2xx-lib.h
  F:    sound/arm/pxa*
 -F:    sound/soc/pxa
 +F:    sound/soc/pxa/
  
  MMP SUPPORT
  M:    Eric Miao <[email protected]>
@@@ -6747,11 -6676,11 +6747,11 @@@ F:   Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    Ravi Anand <[email protected]>
  M:    Vikas Chaudhary <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
@@@ -6992,14 -6921,6 +6992,14 @@@ M:    Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/memstick/host/r592.*
  
 +ROCCAT DRIVERS
 +M:    Stefan Achatz <[email protected]>
 +W:    http://sourceforge.net/projects/roccat/
 +S:    Maintained
 +F:    drivers/hid/hid-roccat*
 +F:    include/linux/hid-roccat*
 +F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
 +
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -7160,7 -7081,7 +7160,7 @@@ SAMSUNG AUDIO (ASoC) DRIVER
  M:    Sangbeom Kim <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    sound/soc/samsung
 +F:    sound/soc/samsung/
  
  SAMSUNG FRAMEBUFFER DRIVER
  M:    Jingoo Han <[email protected]>
@@@ -7206,11 -7127,10 +7206,11 @@@ SERIAL DRIVER
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/tty/serial
 +F:    drivers/tty/serial/
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:    Viresh Kumar <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
  S:    Maintained
  F:    include/linux/dw_dmac.h
  F:    drivers/dma/dw/
@@@ -7223,7 -7143,7 +7223,7 @@@ S:      Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 -TIMEKEEPING, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -7236,12 -7156,13 +7236,12 @@@ F:   include/uapi/linux/timex.
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 -F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <[email protected]>
  M:    Hans Verkuil <[email protected]>
  S:    Odd Fixes
 -F:    drivers/media/usb/tlg2300
 +F:    drivers/media/usb/tlg2300/
  
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <[email protected]>
@@@ -7315,7 -7236,6 +7315,7 @@@ W:      http://lksctp.sourceforge.ne
  S:    Maintained
  F:    Documentation/networking/sctp.txt
  F:    include/linux/sctp.h
 +F:    include/uapi/linux/sctp.h
  F:    include/net/sctp/
  F:    net/sctp/
  
@@@ -7446,6 -7366,7 +7446,6 @@@ F:      drivers/net/ethernet/sfc
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
 -M:    Robin Holt <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
@@@ -7465,8 -7386,7 +7465,8 @@@ S:      Maintained for 2.6
  F:    Documentation/sgi-visws.txt
  
  SGI XP/XPC/XPNET DRIVER
 -M:    Robin Holt <[email protected]>
 +M:    Cliff Whickman <[email protected]>
 +M:    Robin Holt <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
@@@ -7502,7 -7422,7 +7502,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
  S:    Odd Fixes
 -F:    drivers/media/radio/radio-si4713.h
 +F:    drivers/media/radio/radio-si4713.c
  
  SIANO DVB DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -7511,9 -7431,9 +7511,9 @@@ W:      http://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/common/siano/
 -F:    drivers/media/dvb/siano/
  F:    drivers/media/usb/siano/
 -F:    drivers/media/mmc/siano
 +F:    drivers/media/usb/siano/
 +F:    drivers/media/mmc/siano/
  
  SH_VEU V4L2 MEM2MEM DRIVER
  M:    Guennadi Liakhovetski <[email protected]>
@@@ -7551,9 -7471,9 +7551,9 @@@ P:      Vincent Sanders <[email protected]
  M:    Simtec Linux Team <[email protected]>
  W:    http://www.simtec.co.uk/products/EB2410ITX/
  S:    Supported
 -F:    arch/arm/mach-s3c2410/mach-bast.c
 -F:    arch/arm/mach-s3c2410/bast-ide.c
 -F:    arch/arm/mach-s3c2410/bast-irq.c
 +F:    arch/arm/mach-s3c24xx/mach-bast.c
 +F:    arch/arm/mach-s3c24xx/bast-ide.c
 +F:    arch/arm/mach-s3c24xx/bast-irq.c
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <[email protected]>
@@@ -7562,7 -7482,7 +7562,7 @@@ L:      [email protected]
  T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
 -F:    arch/arm/mach-davinci
 +F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
  
  TI DAVINCI SERIES MEDIA DRIVER
@@@ -7630,14 -7550,6 +7630,14 @@@ S:    Maintaine
  F:    Documentation/security/Smack.txt
  F:    security/smack/
  
 +SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 +M:    Kevin Hilman <[email protected]>
 +M:    Nishanth Menon <[email protected]>
 +S:    Maintained
 +F:    drivers/power/avs/smartreflex.c
 +F:    include/linux/power/smartreflex.h
 +L:    [email protected]
 +
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <[email protected]>
  S:    Odd Fixes
@@@ -7647,7 -7559,7 +7647,7 @@@ SMIA AND SMIA++ IMAGE SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/i2c/smiapp
 +F:    drivers/media/i2c/smiapp/
  F:    include/media/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
@@@ -7750,11 -7662,6 +7750,11 @@@ W:    http://tifmxx.berlios.de
  S:    Maintained
  F:    drivers/memstick/host/tifm_ms.c
  
 +SONY MEMORYSTICK STANDARD SUPPORT
 +M:    Maxim Levitsky <[email protected]>
 +S:    Maintained
 +F:    drivers/memstick/core/ms_block.*
 +
  SOUND
  M:    Jaroslav Kysela <[email protected]>
  M:    Takashi Iwai <[email protected]>
@@@ -7768,17 -7675,6 +7768,17 @@@ F:    include/sound
  F:    include/uapi/sound/
  F:    sound/
  
 +SOUND - COMPRESSED AUDIO
 +M:    Vinod Koul <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 +S:    Supported
 +F:    Documentation/sound/alsa/compress_offload.txt
 +F:    include/sound/compress_driver.h
 +F:    include/uapi/sound/compress_*
 +F:    sound/core/compress_offload.c
 +F:    sound/soc/soc-compress.c
 +
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -7786,7 -7682,6 +7786,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  L:    [email protected] (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
 +F:    Documentation/sound/alsa/soc/
  F:    sound/soc/
  F:    include/sound/soc*
  
@@@ -7831,7 -7726,35 +7831,7 @@@ L:     [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
 -F:    arch/arm/plat-spear/
 -
 -SPEAR13XX MACHINE SUPPORT
 -M:    Viresh Kumar <[email protected]>
 -M:    Shiraz Hashim <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.st.com/spear
 -S:    Maintained
 -F:    arch/arm/mach-spear13xx/
 -
 -SPEAR3XX MACHINE SUPPORT
 -M:    Viresh Kumar <[email protected]>
 -M:    Shiraz Hashim <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.st.com/spear
 -S:    Maintained
 -F:    arch/arm/mach-spear3xx/
 -
 -SPEAR6XX MACHINE SUPPORT
 -M:    Rajeev Kumar <[email protected]>
 -M:    Shiraz Hashim <[email protected]>
 -M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.st.com/spear
 -S:    Maintained
 -F:    arch/arm/mach-spear6xx/
 +F:    arch/arm/mach-spear/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
  M:    Viresh Kumar <[email protected]>
@@@ -7947,7 -7870,7 +7947,7 @@@ S:      Maintaine
  F:    drivers/staging/media/go7007/
  
  STAGING - INDUSTRIAL IO
- M:    Jonathan Cameron <jic23@cam.ac.uk>
+ M:    Jonathan Cameron <jic23@kernel.org>
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/staging/iio/
@@@ -8049,12 -7972,6 +8049,12 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUNDANCE NETWORK DRIVER
 +M:    Denis Kirjanov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/dlink/sundance.c
 +
  SUPERH
  M:    Paul Mundt <[email protected]>
  L:    [email protected]
@@@ -8100,7 -8017,7 +8100,7 @@@ M:      Vineet Gupta <[email protected]
  S:    Supported
  F:    arch/arc/
  F:    Documentation/devicetree/bindings/arc/
 -F:    drivers/tty/serial/arc-uart.c
 +F:    drivers/tty/serial/arc_uart.c
  
  SYSV FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
@@@ -8390,14 -8307,9 +8390,14 @@@ M:    Chris Metcalf <[email protected]
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/net/ethernet/tile/
 +F:    drivers/char/tile-srom.c
  F:    drivers/edac/tile_edac.c
 +F:    drivers/net/ethernet/tile/
 +F:    drivers/rtc/rtc-tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
 +F:    drivers/tty/serial/tilegx.c
 +F:    drivers/usb/host/*-tilegx.c
 +F:    include/linux/usb/tilegx.h
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <[email protected]>
@@@ -8790,6 -8702,7 +8790,6 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/phy/
 -F:    drivers/usb/otg/
  
  USB PRINTER DRIVER (usblp)
  M:    Pete Zaitcev <[email protected]>
@@@ -8890,6 -8803,7 +8890,6 @@@ W:      http://www.linux-usb.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
 -F:    drivers/net/usb/
  F:    drivers/usb/
  F:    include/linux/usb.h
  F:    include/linux/usb/
@@@ -9112,12 -9026,6 +9112,12 @@@ F:    drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 +VMWARE HYPERVISOR INTERFACE
 +M:    Alok Kataria <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/kernel/cpu/vmware.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <[email protected]>
  M:    "VMware, Inc." <[email protected]>
@@@ -9320,7 -9228,7 +9320,7 @@@ M:      Matthew Garrett <matthew.garrett@neb
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
  S:    Maintained
 -F:    drivers/platform/x86
 +F:    drivers/platform/x86/
  
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <[email protected]>
@@@ -9339,9 -9247,9 +9339,9 @@@ F:      drivers/media/tuners/tuner-xc2028.
  
  XEN HYPERVISOR INTERFACE
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -M:    Jeremy Fitzhardinge <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 +M:    Boris Ostrovsky <[email protected]>
 +M:    David Vrabel <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9352,35 -9260,35 +9352,35 @@@ F:   include/uapi/xen
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
  XEN HYPERVISOR ARM64
  M:    Stefano Stabellini <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
diff --combined drivers/iio/light/adjd_s311.c
index 23cff798598aad0cf0f3078de05804d6a07541b5,39f639241e815e77f1c7cd2f1b9c9fe99e898b52..83d15c5baf646cd61de0ecf4b87fa054b1df0f49
--- 1/drivers/iio/light/adjd_s311.c
--- 2/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@@ -114,43 -114,6 +114,6 @@@ static int adjd_s311_read_data(struct i
        return 0;
  }
  
- static ssize_t adjd_s311_read_int_time(struct iio_dev *indio_dev,
-       uintptr_t private, const struct iio_chan_spec *chan, char *buf)
- {
-       struct adjd_s311_data *data = iio_priv(indio_dev);
-       s32 ret;
- 
-       ret = i2c_smbus_read_word_data(data->client,
-               ADJD_S311_INT_REG(chan->address));
-       if (ret < 0)
-               return ret;
- 
-       return sprintf(buf, "%d\n", ret & ADJD_S311_INT_MASK);
- }
- 
- static ssize_t adjd_s311_write_int_time(struct iio_dev *indio_dev,
-        uintptr_t private, const struct iio_chan_spec *chan, const char *buf,
-        size_t len)
- {
-       struct adjd_s311_data *data = iio_priv(indio_dev);
-       unsigned long int_time;
-       int ret;
- 
-       ret = kstrtoul(buf, 10, &int_time);
-       if (ret)
-               return ret;
- 
-       if (int_time > ADJD_S311_INT_MASK)
-               return -EINVAL;
- 
-       ret = i2c_smbus_write_word_data(data->client,
-               ADJD_S311_INT_REG(chan->address), int_time);
-       if (ret < 0)
-               return ret;
- 
-       return len;
- }
- 
  static irqreturn_t adjd_s311_trigger_handler(int irq, void *p)
  {
        struct iio_poll_func *pf = p;
@@@ -175,10 -138,7 +138,7 @@@
                len += 2;
        }
  
-       if (indio_dev->scan_timestamp)
-               *(s64 *)((u8 *)data->buffer + ALIGN(len, sizeof(s64)))
-                       = time_ns;
-       iio_push_to_buffers(indio_dev, (u8 *)data->buffer);
+       iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, time_ns);
  
  done:
        iio_trigger_notify_done(indio_dev->trig);
@@@ -186,25 -146,16 +146,16 @@@
        return IRQ_HANDLED;
  }
  
- static const struct iio_chan_spec_ext_info adjd_s311_ext_info[] = {
-       {
-               .name = "integration_time",
-               .read = adjd_s311_read_int_time,
-               .write = adjd_s311_write_int_time,
-       },
-       { }
- };
- 
  #define ADJD_S311_CHANNEL(_color, _scan_idx) { \
        .type = IIO_INTENSITY, \
        .modified = 1, \
        .address = (IDX_##_color), \
        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-               BIT(IIO_CHAN_INFO_HARDWAREGAIN), \
+               BIT(IIO_CHAN_INFO_HARDWAREGAIN) | \
+               BIT(IIO_CHAN_INFO_INT_TIME), \
        .channel2 = (IIO_MOD_LIGHT_##_color), \
        .scan_index = (_scan_idx), \
        .scan_type = IIO_ST('u', 10, 16, 0), \
-       .ext_info = adjd_s311_ext_info, \
  }
  
  static const struct iio_chan_spec adjd_s311_channels[] = {
@@@ -224,8 -175,7 +175,8 @@@ static int adjd_s311_read_raw(struct ii
  
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
 -              ret = adjd_s311_read_data(indio_dev, chan->address, val);
 +              ret = adjd_s311_read_data(indio_dev,
 +                      ADJD_S311_DATA_REG(chan->address), val);
                if (ret < 0)
                        return ret;
                return IIO_VAL_INT;
@@@ -236,6 -186,18 +187,18 @@@
                        return ret;
                *val = ret & ADJD_S311_CAP_MASK;
                return IIO_VAL_INT;
+       case IIO_CHAN_INFO_INT_TIME:
+               ret = i2c_smbus_read_word_data(data->client,
+                       ADJD_S311_INT_REG(chan->address));
+               if (ret < 0)
+                       return ret;
+               *val = 0;
+               /*
+                * not documented, based on measurement:
+                * 4095 LSBs correspond to roughly 4 ms
+                */
+               *val2 = ret & ADJD_S311_INT_MASK;
+               return IIO_VAL_INT_PLUS_MICRO;
        }
        return -EINVAL;
  }
@@@ -245,16 -207,20 +208,20 @@@ static int adjd_s311_write_raw(struct i
                               int val, int val2, long mask)
  {
        struct adjd_s311_data *data = iio_priv(indio_dev);
-       int ret;
  
        switch (mask) {
        case IIO_CHAN_INFO_HARDWAREGAIN:
                if (val < 0 || val > ADJD_S311_CAP_MASK)
                        return -EINVAL;
  
-               ret = i2c_smbus_write_byte_data(data->client,
+               return i2c_smbus_write_byte_data(data->client,
                        ADJD_S311_CAP_REG(chan->address), val);
-               return ret;
+       case IIO_CHAN_INFO_INT_TIME:
+               if (val != 0 || val2 < 0 || val2 > ADJD_S311_INT_MASK)
+                       return -EINVAL;
+ 
+               return i2c_smbus_write_word_data(data->client,
+                       ADJD_S311_INT_REG(chan->address), val2);
        }
        return -EINVAL;
  }
diff --combined include/linux/mfd/ti_am335x_tscadc.h
index 25f2c611ab013db8e3a4135a00c129b3d556e7d5,7d98562b3b519ac85a540ef16f36aaed29bab90f..08cce7f96ab9365359c30a4726d910022f571be5
--- 1/include/linux/mfd/ti_am335x_tscadc.h
--- 2/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@@ -46,16 -46,24 +46,24 @@@
  /* Step Enable */
  #define STEPENB_MASK          (0x1FFFF << 0)
  #define STEPENB(val)          ((val) << 0)
+ #define ENB(val)                      (1 << (val))
+ #define STPENB_STEPENB                STEPENB(0x1FFFF)
+ #define STPENB_STEPENB_TC     STEPENB(0x1FFF)
  
  /* IRQ enable */
  #define IRQENB_HW_PEN         BIT(0)
  #define IRQENB_FIFO0THRES     BIT(2)
+ #define IRQENB_FIFO0OVRRUN    BIT(3)
+ #define IRQENB_FIFO0UNDRFLW   BIT(4)
  #define IRQENB_FIFO1THRES     BIT(5)
+ #define IRQENB_FIFO1OVRRUN    BIT(6)
+ #define IRQENB_FIFO1UNDRFLW   BIT(7)
  #define IRQENB_PENUP          BIT(9)
  
  /* Step Configuration */
  #define STEPCONFIG_MODE_MASK  (3 << 0)
  #define STEPCONFIG_MODE(val)  ((val) << 0)
+ #define STEPCONFIG_MODE_SWCNT STEPCONFIG_MODE(1)
  #define STEPCONFIG_MODE_HWSYNC        STEPCONFIG_MODE(2)
  #define STEPCONFIG_AVG_MASK   (7 << 2)
  #define STEPCONFIG_AVG(val)   ((val) << 2)
@@@ -121,8 -129,10 +129,9 @@@
  #define SEQ_STATUS BIT(5)
  
  #define ADC_CLK                       3000000
 -#define       MAX_CLK_DIV             7
  #define TOTAL_STEPS           16
  #define TOTAL_CHANNELS                8
+ #define FIFO1_THRESHOLD               19
  
  /*
  * ADC runs at 3MHz, and it takes
Empty description
This page took 0.174867 seconds and 4 git commands to generate.