]> Git Repo - linux.git/commitdiff
Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
authorLinus Torvalds <[email protected]>
Fri, 7 Oct 2016 15:35:35 +0000 (08:35 -0700)
committerLinus Torvalds <[email protected]>
Fri, 7 Oct 2016 15:35:35 +0000 (08:35 -0700)
Pull MFD updates from Lee Jones:
 "Core framework:
   - Add the MFD bindings doc to MAINTAINERS

  New drivers:
   - X-Powers AC100 Audio CODEC and RTC
   - TI LP873x PMIC
   - Rockchip RK808 PMIC
   - Samsung Exynos Low Power Audio

  New device support:
   - Add support for STMPE1600 variant to stmpe
   - Add support for PM8018 PMIC to pm8921-core
   - Add support for AXP806 PMIC in axp20x
   - Add support for AXP209 GPIO in axp20x

  New functionality:
   - Add support for Reset to all STMPE variants
   - Add support for MKBP event support to cros_ec
   - Add support for USB to intel_soc_pmic_bxtwc
   - Add support for IRQs and Power Button to tps65217

  Fix-ups:
   - Clean-up defunct author emails (da9063, max14577)
   - Kconfig fixups (wm8350-i2c, as37220
   - Constify (altera-a10sr, sm501)
   - Supply PCI IDs (intel-lpss-pci)
   - Improve clocking (qcom_rpm)
   - Fix IRQ probing (ucb1x00-core)
   - Ensure fault log is cleared (da9052)
   - Remove NO_IRQ check (ucb1x00-core)
   - Supply I2C properties (intel-lpss-acpi, intel-lpss-pci)
   - Non standard declaration (tps65217, max8997-irq)
   - Remove unused code (lp873x, db8500-prcmu, ab8500-debugfs,
     cros_ec_spi)
   - Make non-modular (altera-a10sr, intel_msic, smsc-ece1099,
     sun6i-prcm, twl-core)
   - OF bindings (ac100, stmpe, qcom-pm8xxx, qcom-rpm, rk808, axp20x,
     lp873x, exynos5433-lpass, act8945a, aspeed-scu, twl6040, arizona)

  Bugfixes:
   - Release OF pointer (qcom_rpm)
   - Avoid double shifting in suspend/resume (88pm80x)
   - Fix 'defined but not used' error (exynos-lpass)
   - Fix 'sleeping whilst attomic' (atmel-hlcdc)"

* tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (69 commits)
  mfd: arizona: Handle probe deferral for reset GPIO
  mfd: arizona: Remove arizona_of_get_named_gpio helper function
  mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
  mfd: twl6040: Register child device for twl6040-pdmclk
  mfd: cros_ec_spi: Remove unused variable 'request'
  mfd: omap-usb-host: Return value is not 'const int'
  mfd: ab8500-debugfs: Remove 'weak' function suspend_test_wake_cause_interrupt_is_mine()
  mfd: ab8500-debugfs: Remove ab8500_dump_all_banks_to_mem()
  mfd: db8500-prcmu: Remove unused *prcmu_set_ddr_opp() calls
  mfd: ab8500-debugfs: Prevent initialised field from being over-written
  mfd: max8997-irq: 'inline' should be at the beginning of the declaration
  mfd: rk808: Fix RK818_IRQ_DISCHG_ILIM initializer
  mfd: tps65217: Fix nonstandard declaration
  mfd: lp873x: Remove unused mutex lock from struct lp873x
  mfd: atmel-hlcdc: Do not sleep in atomic context
  mfd: exynos-lpass: Mark PM functions as __maybe_unused
  mfd: intel-lpss: Add default I2C device properties for Apollo Lake
  mfd: twl-core: Make it explicitly non-modular
  mfd: sun6i-prcm: Make it explicitly non-modular
  mfd: smsc-ece1099: Make it explicitly non-modular
  ...

1  2 
MAINTAINERS
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/regulator/Kconfig
drivers/regulator/rk808-regulator.c

diff --combined MAINTAINERS
index 40f462966564d19e29ec83f87bbf954fc4084e77,022da8c83bbeed65947d206a1e7314fd2b1588f7..58c520517107ac3fe2302cc9348195ab81aa2d16
@@@ -636,15 -636,6 +636,15 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMAZON ETHERNET DRIVERS
 +M:    Netanel Belgazal <[email protected]>
 +R:    Saeed Bishara <[email protected]>
 +R:    Zorik Machulsky <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/ena.txt
 +F:    drivers/net/ethernet/amazon/
 +
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <[email protected]>
  M:    Gary Hook <[email protected]>
@@@ -807,7 -798,6 +807,7 @@@ M: Laura Abbott <[email protected]
  M:    Sumit Semwal <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/staging/ion/
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
  F:    drivers/staging/android/uapi/ion_test.h
@@@ -819,11 -809,11 +819,11 @@@ L:      [email protected] (moderat
  S:    Maintained
  F:    sound/aoa/
  
 -APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
 +APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/iio/dac/stx104.c
 +F:    drivers/iio/adc/stx104.c
  
  APM DRIVER
  M:    Jiri Kosina <[email protected]>
@@@ -891,15 -881,6 +891,15 @@@ S:       Supporte
  F:    drivers/gpu/drm/arc/
  F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
  
 +ARM ARCHITECTED TIMER DRIVER
 +M:    Mark Rutland <[email protected]>
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/include/asm/arch_timer.h
 +F:    arch/arm64/include/asm/arch_timer.h
 +F:    drivers/clocksource/arm_arch_timer.c
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -922,17 -903,15 +922,17 @@@ F:      arch/arm/include/asm/floppy.
  
  ARM PMU PROFILING AND DEBUGGING
  M:    Will Deacon <[email protected]>
 -R:    Mark Rutland <[email protected]>
 +M:    Mark Rutland <[email protected]>
  S:    Maintained
 +L:    [email protected] (moderated for non-subscribers)
  F:    arch/arm*/kernel/perf_*
  F:    arch/arm/oprofile/common.c
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/include/asm/hw_breakpoint.h
  F:    arch/arm*/include/asm/perf_event.h
 -F:    drivers/perf/arm_pmu.c
 +F:    drivers/perf/*
  F:    include/linux/perf/arm_pmu.h
 +F:    Documentation/devicetree/bindings/arm/pmu.txt
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -1134,11 -1113,6 +1134,11 @@@ F:    drivers/hwtracing/coresight/
  F:    Documentation/trace/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 +F:    tools/perf/arch/arm/util/pmu.c
 +F:    tools/perf/arch/arm/util/auxtrace.c
 +F:    tools/perf/arch/arm/util/cs-etm.c
 +F:    tools/perf/arch/arm/util/cs-etm.h
 +F:    tools/perf/util/cs-etm.h
  
  ARM/CORGI MACHINE SUPPORT
  M:    Richard Purdie <[email protected]>
@@@ -1640,8 -1614,7 +1640,8 @@@ N:      rockchi
  
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +R:    Javier Martinez Canillas <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1661,6 -1634,7 +1661,6 @@@ F:      drivers/*/*s3c64xx
  F:    drivers/*/*s5pv210*
  F:    drivers/memory/samsung/*
  F:    drivers/soc/samsung/*
 -F:    drivers/spi/spi-s3c*
  F:    Documentation/arm/Samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@ -1848,7 -1822,6 +1848,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  ARM/UNIPHIER ARCHITECTURE
  M:    Masahiro Yamada <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
  S:    Maintained
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
@@@ -1856,7 -1829,6 +1856,7 @@@ F:      arch/arm/mach-uniphier
  F:    arch/arm/mm/cache-uniphier.c
  F:    arch/arm64/boot/dts/socionext/
  F:    drivers/bus/uniphier-system-bus.c
 +F:    drivers/clk/uniphier/
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -1993,13 -1965,6 +1993,13 @@@ S:    Maintaine
  F:    drivers/media/i2c/as3645a.c
  F:    include/media/i2c/as3645a.h
  
 +ASAHI KASEI AK8974 DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +W:    http://www.akm.com/
 +S:    Supported
 +F:    drivers/iio/magnetometer/ak8974.c
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
  L:    [email protected]
@@@ -2138,6 -2103,11 +2138,6 @@@ M:     Ludovic Desroches <ludovic.desroches
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
 -ATMEL AT91 / AT32 SERIAL DRIVER
 -M:    Nicolas Ferre <[email protected]>
 -S:    Supported
 -F:    drivers/tty/serial/atmel_serial.c
 -
  ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -2505,7 -2475,7 +2505,7 @@@ F:      include/net/bluetooth
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
  M:    Veaceslav Falico <[email protected]>
 -M:    Andy Gospodarek <[email protected]>
 +M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -2520,7 -2490,7 +2520,7 @@@ S:      Supporte
  F:    kernel/bpf/
  
  BROADCOM B44 10/100 ETHERNET DRIVER
 -M:    Gary Zambrano <zambrano@broadcom.com>
 +M:    Michael Chan <michael.chan@broadcom.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/b44.*
@@@ -3155,7 -3125,7 +3155,7 @@@ L:      [email protected] (moderated fo
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
  W:    http://coccinelle.lip6.fr/
  S:    Supported
 -F:    Documentation/coccinelle.txt
 +F:    Documentation/dev-tools/coccinelle.rst
  F:    scripts/coccinelle/
  F:    scripts/coccicheck
  
@@@ -3181,7 -3151,6 +3181,7 @@@ COMMON CLK FRAMEWOR
  M:    Michael Turquette <[email protected]>
  M:    Stephen Boyd <[email protected]>
  L:    [email protected]
 +Q:    http://patchwork.kernel.org/project/linux-clk/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/clock/
@@@ -3269,7 -3238,7 +3269,7 @@@ F:      kernel/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
 -M:    Vladimir Davydov <vdavydov@virtuozzo.com>
 +M:    Vladimir Davydov <vdavydov.dev@gmail.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -3290,7 -3259,7 +3290,7 @@@ S:      Maintaine
  F:    drivers/net/wan/cosa*
  
  CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <f[email protected]>
 +M:    Florian Fainelli <f[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/ti/cpmac.c
@@@ -3302,7 -3271,6 +3302,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 +F:    Documentation/cpu-freq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -3784,8 -3752,8 +3784,8 @@@ F:      drivers/leds/leds-da90??.
  F:    drivers/mfd/da903x.c
  F:    drivers/mfd/da90??-*.c
  F:    drivers/mfd/da91??-*.c
 -F:    drivers/power/da9052-battery.c
 -F:    drivers/power/da91??-*.c
 +F:    drivers/power/supply/da9052-battery.c
 +F:    drivers/power/supply/da91??-*.c
  F:    drivers/regulator/da903x.c
  F:    drivers/regulator/da9???-regulator.[ch]
  F:    drivers/rtc/rtc-da90??.c
@@@ -3801,12 -3769,6 +3801,12 @@@ F:    include/linux/regulator/da9211.
  F:    include/sound/da[79]*.h
  F:    sound/soc/codecs/da[79]*.[ch]
  
 +DIAMOND SYSTEMS GPIO-MM GPIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-gpio-mm.c
 +
  DIGI NEO AND CLASSIC PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
  M:    Mark Hounschell <[email protected]>
@@@ -4432,6 -4394,7 +4432,6 @@@ F:      Documentation/filesystems/ecryptfs.t
  F:    fs/ecryptfs/
  
  EDAC-CORE
 -M:    Doug Thompson <[email protected]>
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -4444,12 -4407,14 +4444,12 @@@ F:   drivers/edac
  F:    include/linux/edac.h
  
  EDAC-AMD64
 -M:    Doug Thompson <[email protected]>
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
  EDAC-CALXEDA
 -M:    Doug Thompson <[email protected]>
  M:    Robert Richter <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4465,21 -4430,17 +4465,21 @@@ F:   drivers/edac/octeon_edac
  
  EDAC-E752X
  M:    Mark Gross <[email protected]>
 -M:    Doug Thompson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
  
  EDAC-E7XXX
 -M:    Doug Thompson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
  
 +EDAC-FSL_DDR
 +M:    York Sun <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/fsl_ddr_edac.*
 +
  EDAC-GHES
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -4494,11 -4455,13 +4494,11 @@@ S:   Maintaine
  F:    drivers/edac/i82443bxgx_edac.c
  
  EDAC-I3000
 -M:    Jason Uhlenkott <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/edac/i3000_edac.c
  
  EDAC-I5000
 -M:    Doug Thompson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i5000_edac.c
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 +EDAC-SKYLAKE
 +M:    Tony Luck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/skx_edac.c
 +
  EDAC-XGENE
  APPLIED MICRO (APM) X-GENE SOC EDAC
  M:     Loc Ho <[email protected]>
@@@ -4610,13 -4567,6 +4610,13 @@@ M:    Peter Jones <[email protected]
  S:    Maintained
  F:    drivers/video/fbdev/efifb.c
  
 +EFI TEST DRIVER
 +L:    [email protected]
 +M:    Ivan Hu <[email protected]>
 +M:    Matt Fleming <[email protected]>
 +S:    Maintained
 +F:    drivers/firmware/efi/test/
 +
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
@@@ -4884,7 -4834,6 +4884,7 @@@ F:      tools/firewire
  
  FIRMWARE LOADER (request_firmware)
  M:    Ming Lei <[email protected]>
 +M:    Luis R. Rodriguez <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -5105,9 -5054,10 +5105,9 @@@ F:     include/linux/fscrypto.
  
  F2FS FILE SYSTEM
  M:    Jaegeuk Kim <[email protected]>
 -M:    Changman Lee <[email protected]>
 -R:    Chao Yu <[email protected]>
 +M:    Chao Yu <[email protected]>
  L:    [email protected]
 -W:    http://en.wikipedia.org/wiki/F2FS
 +W:    https://f2fs.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
  F:    Documentation/filesystems/f2fs.txt
@@@ -5169,7 -5119,7 +5169,7 @@@ GCOV BASED KERNEL PROFILIN
  M:    Peter Oberparleiter <[email protected]>
  S:    Maintained
  F:    kernel/gcov/
 -F:    Documentation/gcov.txt
 +F:    Documentation/dev-tools/gcov.rst
  
  GDT SCSI DISK ARRAY CONTROLLER DRIVER
  M:    Achim Leubner <[email protected]>
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GPIO MOCKUP DRIVER
 +M:    Bamvor Jian Zhang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-mockup.c
 +F:    tools/testing/selftests/gpio/
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Alexandre Courbot <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/aeroflex/
  
 +GREYBUS SUBSYSTEM
 +M:    Johan Hovold <[email protected]>
 +M:    Alex Elder <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/
 +
 +GREYBUS AUDIO PROTOCOLS DRIVERS
 +M:    Vaibhav Agarwal <[email protected]>
 +M:    Mark Greer <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/audio_apbridgea.c
 +F:    drivers/staging/greybus/audio_apbridgea.h
 +F:    drivers/staging/greybus/audio_codec.c
 +F:    drivers/staging/greybus/audio_codec.h
 +F:    drivers/staging/greybus/audio_gb.c
 +F:    drivers/staging/greybus/audio_manager.c
 +F:    drivers/staging/greybus/audio_manager.h
 +F:    drivers/staging/greybus/audio_manager_module.c
 +F:    drivers/staging/greybus/audio_manager_private.h
 +F:    drivers/staging/greybus/audio_manager_sysfs.c
 +F:    drivers/staging/greybus/audio_module.c
 +F:    drivers/staging/greybus/audio_topology.c
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    Rui Miguel Silva <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/sdio.c
 +F:    drivers/staging/greybus/light.c
 +F:    drivers/staging/greybus/gpio.c
 +F:    drivers/staging/greybus/power_supply.c
 +F:    drivers/staging/greybus/spi.c
 +F:    drivers/staging/greybus/spilib.c
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    Bryan O'Donoghue <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/loopback.c
 +F:    drivers/staging/greybus/timesync.c
 +F:    drivers/staging/greybus/timesync_platform.c
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    Viresh Kumar <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/authentication.c
 +F:    drivers/staging/greybus/bootrom.c
 +F:    drivers/staging/greybus/firmware.h
 +F:    drivers/staging/greybus/fw-core.c
 +F:    drivers/staging/greybus/fw-download.c
 +F:    drivers/staging/greybus/fw-managament.c
 +F:    drivers/staging/greybus/greybus_authentication.h
 +F:    drivers/staging/greybus/greybus_firmware.h
 +F:    drivers/staging/greybus/hid.c
 +F:    drivers/staging/greybus/i2c.c
 +F:    drivers/staging/greybus/spi.c
 +F:    drivers/staging/greybus/spilib.c
 +F:    drivers/staging/greybus/spilib.h
 +
 +GREYBUS PROTOCOLS DRIVERS
 +M:    David Lin <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/uart.c
 +F:    drivers/staging/greybus/log.c
 +
 +GREYBUS PLATFORM DRIVERS
 +M:    Vaibhav Hiremath <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/arche-platform.c
 +F:    drivers/staging/greybus/arche-apb-ctrl.c
 +F:    drivers/staging/greybus/arche_platform.h
 +
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <[email protected]>
  L:    [email protected]
@@@ -5695,9 -5567,10 +5695,9 @@@ F:     Documentation/devicetree/bindings/sc
  
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
 -L:    [email protected] (subscribers-only)
  L:    [email protected]
 -W:    http://hostap.epitest.fi/
 -S:    Maintained
 +W:    http://w1.fi/hostap-driver.html
 +S:    Obsolete
  F:    drivers/net/wireless/intersil/hostap/
  
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
@@@ -5734,7 -5607,7 +5734,7 @@@ M:      Sebastian Reichel <[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-hsi
 -F:    Documentation/hsi.txt
 +F:    Documentation/device-drivers/serial-interfaces.rst
  F:    drivers/hsi/
  F:    include/linux/hsi/
  F:    include/uapi/linux/hsi/
@@@ -6213,7 -6086,7 +6213,7 @@@ S:      Supporte
  F:    drivers/cpufreq/intel_pstate.c
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Maik Broemme <mbroemme@plusserver.de>
 +M:    Maik Broemme <mbroemme@libmpq.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
@@@ -6715,7 -6588,7 +6715,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/*/include/asm/kasan.h
  F:    arch/*/mm/kasan_init*
 -F:    Documentation/kasan.txt
 +F:    Documentation/dev-tools/kasan.rst
  F:    include/linux/kasan*.h
  F:    lib/test_kasan.c
  F:    mm/kasan/
@@@ -6931,7 -6804,7 +6931,7 @@@ KMEMCHEC
  M:    Vegard Nossum <[email protected]>
  M:    Pekka Enberg <[email protected]>
  S:    Maintained
 -F:    Documentation/kmemcheck.txt
 +F:    Documentation/dev-tools/kmemcheck.rst
  F:    arch/x86/include/asm/kmemcheck.h
  F:    arch/x86/mm/kmemcheck/
  F:    include/linux/kmemcheck.h
@@@ -6940,7 -6813,7 +6940,7 @@@ F:      mm/kmemcheck.
  KMEMLEAK
  M:    Catalin Marinas <[email protected]>
  S:    Maintained
 -F:    Documentation/kmemleak.txt
 +F:    Documentation/dev-tools/kmemleak.rst
  F:    include/linux/kmemleak.h
  F:    mm/kmemleak.c
  F:    mm/kmemleak-test.c
@@@ -7553,8 -7426,9 +7553,8 @@@ F:      Documentation/hwmon/max2075
  F:    drivers/hwmon/max20751.c
  
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 -M:    "Hans J. Koch" <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/hwmon/max6650
  F:    drivers/hwmon/max6650.c
  
@@@ -7575,12 -7449,11 +7575,12 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/max9860.*
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/power/max14577_charger.c
 -F:    drivers/power/max77693_charger.c
 +F:    drivers/power/supply/max14577_charger.c
 +F:    drivers/power/supply/max77693_charger.c
  
  MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Javier Martinez Canillas <[email protected]>
@@@ -7592,8 -7465,7 +7592,8 @@@ F:      include/dt-bindings/*/*max77802.
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/*/max14577*.c
  S:    Maintained
  F:    drivers/iio/potentiometer/mcp4531.c
  
 +MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/dac/cio-dac.c
 +
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -7783,26 -7649,13 +7783,26 @@@ W:   http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  
 +MELLANOX MLXCPLD LED DRIVER
 +M:    Vadim Pasternak <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/leds/leds-mlxcpld.c
 +F:    Documentation/leds/leds-mlxcpld.txt
 +
 +MELLANOX PLATFORM DRIVER
 +M:      Vadim Pasternak <[email protected]>
 +L:      [email protected]
 +S:      Supported
 +F:      arch/x86/platform/mellanox/mlx-platform.c
 +
  SOFT-ROCE DRIVER (rxe)
  M:    Moni Shoua <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -F:    drivers/infiniband/hw/rxe/
 +F:    drivers/infiniband/sw/rxe/
  F:    include/uapi/rdma/rdma_user_rxe.h
  
  MEMBARRIER SUPPORT
@@@ -7881,12 -7734,6 +7881,12 @@@ T:    git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 +MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
 +M:    Richard Genoud <[email protected]>
 +S:    Maintained
 +F:    drivers/tty/serial/atmel_serial.c
 +F:    include/linux/atmel_serial.h
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <[email protected]>
  L:    [email protected]
@@@ -8098,6 -7945,7 +8098,7 @@@ MULTIFUNCTION DEVICES (MFD
  M:    Lee Jones <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  S:    Supported
+ F:    Documentation/devicetree/bindings/mfd/
  F:    drivers/mfd/
  F:    include/linux/mfd/
  
@@@ -8295,15 -8143,6 +8296,15 @@@ S:    Maintaine
  W:    https://fedorahosted.org/dropwatch/
  F:    net/core/drop_monitor.c
  
 +NETWORKING [DSA]
 +M:    Andrew Lunn <[email protected]>
 +M:    Vivien Didelot <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +S:    Maintained
 +F:    net/dsa/
 +F:    include/net/dsa.h
 +F:    drivers/net/dsa/
 +
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
  L:    [email protected]
@@@ -8486,11 -8325,11 +8487,11 @@@ R:   Pali Rohár <[email protected]
  F:    include/linux/power/bq2415x_charger.h
  F:    include/linux/power/bq27xxx_battery.h
  F:    include/linux/power/isp1704_charger.h
 -F:    drivers/power/bq2415x_charger.c
 -F:    drivers/power/bq27xxx_battery.c
 -F:    drivers/power/bq27xxx_battery_i2c.c
 -F:    drivers/power/isp1704_charger.c
 -F:    drivers/power/rx51_battery.c
 +F:    drivers/power/supply/bq2415x_charger.c
 +F:    drivers/power/supply/bq27xxx_battery.c
 +F:    drivers/power/supply/bq27xxx_battery_i2c.c
 +F:    drivers/power/supply/isp1704_charger.c
 +F:    drivers/power/supply/rx51_battery.c
  
  NTB DRIVER CORE
  M:    Jon Mason <[email protected]>
@@@ -8879,7 -8718,7 +8880,7 @@@ F:      drivers/oprofile
  F:    include/linux/oprofile.h
  
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 -M:    Mark Fasheh <mfasheh@suse.com>
 +M:    Mark Fasheh <mfasheh@versity.com>
  M:    Joel Becker <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
@@@ -8991,7 -8830,6 +8992,7 @@@ S:      Supporte
  F:    Documentation/virtual/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
  F:    arch/*/include/asm/paravirt.h
 +F:    include/linux/hypervisor.h
  
  PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
  M:    Tim Waugh <[email protected]>
@@@ -9394,7 -9232,7 +9395,7 @@@ F:      drivers/pinctrl/sh-pfc
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Krzysztof Kozlowski <k[email protected]>
 +M:    Krzysztof Kozlowski <k[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -9490,12 -9328,16 +9491,12 @@@ F:   drivers/powercap
  
  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
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/power/
 -F:    Documentation/devicetree/bindings/power_supply/
 +F:    Documentation/devicetree/bindings/power/supply/
  F:    include/linux/power_supply.h
 -F:    drivers/power/
 -X:    drivers/power/avs/
 +F:    drivers/power/supply/
  
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <[email protected]>
@@@ -9831,12 -9673,6 +9832,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
 +QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 +M:    Timur Tabi <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/qualcomm/emac/
 +
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <[email protected]>
  L:    [email protected]
@@@ -10057,12 -9893,6 +10058,12 @@@ F:  drivers/rpmsg
  F:    Documentation/rpmsg.txt
  F:    include/linux/rpmsg.h
  
 +RENESAS CLOCK DRIVERS
 +M:    Geert Uytterhoeven <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/clk/renesas/
 +
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <[email protected]>
  L:    [email protected]
@@@ -10098,7 -9928,6 +10099,7 @@@ F:    net/rfkill
  
  RHASHTABLE
  M:    Thomas Graf <[email protected]>
 +M:    Herbert Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    lib/rhashtable.c
@@@ -10242,8 -10071,8 +10243,8 @@@ S:   Supporte
  F:    drivers/s390/cio/
  
  S390 DASD DRIVER
 -M:    Stefan Weinhuber <wein@de.ibm.com>
 -M:    Stefan Haberland <stefan.haberland@de.ibm.com>
 +M:    Stefan Haberland <[email protected].ibm.com>
 +M:    Jan Hoeppner <[email protected].ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -10336,7 -10165,7 +10337,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <k[email protected]>
 +M:    Krzysztof Kozlowski <k[email protected]>
  M:    Sangbeom Kim <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -10351,8 -10180,7 +10352,8 @@@ F:   drivers/video/fbdev/s3c-fb.
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Sangbeom Kim <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -10407,23 -10235,9 +10408,23 @@@ F: drivers/nfc/s3fwrn
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
 +M:    Chanwoo Choi <[email protected]>
  S:    Supported
  L:    [email protected] (moderated for non-subscribers)
  F:    drivers/clk/samsung/
 +F:    include/dt-bindings/clock/exynos*.h
 +F:    Documentation/devicetree/bindings/clock/exynos*.txt
 +
 +SAMSUNG SPI DRIVERS
 +M:    Kukjin Kim <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Andi Shyti <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    drivers/spi/spi-s3c*
 +F:    include/linux/platform_data/spi-s3c64xx.h
  
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <[email protected]>
@@@ -10510,8 -10324,8 +10511,8 @@@ F:   drivers/thunderbolt
  TI BQ27XXX POWER SUPPLY DRIVER
  R:    Andrew F. Davis <[email protected]>
  F:    include/linux/power/bq27xxx_battery.h
 -F:    drivers/power/bq27xxx_battery.c
 -F:    drivers/power/bq27xxx_battery_i2c.c
 +F:    drivers/power/supply/bq27xxx_battery.c
 +F:    drivers/power/supply/bq27xxx_battery_i2c.c
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <[email protected]>
@@@ -11271,7 -11085,6 +11272,7 @@@ F:   Documentation/spi
  F:    drivers/spi/
  F:    include/linux/spi/
  F:    include/uapi/linux/spi/
 +F:    tools/spi/
  
  SPIDERNET NETWORK DRIVER for CELL
  M:    Ishizaki Kou <[email protected]>
@@@ -11342,7 -11155,6 +11343,7 @@@ F:   drivers/staging/media/lirc
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:    Oleg Drokin <[email protected]>
  M:    Andreas Dilger <[email protected]>
 +M:    James Simmons <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.lustre.org/
  S:    Maintained
@@@ -11369,6 -11181,13 +11370,6 @@@ M:  Florian Schilhabel <florian.c.schilh
  S:    Odd Fixes
  F:    drivers/staging/rtl8712/
  
 -STAGING - REALTEK RTL8723U WIRELESS DRIVER
 -M:    Larry Finger <[email protected]>
 -M:    Jes Sorensen <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/rtl8723au/
 -
  STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
  M:    Teddy Wang <[email protected]>
@@@ -11399,8 -11218,12 +11400,8 @@@ S:  Odd Fixe
  F:    drivers/staging/vt665?/
  
  STAGING - WILC1000 WIFI DRIVER
 -M:    Johnny Kim <[email protected]>
 -M:    Austin Shin <[email protected]>
 -M:    Chris Park <[email protected]>
 -M:    Tony Cho <[email protected]>
 -M:    Glen Lee <[email protected]>
 -M:    Leo Kim <[email protected]>
 +M:    Aditya Shankar <[email protected]>
 +M:    Ganesh Krishna <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/staging/wilc1000/
@@@ -11508,14 -11331,6 +11509,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/mfd/syscon.c
  
 +SYSTEM RESET/SHUTDOWN DRIVERS
 +M:    Sebastian Reichel <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/reset/
 +F:    drivers/power/reset/
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  S:    Maintained
@@@ -11776,7 -11591,7 +11777,7 @@@ F:   Documentation/devicetree/bindings/th
  THERMAL/CPU_COOLING
  M:    Amit Daniel Kachhap <[email protected]>
  M:    Viresh Kumar <[email protected]>
 -M:    Javi Merino <javi.merino@arm.com>
 +M:    Javi Merino <javi.merino@kernel.org>
  L:    [email protected]
  S:    Supported
  F:    Documentation/thermal/cpu-cooling-api.txt
@@@ -11864,7 -11679,7 +11865,7 @@@ F:   include/linux/platform_data/lp855x.
  TI LP8727 CHARGER DRIVER
  M:    Milo Kim <[email protected]>
  S:    Maintained
 -F:    drivers/power/lp8727_charger.c
 +F:    drivers/power/supply/lp8727_charger.c
  F:    include/linux/platform_data/lp8727.h
  
  TI LP8788 MFD DRIVER
@@@ -11873,7 -11688,7 +11874,7 @@@ S:   Maintaine
  F:    drivers/iio/adc/lp8788_adc.c
  F:    drivers/leds/leds-lp8788.c
  F:    drivers/mfd/lp8788*.c
 -F:    drivers/power/lp8788-charger.c
 +F:    drivers/power/supply/lp8788-charger.c
  F:    drivers/regulator/lp8788-*.c
  F:    include/linux/mfd/lp8788*.h
  
@@@ -12343,7 -12158,7 +12344,7 @@@ S:   Maintaine
  F:    drivers/net/usb/lan78xx.*
  
  USB MASS STORAGE DRIVER
 -M:    Matthew Dharm <[email protected]>
 +M:    Alan Stern <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12427,7 -12242,6 +12428,7 @@@ F:   drivers/net/usb/rtl8150.
  USB SERIAL SUBSYSTEM
  M:    Johan Hovold <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
  S:    Maintained
  F:    Documentation/usb/usb-serial.txt
  F:    drivers/usb/serial/
@@@ -12441,7 -12255,6 +12442,7 @@@ F:   drivers/net/usb/smsc75xx.
  
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
@@@ -12548,6 -12361,7 +12549,6 @@@ F:   fs/hostfs
  F:    fs/hppfs/
  
  USERSPACE I/O (UIO)
 -M:    "Hans J. Koch" <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
@@@ -12729,7 -12543,7 +12730,7 @@@ F:   include/linux/if_*vlan.
  F:    net/8021q/
  
  VLYNQ BUS
 -M:    Florian Fainelli <f[email protected]>
 +M:    Florian Fainelli <f[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
  F:    drivers/vlynq/vlynq.c
@@@ -12950,7 -12764,7 +12951,7 @@@ F:   drivers/input/touchscreen/wm97*.
  F:    drivers/mfd/arizona*
  F:    drivers/mfd/wm*.c
  F:    drivers/mfd/cs47l24*
 -F:    drivers/power/wm83*.c
 +F:    drivers/power/supply/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
  F:    drivers/regulator/wm8*.c
  F:    drivers/video/backlight/wm83*_bl.c
@@@ -13102,10 -12916,11 +13103,10 @@@ F:        arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -P:    Silicon Graphics Inc
  M:    Dave Chinner <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 -W:    http://oss.sgi.com/projects/xfs
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://xfs.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
diff --combined drivers/mfd/Kconfig
index 2caf7e9673903b93bece976f2773fc1bc1fa33c9,ceb29f31e6c807dc910d276ad8238d5b34d94214..c6df6442ba2b1b378386db03cb530fa6b6e3e723
@@@ -50,7 -50,7 +50,7 @@@ config MFD_AS371
          Support for the AS3711 PMIC from AMS
  
  config MFD_AS3722
-       bool "ams AS3722 Power Management IC"
+       tristate "ams AS3722 Power Management IC"
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
@@@ -112,6 -112,16 +112,16 @@@ config MFD_BCM590X
        help
          Support for the BCM590xx PMUs from Broadcom
  
+ config MFD_AC100
+       tristate "X-Powers AC100"
+       select MFD_CORE
+       depends on SUNXI_RSB
+       help
+         If you say Y here you get support for the X-Powers AC100 audio codec
+         IC.
+         This driver include only the core APIs. You have to select individual
+         components like codecs or RTC under the corresponding menus.
  config MFD_AXP20X
        tristate
        select MFD_CORE
@@@ -281,6 -291,14 +291,14 @@@ config MFD_DLN
          etc. must be enabled in order to use the functionality of
          the device.
  
+ config MFD_EXYNOS_LPASS
+       tristate "Samsung Exynos SoC Low Power Audio Subsystem"
+       select MFD_CORE
+       select REGMAP_MMIO
+       help
+         Select this option to enable support for Samsung Exynos Low Power
+         Audio Subsystem.
  config MFD_MC13XXX
        tristate
        depends on (SPI_MASTER || I2C)
@@@ -340,6 -358,14 +358,6 @@@ config MFD_HI655X_PMI
        help
          Select this option to enable Hisilicon hi655x series pmic driver.
  
 -config HTC_EGPIO
 -      bool "HTC EGPIO support"
 -      depends on GPIOLIB && ARM
 -      help
 -          This driver supports the CPLD egpio chip present on
 -          several HTC phones.  It provides basic support for input
 -          pins, output pins, and irqs.
 -
  config HTC_PASIC3
        tristate "HTC PASIC3 LED/DS1WM chip support"
        select MFD_CORE
@@@ -844,13 -870,13 +862,13 @@@ config MFD_RC5T58
          different functionality of the device.
  
  config MFD_RK808
-       tristate "Rockchip RK808 Power Management chip"
+       tristate "Rockchip RK808/RK818 Power Management Chip"
        depends on I2C && OF
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        help
-         If you say yes here you get support for the RK808
+         If you say yes here you get support for the RK808 and RK818
          Power Management chips.
          This driver provides common support for accessing the device
          through I2C interface. The device supports multiple sub-devices
@@@ -1206,6 -1232,7 +1224,7 @@@ config MFD_TPS6521
        depends on I2C
        select MFD_CORE
        select REGMAP_I2C
+       select IRQ_DOMAIN
        help
          If you say yes here you get support for the TPS65217 series of
          Power Management / White LED chips.
@@@ -1555,6 -1582,7 +1574,7 @@@ config MFD_WM835
  config MFD_WM8350_I2C
        bool "Wolfson Microelectronics WM8350 with I2C"
        select MFD_WM8350
+       select REGMAP_I2C
        depends on I2C=y
        help
          The WM8350 is an integrated audio and power management
diff --combined drivers/mfd/Makefile
index 2bf6a1ac7428cc4ed68d6e5b1cbdc6d2a8f06a45,f18dce1e5e3f8cad8293fb3a5d8f00bedce75924..9834e669d98573ce8c0b0a15b3f167dbf3485d87
@@@ -13,11 -13,13 +13,12 @@@ obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.
  obj-$(CONFIG_MFD_CROS_EC)     += cros_ec.o
  obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o
  obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o
+ obj-$(CONFIG_MFD_EXYNOS_LPASS)        += exynos-lpass.o
  
  rtsx_pci-objs                 := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
  obj-$(CONFIG_MFD_RTSX_PCI)    += rtsx_pci.o
  obj-$(CONFIG_MFD_RTSX_USB)    += rtsx_usb.o
  
 -obj-$(CONFIG_HTC_EGPIO)               += htc-egpio.o
  obj-$(CONFIG_HTC_PASIC3)      += htc-pasic3.o
  obj-$(CONFIG_HTC_I2CPLD)      += htc-i2cpld.o
  
@@@ -114,6 -116,8 +115,8 @@@ obj-$(CONFIG_PMIC_DA9052)  += da9052-irq
  obj-$(CONFIG_PMIC_DA9052)     += da9052-core.o
  obj-$(CONFIG_MFD_DA9052_SPI)  += da9052-spi.o
  obj-$(CONFIG_MFD_DA9052_I2C)  += da9052-i2c.o
+ obj-$(CONFIG_MFD_AC100)               += ac100.o
  obj-$(CONFIG_MFD_AXP20X)      += axp20x.o
  obj-$(CONFIG_MFD_AXP20X_I2C)  += axp20x-i2c.o
  obj-$(CONFIG_MFD_AXP20X_RSB)  += axp20x-rsb.o
index 06c75186af80314d32e355efc96724d0dfd8a852,620412966bebd06487d42b7fc0534bb05bc9fabd..936f7ccc9736f8c550f712f6cb9fd8c8622ce29c
@@@ -353,14 -353,6 +353,14 @@@ config REGULATOR_LTC358
          This enables support for the LTC3589, LTC3589-1, and LTC3589-2
          8-output regulators controlled via I2C.
  
 +config REGULATOR_LTC3676
 +      tristate "LTC3676 8-output voltage regulator"
 +      depends on I2C
 +      select REGMAP_I2C
 +      help
 +        This enables support for the LTC3676
 +        8-output regulators controlled via I2C.
 +
  config REGULATOR_MAX14577
        tristate "Maxim 14577/77836 regulator"
        depends on MFD_MAX14577
@@@ -643,11 -635,11 +643,11 @@@ config REGULATOR_RC5T58
          outputs which can be controlled by i2c communication.
  
  config REGULATOR_RK808
-       tristate "Rockchip RK808 Power regulators"
+       tristate "Rockchip RK808/RK818 Power regulators"
        depends on MFD_RK808
        help
          Select this option to enable the power regulator of ROCKCHIP
-         PMIC RK808.
+         PMIC RK808 and RK818.
          This driver supports the control of different power rails of device
          through regulator interface. The device supports multiple DCDC/LDO
          outputs which can be controlled by i2c communication.
@@@ -828,7 -820,7 +828,7 @@@ config REGULATOR_TPS6591
            This driver supports TPS65912 voltage regulator chip.
  
  config REGULATOR_TPS80031
 -      tristate "TI TPS80031/TPS80032 power regualtor driver"
 +      tristate "TI TPS80031/TPS80032 power regulator driver"
        depends on MFD_TPS80031
        help
          TPS80031/ TPS80032 Fully Integrated Power Management with Power
index a6767494d39b192fd4e2915455249712a63c8bc4,5f412a5e35e3014a938e011c8efcec6919c8cc96..3314bf299a51f54fcff2fed6f600ae33eaf44a57
@@@ -1,11 -1,15 +1,15 @@@
  /*
-  * Regulator driver for Rockchip RK808
+  * Regulator driver for Rockchip RK808/RK818
   *
   * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
   *
   * Author: Chris Zhong <[email protected]>
   * Author: Zhang Qing <[email protected]>
   *
+  * Copyright (C) 2016 PHYTEC Messtechnik GmbH
+  *
+  * Author: Wadim Egorov <[email protected]>
+  *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms and conditions of the GNU General Public License,
   * version 2, as published by the Free Software Foundation.
  #define RK808_BUCK4_VSEL_MASK 0xf
  #define RK808_LDO_VSEL_MASK   0x1f
  
+ #define RK818_BUCK_VSEL_MASK          0x3f
+ #define RK818_BUCK4_VSEL_MASK         0x1f
+ #define RK818_LDO_VSEL_MASK           0x1f
+ #define RK818_LDO3_ON_VSEL_MASK               0xf
+ #define RK818_BOOST_ON_VSEL_MASK      0xe0
  /* Ramp rate definitions for buck1 / buck2 only */
  #define RK808_RAMP_RATE_OFFSET                3
  #define RK808_RAMP_RATE_MASK          (3 << RK808_RAMP_RATE_OFFSET)
@@@ -454,6 -464,108 +464,108 @@@ static const struct regulator_desc rk80
                RK808_DCDC_EN_REG, BIT(6)),
  };
  
+ static const struct regulator_desc rk818_reg[] = {
+       {
+               .name = "DCDC_REG1",
+               .supply_name = "vcc1",
+               .of_match = of_match_ptr("DCDC_REG1"),
+               .regulators_node = of_match_ptr("regulators"),
+               .id = RK818_ID_DCDC1,
+               .ops = &rk808_reg_ops,
+               .type = REGULATOR_VOLTAGE,
+               .min_uV = 712500,
+               .uV_step = 12500,
+               .n_voltages = 64,
+               .vsel_reg = RK818_BUCK1_ON_VSEL_REG,
+               .vsel_mask = RK818_BUCK_VSEL_MASK,
+               .enable_reg = RK818_DCDC_EN_REG,
+               .enable_mask = BIT(0),
+               .owner = THIS_MODULE,
+       }, {
+               .name = "DCDC_REG2",
+               .supply_name = "vcc2",
+               .of_match = of_match_ptr("DCDC_REG2"),
+               .regulators_node = of_match_ptr("regulators"),
+               .id = RK818_ID_DCDC2,
+               .ops = &rk808_reg_ops,
+               .type = REGULATOR_VOLTAGE,
+               .min_uV = 712500,
+               .uV_step = 12500,
+               .n_voltages = 64,
+               .vsel_reg = RK818_BUCK2_ON_VSEL_REG,
+               .vsel_mask = RK818_BUCK_VSEL_MASK,
+               .enable_reg = RK818_DCDC_EN_REG,
+               .enable_mask = BIT(1),
+               .owner = THIS_MODULE,
+       }, {
+               .name = "DCDC_REG3",
+               .supply_name = "vcc3",
+               .of_match = of_match_ptr("DCDC_REG3"),
+               .regulators_node = of_match_ptr("regulators"),
+               .id = RK818_ID_DCDC3,
+               .ops = &rk808_switch_ops,
+               .type = REGULATOR_VOLTAGE,
+               .n_voltages = 1,
+               .enable_reg = RK818_DCDC_EN_REG,
+               .enable_mask = BIT(2),
+               .owner = THIS_MODULE,
+       },
+       RK8XX_DESC(RK818_ID_DCDC4, "DCDC_REG4", "vcc4", 1800, 3600, 100,
+               RK818_BUCK4_ON_VSEL_REG, RK818_BUCK4_VSEL_MASK,
+               RK818_DCDC_EN_REG, BIT(3), 0),
+       RK8XX_DESC(RK818_ID_BOOST, "DCDC_BOOST", "boost", 4700, 5400, 100,
+               RK818_BOOST_LDO9_ON_VSEL_REG, RK818_BOOST_ON_VSEL_MASK,
+               RK818_DCDC_EN_REG, BIT(4), 0),
+       RK8XX_DESC(RK818_ID_LDO1, "LDO_REG1", "vcc6", 1800, 3400, 100,
+               RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(0), 400),
+       RK8XX_DESC(RK818_ID_LDO2, "LDO_REG2", "vcc6", 1800, 3400, 100,
+               RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(1), 400),
+       {
+               .name = "LDO_REG3",
+               .supply_name = "vcc7",
+               .of_match = of_match_ptr("LDO_REG3"),
+               .regulators_node = of_match_ptr("regulators"),
+               .id = RK818_ID_LDO3,
+               .ops = &rk808_reg_ops_ranges,
+               .type = REGULATOR_VOLTAGE,
+               .n_voltages = 16,
+               .linear_ranges = rk808_ldo3_voltage_ranges,
+               .n_linear_ranges = ARRAY_SIZE(rk808_ldo3_voltage_ranges),
+               .vsel_reg = RK818_LDO3_ON_VSEL_REG,
+               .vsel_mask = RK818_LDO3_ON_VSEL_MASK,
+               .enable_reg = RK818_LDO_EN_REG,
+               .enable_mask = BIT(2),
+               .enable_time = 400,
+               .owner = THIS_MODULE,
+       },
+       RK8XX_DESC(RK818_ID_LDO4, "LDO_REG4", "vcc8", 1800, 3400, 100,
+               RK818_LDO4_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(3), 400),
+       RK8XX_DESC(RK818_ID_LDO5, "LDO_REG5", "vcc7", 1800, 3400, 100,
+               RK818_LDO5_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(4), 400),
+       RK8XX_DESC(RK818_ID_LDO6, "LDO_REG6", "vcc8", 800, 2500, 100,
+               RK818_LDO6_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(5), 400),
+       RK8XX_DESC(RK818_ID_LDO7, "LDO_REG7", "vcc7", 800, 2500, 100,
+               RK818_LDO7_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(6), 400),
+       RK8XX_DESC(RK818_ID_LDO8, "LDO_REG8", "vcc8", 1800, 3400, 100,
+               RK818_LDO8_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,
+               BIT(7), 400),
+       RK8XX_DESC(RK818_ID_LDO9, "LDO_REG9", "vcc9", 1800, 3400, 100,
+               RK818_BOOST_LDO9_ON_VSEL_REG, RK818_LDO_VSEL_MASK,
+               RK818_DCDC_EN_REG, BIT(5), 400),
+       RK8XX_DESC_SWITCH(RK818_ID_SWITCH, "SWITCH_REG", "vcc9",
+               RK818_DCDC_EN_REG, BIT(6)),
+       RK8XX_DESC_SWITCH(RK818_ID_HDMI_SWITCH, "HDMI_SWITCH", "h_5v",
+               RK818_H5V_EN_REG, BIT(0)),
+       RK8XX_DESC_SWITCH(RK818_ID_OTG_SWITCH, "OTG_SWITCH", "usb",
+               RK818_DCDC_EN_REG, BIT(7)),
+ };
  static int rk808_regulator_dt_parse_pdata(struct device *dev,
                                   struct device *client_dev,
                                   struct regmap *map,
@@@ -499,7 -611,8 +611,8 @@@ static int rk808_regulator_probe(struc
        struct regulator_config config = {};
        struct regulator_dev *rk808_rdev;
        struct rk808_regulator_data *pdata;
-       int ret, i;
+       const struct regulator_desc *regulators;
+       int ret, i, nregulators;
  
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
  
        platform_set_drvdata(pdev, pdata);
  
+       switch (rk808->variant) {
+       case RK808_ID:
+               regulators = rk808_reg;
+               nregulators = RK808_NUM_REGULATORS;
+               break;
+       case RK818_ID:
+               regulators = rk818_reg;
+               nregulators = RK818_NUM_REGULATORS;
+               break;
+       default:
+               dev_err(&client->dev, "unsupported RK8XX ID %lu\n",
+                       rk808->variant);
+               return -EINVAL;
+       }
        config.dev = &client->dev;
        config.driver_data = pdata;
        config.regmap = rk808->regmap;
  
        /* Instantiate the regulators */
-       for (i = 0; i < RK808_NUM_REGULATORS; i++) {
+       for (i = 0; i < nregulators; i++) {
                rk808_rdev = devm_regulator_register(&pdev->dev,
-                                                    &rk808_reg[i], &config);
+                                                    &regulators[i], &config);
                if (IS_ERR(rk808_rdev)) {
                        dev_err(&client->dev,
                                "failed to register %d regulator\n", i);
  static struct platform_driver rk808_regulator_driver = {
        .probe = rk808_regulator_probe,
        .driver = {
 -              .name = "rk808-regulator",
 -              .owner = THIS_MODULE,
 +              .name = "rk808-regulator"
        },
  };
  
  module_platform_driver(rk808_regulator_driver);
  
- MODULE_DESCRIPTION("regulator driver for the rk808 series PMICs");
- MODULE_AUTHOR("Chris Zhong<[email protected]>");
- MODULE_AUTHOR("Zhang Qing<[email protected]>");
+ MODULE_DESCRIPTION("regulator driver for the RK808/RK818 series PMICs");
+ MODULE_AUTHOR("Chris Zhong <[email protected]>");
+ MODULE_AUTHOR("Zhang Qing <[email protected]>");
+ MODULE_AUTHOR("Wadim Egorov <[email protected]>");
  MODULE_LICENSE("GPL");
  MODULE_ALIAS("platform:rk808-regulator");
This page took 0.20166 seconds and 4 git commands to generate.