]> Git Repo - linux.git/commitdiff
Merge tag 'mfd-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
authorLinus Torvalds <[email protected]>
Thu, 7 Sep 2017 20:51:13 +0000 (13:51 -0700)
committerLinus Torvalds <[email protected]>
Thu, 7 Sep 2017 20:51:13 +0000 (13:51 -0700)
Pull MFD updates from Lee Jones:
 "New Drivers
   - RK805 Power Management IC (PMIC)
   - ROHM BD9571MWV-M MFD Power Management IC (PMIC)
   - Texas Instruments TPS68470 Power Management IC (PMIC) & LEDs

  New Device Support:
   - Add support for HiSilicon Hi6421v530 to hi6421-pmic-core
   - Add support for X-Powers AXP806 to axp20x
   - Add support for X-Powers AXP813 to axp20x
   - Add support for Intel Sunrise Point LPSS to intel-lpss-pci

  New Functionality:
   - Amend API to provide register layout; atmel-smc

  Fix-ups:
   - DT re-work; omap, nokia
   - Header file location change {I2C => MFD}; dm355evm_msp, tps65010
   - Fix chip ID formatting issue(s); rk808
   - Optionally register touchscreen devices; da9052-core
   - Documentation improvements; twl-core
   - Constification; rtsx_pcr, ab8500-core, da9055-i2c, da9052-spi
   - Drop unnecessary static declaration; max8925-i2c
   - Kconfig changes (missing deps and remove module support)
   - Slim down oversized licence statement; hi6421-pmic-core
   - Use managed resources (devm_*); lp87565
   - Supply proper error checking/handling; t7l66xb

  Bug Fixes:
   - Fix counter duplication issue; da9052-core
   - Fix potential NULL deference issue; max8998
   - Leave SPI-NOR write-protection bit alone; lpc_ich
   - Ensure device is put into reset during suspend; intel-lpss
   - Correct register offset variable size; omap-usb-tll"

* tag 'mfd-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (61 commits)
  mfd: intel_soc_pmic: Differentiate between Bay and Cherry Trail CRC variants
  mfd: intel_soc_pmic: Export separate mfd-cell configs for BYT and CHT
  dt-bindings: mfd: Add bindings for ZII RAVE devices
  mfd: omap-usb-tll: Fix register offsets
  mfd: da9052: Constify spi_device_id
  mfd: intel-lpss: Put I2C and SPI controllers into reset state on suspend
  mfd: da9055: Constify i2c_device_id
  mfd: intel-lpss: Add missing PCI ID for Intel Sunrise Point LPSS devices
  mfd: t7l66xb: Handle return value of clk_prepare_enable
  mfd: Add ROHM BD9571MWV-M PMIC DT bindings
  mfd: intel_soc_pmic_chtwc: Turn Kconfig option into a bool
  mfd: lp87565: Convert to use devm_mfd_add_devices()
  mfd: Add support for TPS68470 device
  mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Haswell/Broadwell
  mfd: syscon: atmel-smc: Add helper to retrieve register layout
  mfd: axp20x: Use correct platform device ID for many PEK
  dt-bindings: mfd: axp20x: Introduce bindings for AXP813
  mfd: axp20x: Add support for AXP813 PMIC
  dt-bindings: mfd: axp20x: Add AXP806 to supported list of chips
  mfd: Add ROHM BD9571MWV-M MFD PMIC driver
  ...

1  2 
MAINTAINERS
drivers/iio/adc/stm32-adc.c
drivers/phy/ti/phy-twl4030-usb.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/regulator/Kconfig
sound/soc/codecs/twl4030.c

diff --combined MAINTAINERS
index b07232679a669999d1f031a8b8c2ecfef357dfa0,0876e3e2b8e9fdf00a8ba4dc3069654e4355e8a5..ac2dfb26d899f9b0ad3d6350fca7d934f4e4de66
@@@ -301,7 -301,6 +301,7 @@@ S: Supporte
  F:    drivers/acpi/
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
 +F:    include/linux/fwnode.h
  F:    include/acpi/
  F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
@@@ -311,14 -310,6 +311,14 @@@ F:       drivers/pci/*/*acpi
  F:    drivers/pci/*/*/*acpi*
  F:    tools/power/acpi/
  
 +ACPI APEI
 +M:    "Rafael J. Wysocki" <[email protected]>
 +M:    Len Brown <[email protected]>
 +L:    [email protected]
 +R:    Tony Luck <[email protected]>
 +R:    Borislav Petkov <[email protected]>
 +F:    drivers/acpi/apei/
 +
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <[email protected]>
  M:    Lv Zheng <[email protected]>
@@@ -778,12 -769,6 +778,12 @@@ W:       http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/media/i2c/adv7180.c
  
 +ANALOG DEVICES INC ADV748X DRIVER
 +M:    Kieran Bingham <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv748x/*
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -1168,7 -1153,6 +1168,7 @@@ L:      [email protected]
  F:    arch/arm/mach-artpec
  F:    arch/arm/boot/dts/artpec6*
  F:    drivers/clk/axis
 +F:    drivers/crypto/axis
  F:    drivers/pinctrl/pinctrl-artpec*
  F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
  
@@@ -1298,15 -1282,10 +1298,15 @@@ S:   Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Hans Ulli Kroll <[email protected]>
 +M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/gemini.txt
 +F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 +F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
@@@ -1591,7 -1570,7 +1591,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/phy/phy-mt65xx-usb3.c
 +F:    drivers/phy/mediatek/phy-mtk-tphy.c
  
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <[email protected]>
@@@ -2014,7 -1993,6 +2014,7 @@@ 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/irqchip/irq-uniphier-aidet.c
  F:    drivers/pinctrl/uniphier/
  F:    drivers/reset/reset-uniphier.c
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -2139,12 -2117,6 +2139,12 @@@ S:    Maintaine
  F:    arch/arm64/
  F:    Documentation/arm64/
  
 +AS3645A LED FLASH CONTROLLER DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/leds/leds-as3645a.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -2505,7 -2477,7 +2505,7 @@@ Q:      https://patchwork.open-mesh.org/proj
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
  F:    Documentation/ABI/testing/sysfs-class-net-mesh
 -F:    Documentation/networking/batman-adv.txt
 +F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batman_adv.h
  F:    net/batman-adv/
  
@@@ -4387,12 -4359,6 +4387,12 @@@ S:    Maintaine
  F:    drivers/gpu/drm/qxl/
  F:    include/uapi/drm/qxl_drm.h
  
 +DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
 +M:    Noralf Trønnes <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/repaper.c
 +F:    Documentation/devicetree/bindings/display/repaper.txt
 +
  DRM DRIVER FOR RAGE 128 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/r128/
@@@ -4408,12 -4374,6 +4408,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/sis/
  F:    include/uapi/drm/sis_drm.h
  
 +DRM DRIVER FOR SITRONIX ST7586 PANELS
 +M:    David Lechner <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/st7586.c
 +F:    Documentation/devicetree/bindings/display/st7586.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -4662,14 -4622,6 +4662,14 @@@ F:    drivers/gpu/drm/panel
  F:    include/drm/drm_panel.h
  F:    Documentation/devicetree/bindings/display/panel/
  
 +DRM TINYDRM DRIVERS
 +M:    Noralf Trønnes <[email protected]>
 +W:    https://github.com/notro/tinydrm/wiki/Development
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/
 +F:    include/drm/tinydrm/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -5149,7 -5101,6 +5149,7 @@@ F:      include/linux/of_net.
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
  F:    include/linux/platform_data/mdio-gpio.h
 +F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
@@@ -5390,11 -5341,10 +5390,11 @@@ K:   fmc_d.*registe
  
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <[email protected]>
 -R:    Moritz Fischer <m[email protected]>
 +R:    Moritz Fischer <m[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
 +Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
@@@ -5813,12 -5763,6 +5813,12 @@@ S:    Maintaine
  F:    Documentation/acpi/gpio-properties.txt
  F:    drivers/gpio/gpiolib-acpi.c
  
 +GPIO IR Transmitter
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/gpio-ir-tx.c
 +
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <[email protected]>
  L:    [email protected]
@@@ -6203,14 -6147,6 +6203,14 @@@ S:    Maintaine
  F:    drivers/net/ethernet/hisilicon/
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  
 +HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 +M:    Yisen Zhuang <[email protected]>
 +M:    Salil Mehta <[email protected]>
 +L:    [email protected]
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/net/ethernet/hisilicon/hns3/
 +
  HISILICON ROCE DRIVER
  M:    Lijun Ou <[email protected]>
  M:    Wei Hu(Xavier) <[email protected]>
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HUAWEI ETHERNET DRIVER
 +M:    Aviad Krawczyk <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/hinic.txt
 +F:    drivers/net/ethernet/huawei/hinic/
 +
  HUGETLB FILESYSTEM
  M:    Nadia Yvette Chambers <[email protected]>
  S:    Maintained
@@@ -6328,9 -6257,7 +6328,9 @@@ M:      Haiyang Zhang <[email protected]
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
 +F:    arch/x86/include/asm/trace/hyperv.h
  F:    arch/x86/include/uapi/asm/hyperv.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
@@@ -6342,9 -6269,7 +6342,9 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
 +F:    include/uapi/linux/hyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
  
 +IBM Power Virtual Accelerator Switchboard
 +M:    Sukadev Bhattiprolu
 +L:    [email protected]
 +S:    Supported
 +F:    arch/powerpc/platforms/powernv/vas*
 +F:    arch/powerpc/platforms/powernv/copy-paste.h
 +F:    arch/powerpc/include/asm/vas.h
 +F:    arch/powerpc/include/uapi/asm/vas.h
 +
  IBM Power Virtual Ethernet Device Driver
  M:    Thomas Falcon <[email protected]>
  L:    [email protected]
@@@ -6828,9 -6744,8 +6828,9 @@@ S:      Supporte
  F:    drivers/scsi/isci/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Daniel Vetter <[email protected]>
  M:    Jani Nikula <[email protected]>
 +M:    Joonas Lahtinen <[email protected]>
 +M:    Rodrigo Vivi <[email protected]>
  L:    [email protected]
  W:    https://01.org/linuxgraphics/
  B:    https://01.org/linuxgraphics/documentation/how-report-bugs
@@@ -7168,7 -7083,9 +7168,7 @@@ W:      http://irda.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
 -F:    drivers/net/irda/
 -F:    include/net/irda/
 -F:    net/irda/
 +F:    drivers/staging/irda/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
@@@ -7722,6 -7639,17 +7722,6 @@@ T:     git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/dvb-frontends/lgdt3305.*
  
 -LGUEST
 -M:    Rusty Russell <[email protected]>
 -L:    [email protected]
 -W:    http://lguest.ozlabs.org/
 -S:    Odd Fixes
 -F:    arch/x86/include/asm/lguest*.h
 -F:    arch/x86/lguest/
 -F:    drivers/lguest/
 -F:    include/linux/lguest*.h
 -F:    tools/lguest/
 -
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -7857,7 -7785,6 +7857,7 @@@ F:      drivers/pci/hotplug/rpa
  F:    drivers/rtc/rtc-opal.c
  F:    drivers/scsi/ibmvscsi/
  F:    drivers/tty/hvc/hvc_opal.c
 +F:    drivers/watchdog/wdrtas.c
  F:    tools/testing/selftests/powerpc
  N:    /pmac
  N:    powermac
@@@ -8415,14 -8342,6 +8415,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/lnbh25*
  
 +MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/mxl5xx*
 +
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
@@@ -8479,30 -8398,6 +8479,30 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
  F:    drivers/media/platform/vsp1/
  
 +MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv0910*
 +
 +MEDIA DRIVERS FOR ST STV6111 TUNER ICs
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv6111*
 +
 +MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/pci/ddbridge/*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -8528,9 -8423,7 +8528,9 @@@ F:      include/uapi/linux/uvcvideo.
  
  MEDIATEK ETHERNET DRIVER
  M:    Felix Fietkau <[email protected]>
 -M:    John Crispin <[email protected]>
 +M:    John Crispin <[email protected]>
 +M:    Sean Wang <[email protected]>
 +M:    Nelson Chang <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK CIR DRIVER
 +M:    Sean Wang <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/mtk-cir.c
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
  M:    Sean Wang <[email protected]>
  S:    Maintained
  F:    drivers/char/hw_random/mtk-rng.c
  
 +MEDIATEK USB3 DRD IP DRIVER
 +M:    Chunfeng Yun <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/usb/mtu3/
 +
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
  M:    Martin Donnelly <[email protected]>
@@@ -8748,7 -8628,7 +8748,7 @@@ M:      Mathieu Desnoyers <mathieu.desnoyers
  M:    "Paul E. McKenney" <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    kernel/membarrier.c
 +F:    kernel/sched/membarrier.c
  F:    include/uapi/linux/membarrier.h
  
  MEMORY MANAGEMENT
@@@ -8802,16 -8682,6 +8802,16 @@@ F:    drivers/leds/leds-menf21bmc.
  F:    drivers/hwmon/menf21bmc_hwmon.c
  F:    Documentation/hwmon/menf21bmc
  
 +MESON AO CEC DRIVER FOR AMLOGIC SOCS
 +M:    Neil Armstrong <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/media/platform/meson/ao-cec.c
 +F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
 +T:    git git://linuxtv.org/media_tree.git
 +
  METAG ARCHITECTURE
  M:    James Hogan <[email protected]>
  L:    [email protected]
@@@ -8848,12 -8718,6 +8848,12 @@@ F:    drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
  
 +MICROCHIP / ATMEL ECC DRIVER
 +M:    Tudor Ambarus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/atmel-ecc.*
 +
  MICROCHIP / ATMEL ISC DRIVER
  M:    Songjun Wu <[email protected]>
  L:    [email protected]
@@@ -9601,7 -9465,6 +9601,7 @@@ M:      Srinivas Kandagatla <srinivas.kandag
  S:    Maintained
  F:    drivers/nvmem/
  F:    Documentation/devicetree/bindings/nvmem/
 +F:    Documentation/ABI/stable/sysfs-bus-nvmem
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
@@@ -9845,7 -9708,7 +9845,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Ramiro Oliveira <roliveir@synopsys.com>
 +M:    Luis Oliveira <lolivei@synopsys.com>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/pulse8-cec/*
 +F:    Documentation/media/cec-drivers/pulse8-cec.rst
  
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <[email protected]>
@@@ -10871,12 -10733,6 +10871,12 @@@ F: Documentation/devicetree/bindings/hw
  F:    Documentation/hwmon/pwm-fan
  F:    drivers/hwmon/pwm-fan.c
  
 +PWM IR Transmitter
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/pwm-ir-tx.c
 +
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
@@@ -11071,14 -10927,6 +11071,14 @@@ W: http://wireless.kernel.org/en/users/
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
 +QUALCOMM CAMERA SUBSYSTEM DRIVER
 +M:    Todor Tomov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/qcom,camss.txt
 +F:    Documentation/media/v4l-drivers/qcom_camss.rst
 +F:    drivers/media/platform/qcom/camss-8x16/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -11262,7 -11110,7 +11262,7 @@@ M:   Fenghua Yu <[email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/intel_rdt*
 -F:    arch/x86/include/asm/intel_rdt*
 +F:    arch/x86/include/asm/intel_rdt_sched.h
  F:    Documentation/x86/intel_rdt*
  
  READ-COPY UPDATE (RCU)
  S:    Odd Fixes
  F:    drivers/tty/serial/rp2.*
  
+ ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
+ M:    Marek Vasut <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/mfd/bd9571mwv.c
+ F:    drivers/regulator/bd9571mwv-regulator.c
+ F:    drivers/gpio/gpio-bd9571mwv.c
+ F:    include/linux/mfd/bd9571mwv.h
+ F:    Documentation/devicetree/bindings/mfd/bd9571mwv.txt
  ROSE NETWORK LAYER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -12641,12 -12500,6 +12652,12 @@@ M: Ion Badulescu <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STEC S1220 SKD DRIVER
 +M:    Bart Van Assche <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/block/skd*[ch]
 +
  STI CEC DRIVER
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
@@@ -13150,11 -13003,6 +13161,11 @@@ M: Yehezkel Bernat <yehezkel.bernat@int
  S:    Maintained
  F:    drivers/thunderbolt/
  
 +THUNDERX GPIO DRIVER
 +M:    David Daney <[email protected]>
 +S:    Maintained
 +F:    drivers/gpio/gpio-thunderx.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
index 6bc602891f2f061bcf5253459df1781e8a0d595f,1147d7e9055bb90aed65afe0dac1acfadac0884e..e3c15f88075f7beb37b290e0a7d89bcc5bcd35d1
@@@ -25,6 -25,7 +25,7 @@@
  #include <linux/dmaengine.h>
  #include <linux/iio/iio.h>
  #include <linux/iio/buffer.h>
+ #include <linux/iio/timer/stm32-lptim-trigger.h>
  #include <linux/iio/timer/stm32-timer-trigger.h>
  #include <linux/iio/trigger.h>
  #include <linux/iio/trigger_consumer.h>
@@@ -83,8 -84,6 +84,8 @@@
  #define STM32H7_ADC_IER                       0x04
  #define STM32H7_ADC_CR                        0x08
  #define STM32H7_ADC_CFGR              0x0C
 +#define STM32H7_ADC_SMPR1             0x14
 +#define STM32H7_ADC_SMPR2             0x18
  #define STM32H7_ADC_PCSEL             0x1C
  #define STM32H7_ADC_SQR1              0x30
  #define STM32H7_ADC_SQR2              0x34
@@@ -153,7 -152,6 +154,7 @@@ enum stm32h7_adc_dmngt 
  #define STM32H7_BOOST_CLKRATE         20000000UL
  
  #define STM32_ADC_MAX_SQ              16      /* SQ1..SQ16 */
 +#define STM32_ADC_MAX_SMP             7       /* SMPx range is [0..7] */
  #define STM32_ADC_TIMEOUT_US          100000
  #define STM32_ADC_TIMEOUT     (msecs_to_jiffies(STM32_ADC_TIMEOUT_US / 1000))
  
@@@ -185,6 -183,11 +186,11 @@@ enum stm32_adc_extsel 
        STM32_EXT13,
        STM32_EXT14,
        STM32_EXT15,
+       STM32_EXT16,
+       STM32_EXT17,
+       STM32_EXT18,
+       STM32_EXT19,
+       STM32_EXT20,
  };
  
  /**
@@@ -230,8 -233,6 +236,8 @@@ struct stm32_adc_regs 
   * @exten:            trigger control register & bitfield
   * @extsel:           trigger selection register & bitfield
   * @res:              resolution selection register & bitfield
 + * @smpr:             smpr1 & smpr2 registers offset array
 + * @smp_bits:         smpr1 & smpr2 index and bitfields
   */
  struct stm32_adc_regspec {
        const u32 dr;
        const struct stm32_adc_regs exten;
        const struct stm32_adc_regs extsel;
        const struct stm32_adc_regs res;
 +      const u32 smpr[2];
 +      const struct stm32_adc_regs *smp_bits;
  };
  
  struct stm32_adc;
   * @start_conv:               routine to start conversions
   * @stop_conv:                routine to stop conversions
   * @unprepare:                optional unprepare routine (disable, power-down)
 + * @smp_cycles:               programmable sampling time (ADC clock cycles)
   */
  struct stm32_adc_cfg {
        const struct stm32_adc_regspec  *regs;
        void (*start_conv)(struct stm32_adc *, bool dma);
        void (*stop_conv)(struct stm32_adc *);
        void (*unprepare)(struct stm32_adc *);
 +      const unsigned int *smp_cycles;
  };
  
  /**
   * @rx_dma_buf:               dma rx buffer bus address
   * @rx_buf_sz:                dma rx buffer size
   * @pcsel             bitmask to preselect channels on some devices
 + * @smpr_val:         sampling time settings (e.g. smpr1 / smpr2)
   * @cal:              optional calibration data on some devices
   */
  struct stm32_adc {
        dma_addr_t              rx_dma_buf;
        unsigned int            rx_buf_sz;
        u32                     pcsel;
 +      u32                     smpr_val[2];
        struct stm32_adc_calib  cal;
  };
  
@@@ -442,39 -437,6 +448,39 @@@ static struct stm32_adc_trig_info stm32
        {}, /* sentinel */
  };
  
 +/**
 + * stm32f4_smp_bits[] - describe sampling time register index & bit fields
 + * Sorted so it can be indexed by channel number.
 + */
 +static const struct stm32_adc_regs stm32f4_smp_bits[] = {
 +      /* STM32F4_ADC_SMPR2: smpr[] index, mask, shift for SMP0 to SMP9 */
 +      { 1, GENMASK(2, 0), 0 },
 +      { 1, GENMASK(5, 3), 3 },
 +      { 1, GENMASK(8, 6), 6 },
 +      { 1, GENMASK(11, 9), 9 },
 +      { 1, GENMASK(14, 12), 12 },
 +      { 1, GENMASK(17, 15), 15 },
 +      { 1, GENMASK(20, 18), 18 },
 +      { 1, GENMASK(23, 21), 21 },
 +      { 1, GENMASK(26, 24), 24 },
 +      { 1, GENMASK(29, 27), 27 },
 +      /* STM32F4_ADC_SMPR1, smpr[] index, mask, shift for SMP10 to SMP18 */
 +      { 0, GENMASK(2, 0), 0 },
 +      { 0, GENMASK(5, 3), 3 },
 +      { 0, GENMASK(8, 6), 6 },
 +      { 0, GENMASK(11, 9), 9 },
 +      { 0, GENMASK(14, 12), 12 },
 +      { 0, GENMASK(17, 15), 15 },
 +      { 0, GENMASK(20, 18), 18 },
 +      { 0, GENMASK(23, 21), 21 },
 +      { 0, GENMASK(26, 24), 24 },
 +};
 +
 +/* STM32F4 programmable sampling time (ADC clock cycles) */
 +static const unsigned int stm32f4_adc_smp_cycles[STM32_ADC_MAX_SMP + 1] = {
 +      3, 15, 28, 56, 84, 112, 144, 480,
 +};
 +
  static const struct stm32_adc_regspec stm32f4_adc_regspec = {
        .dr = STM32F4_ADC_DR,
        .ier_eoc = { STM32F4_ADC_CR1, STM32F4_EOCIE },
        .extsel = { STM32F4_ADC_CR2, STM32F4_EXTSEL_MASK,
                    STM32F4_EXTSEL_SHIFT },
        .res = { STM32F4_ADC_CR1, STM32F4_RES_MASK, STM32F4_RES_SHIFT },
 +      .smpr = { STM32F4_ADC_SMPR1, STM32F4_ADC_SMPR2 },
 +      .smp_bits = stm32f4_smp_bits,
  };
  
  static const struct stm32_adc_regs stm32h7_sq[STM32_ADC_MAX_SQ + 1] = {
@@@ -526,43 -486,12 +532,46 @@@ static struct stm32_adc_trig_info stm32
        { TIM4_TRGO, STM32_EXT12 },
        { TIM6_TRGO, STM32_EXT13 },
        { TIM3_CH4, STM32_EXT15 },
+       { LPTIM1_OUT, STM32_EXT18 },
+       { LPTIM2_OUT, STM32_EXT19 },
+       { LPTIM3_OUT, STM32_EXT20 },
        {},
  };
  
 +/**
 + * stm32h7_smp_bits - describe sampling time register index & bit fields
 + * Sorted so it can be indexed by channel number.
 + */
 +static const struct stm32_adc_regs stm32h7_smp_bits[] = {
 +      /* STM32H7_ADC_SMPR1, smpr[] index, mask, shift for SMP0 to SMP9 */
 +      { 0, GENMASK(2, 0), 0 },
 +      { 0, GENMASK(5, 3), 3 },
 +      { 0, GENMASK(8, 6), 6 },
 +      { 0, GENMASK(11, 9), 9 },
 +      { 0, GENMASK(14, 12), 12 },
 +      { 0, GENMASK(17, 15), 15 },
 +      { 0, GENMASK(20, 18), 18 },
 +      { 0, GENMASK(23, 21), 21 },
 +      { 0, GENMASK(26, 24), 24 },
 +      { 0, GENMASK(29, 27), 27 },
 +      /* STM32H7_ADC_SMPR2, smpr[] index, mask, shift for SMP10 to SMP19 */
 +      { 1, GENMASK(2, 0), 0 },
 +      { 1, GENMASK(5, 3), 3 },
 +      { 1, GENMASK(8, 6), 6 },
 +      { 1, GENMASK(11, 9), 9 },
 +      { 1, GENMASK(14, 12), 12 },
 +      { 1, GENMASK(17, 15), 15 },
 +      { 1, GENMASK(20, 18), 18 },
 +      { 1, GENMASK(23, 21), 21 },
 +      { 1, GENMASK(26, 24), 24 },
 +      { 1, GENMASK(29, 27), 27 },
 +};
 +
 +/* STM32H7 programmable sampling time (ADC clock cycles, rounded down) */
 +static const unsigned int stm32h7_adc_smp_cycles[STM32_ADC_MAX_SMP + 1] = {
 +      1, 2, 8, 16, 32, 64, 387, 810,
 +};
 +
  static const struct stm32_adc_regspec stm32h7_adc_regspec = {
        .dr = STM32H7_ADC_DR,
        .ier_eoc = { STM32H7_ADC_IER, STM32H7_EOCIE },
        .extsel = { STM32H7_ADC_CFGR, STM32H7_EXTSEL_MASK,
                    STM32H7_EXTSEL_SHIFT },
        .res = { STM32H7_ADC_CFGR, STM32H7_RES_MASK, STM32H7_RES_SHIFT },
 +      .smpr = { STM32H7_ADC_SMPR1, STM32H7_ADC_SMPR2 },
 +      .smp_bits = stm32h7_smp_bits,
  };
  
  /**
@@@ -1015,7 -942,6 +1024,7 @@@ static void stm32h7_adc_unprepare(struc
   * @scan_mask: channels to be converted
   *
   * Conversion sequence :
 + * Apply sampling time settings for all channels.
   * Configure ADC scan sequence based on selected channels in scan_mask.
   * Add channels to SQR registers, from scan_mask LSB to MSB, then
   * program sequence len.
@@@ -1029,10 -955,6 +1038,10 @@@ static int stm32_adc_conf_scan_seq(stru
        u32 val, bit;
        int i = 0;
  
 +      /* Apply sampling time settings */
 +      stm32_adc_writel(adc, adc->cfg->regs->smpr[0], adc->smpr_val[0]);
 +      stm32_adc_writel(adc, adc->cfg->regs->smpr[1], adc->smpr_val[1]);
 +
        for_each_set_bit(bit, scan_mask, indio_dev->masklength) {
                chan = indio_dev->channels + bit;
                /*
@@@ -1082,7 -1004,8 +1091,8 @@@ static int stm32_adc_get_trig_extsel(st
                 * Checking both stm32 timer trigger type and trig name
                 * should be safe against arbitrary trigger names.
                 */
-               if (is_stm32_timer_trigger(trig) &&
+               if ((is_stm32_timer_trigger(trig) ||
+                    is_stm32_lptim_trigger(trig)) &&
                    !strcmp(adc->cfg->trigs[i].name, trig->name)) {
                        return adc->cfg->trigs[i].extsel;
                }
@@@ -1166,7 -1089,6 +1176,7 @@@ static const struct iio_enum stm32_adc_
   * @res: conversion result
   *
   * The function performs a single conversion on a given channel:
 + * - Apply sampling time settings
   * - Program sequencer with one channel (e.g. in SQ1 with len = 1)
   * - Use SW trigger
   * - Start conversion, then wait for interrupt completion.
@@@ -1191,10 -1113,6 +1201,10 @@@ static int stm32_adc_single_conv(struc
                        return ret;
        }
  
 +      /* Apply sampling time settings */
 +      stm32_adc_writel(adc, regs->smpr[0], adc->smpr_val[0]);
 +      stm32_adc_writel(adc, regs->smpr[1], adc->smpr_val[1]);
 +
        /* Program chan number in regular sequence (SQ1) */
        val = stm32_adc_readl(adc, regs->sqr[1].reg);
        val &= ~regs->sqr[1].mask;
@@@ -1599,28 -1517,10 +1609,28 @@@ static int stm32_adc_of_get_resolution(
        return 0;
  }
  
 +static void stm32_adc_smpr_init(struct stm32_adc *adc, int channel, u32 smp_ns)
 +{
 +      const struct stm32_adc_regs *smpr = &adc->cfg->regs->smp_bits[channel];
 +      u32 period_ns, shift = smpr->shift, mask = smpr->mask;
 +      unsigned int smp, r = smpr->reg;
 +
 +      /* Determine sampling time (ADC clock cycles) */
 +      period_ns = NSEC_PER_SEC / adc->common->rate;
 +      for (smp = 0; smp <= STM32_ADC_MAX_SMP; smp++)
 +              if ((period_ns * adc->cfg->smp_cycles[smp]) >= smp_ns)
 +                      break;
 +      if (smp > STM32_ADC_MAX_SMP)
 +              smp = STM32_ADC_MAX_SMP;
 +
 +      /* pre-build sampling time registers (e.g. smpr1, smpr2) */
 +      adc->smpr_val[r] = (adc->smpr_val[r] & ~mask) | (smp << shift);
 +}
 +
  static void stm32_adc_chan_init_one(struct iio_dev *indio_dev,
                                    struct iio_chan_spec *chan,
                                    const struct stm32_adc_chan_spec *channel,
 -                                  int scan_index)
 +                                  int scan_index, u32 smp)
  {
        struct stm32_adc *adc = iio_priv(indio_dev);
  
        chan->scan_type.storagebits = 16;
        chan->ext_info = stm32_adc_ext_info;
  
 +      /* Prepare sampling time settings */
 +      stm32_adc_smpr_init(adc, chan->channel, smp);
 +
        /* pre-build selected channels mask */
        adc->pcsel |= BIT(chan->channel);
  }
@@@ -1651,8 -1548,8 +1661,8 @@@ static int stm32_adc_chan_of_init(struc
        struct property *prop;
        const __be32 *cur;
        struct iio_chan_spec *channels;
 -      int scan_index = 0, num_channels;
 -      u32 val;
 +      int scan_index = 0, num_channels, ret;
 +      u32 val, smp = 0;
  
        num_channels = of_property_count_u32_elems(node, "st,adc-channels");
        if (num_channels < 0 ||
                return num_channels < 0 ? num_channels : -EINVAL;
        }
  
 +      /* Optional sample time is provided either for each, or all channels */
 +      ret = of_property_count_u32_elems(node, "st,min-sample-time-nsecs");
 +      if (ret > 1 && ret != num_channels) {
 +              dev_err(&indio_dev->dev, "Invalid st,min-sample-time-nsecs\n");
 +              return -EINVAL;
 +      }
 +
        channels = devm_kcalloc(&indio_dev->dev, num_channels,
                                sizeof(struct iio_chan_spec), GFP_KERNEL);
        if (!channels)
                        dev_err(&indio_dev->dev, "Invalid channel %d\n", val);
                        return -EINVAL;
                }
 +
 +              /*
 +               * Using of_property_read_u32_index(), smp value will only be
 +               * modified if valid u32 value can be decoded. This allows to
 +               * get either no value, 1 shared value for all indexes, or one
 +               * value per channel.
 +               */
 +              of_property_read_u32_index(node, "st,min-sample-time-nsecs",
 +                                         scan_index, &smp);
 +
                stm32_adc_chan_init_one(indio_dev, &channels[scan_index],
                                        &adc_info->channels[val],
 -                                      scan_index);
 +                                      scan_index, smp);
                scan_index++;
        }
  
@@@ -1764,7 -1644,7 +1774,7 @@@ static int stm32_adc_probe(struct platf
        indio_dev->dev.parent = &pdev->dev;
        indio_dev->dev.of_node = pdev->dev.of_node;
        indio_dev->info = &stm32_adc_iio_info;
-       indio_dev->modes = INDIO_DIRECT_MODE;
+       indio_dev->modes = INDIO_DIRECT_MODE | INDIO_HARDWARE_TRIGGERED;
  
        platform_set_drvdata(pdev, adc);
  
@@@ -1885,7 -1765,6 +1895,7 @@@ static const struct stm32_adc_cfg stm32
        .clk_required = true,
        .start_conv = stm32f4_adc_start_conv,
        .stop_conv = stm32f4_adc_stop_conv,
 +      .smp_cycles = stm32f4_adc_smp_cycles,
  };
  
  static const struct stm32_adc_cfg stm32h7_adc_cfg = {
        .stop_conv = stm32h7_adc_stop_conv,
        .prepare = stm32h7_adc_prepare,
        .unprepare = stm32h7_adc_unprepare,
 +      .smp_cycles = stm32h7_adc_smp_cycles,
  };
  
  static const struct of_device_id stm32_adc_of_match[] = {
index 0e901386818875094d5072c8a8089e925017e0b3,28f49902760d829674b729d85b064aaaa1d8c0b2..a44680d64f9b479dc62b30520a901fd569af135e
@@@ -36,7 -36,7 +36,7 @@@
  #include <linux/pm_runtime.h>
  #include <linux/usb/musb.h>
  #include <linux/usb/ulpi.h>
- #include <linux/i2c/twl.h>
+ #include <linux/mfd/twl.h>
  #include <linux/regulator/consumer.h>
  #include <linux/err.h>
  #include <linux/slab.h>
@@@ -185,7 -185,7 +185,7 @@@ struct twl4030_usb 
  static int twl4030_i2c_write_u8_verify(struct twl4030_usb *twl,
                u8 module, u8 data, u8 address)
  {
 -      u8 check;
 +      u8 check = 0xFF;
  
        if ((twl_i2c_write_u8(module, data, address) >= 0) &&
            (twl_i2c_read_u8(module, &check, address) >= 0) &&
diff --combined drivers/pinctrl/Kconfig
index 34ad10873452b5b0ef28edcb88fa28ff13885f11,124fe2c09c612127c8bf4d3275d1b07cc1d40eb6..1778cf4f81c7853638b46139204d3ee71e3b396d
@@@ -146,13 -146,6 +146,13 @@@ config PINCTRL_FALCO
        depends on SOC_FALCON
        depends on PINCTRL_LANTIQ
  
 +config PINCTRL_GEMINI
 +      bool
 +      depends on ARCH_GEMINI
 +      default ARCH_GEMINI
 +      select PINMUX
 +      select MFD_SYSCON
 +
  config PINCTRL_MCP23S08
        tristate "Microchip MCP23xxx I/O expander"
        depends on SPI_MASTER || I2C
@@@ -338,6 -331,15 +338,15 @@@ config PINCTRL_INGENI
        select GENERIC_PINMUX_FUNCTIONS
        select REGMAP_MMIO
  
+ config PINCTRL_RK805
+       tristate "Pinctrl and GPIO driver for RK805 PMIC"
+       depends on MFD_RK808
+       select GPIOLIB
+       select PINMUX
+       select GENERIC_PINCONF
+       help
+         This selects the pinctrl driver for RK805.
  source "drivers/pinctrl/aspeed/Kconfig"
  source "drivers/pinctrl/bcm/Kconfig"
  source "drivers/pinctrl/berlin/Kconfig"
@@@ -350,7 -352,6 +359,7 @@@ source "drivers/pinctrl/qcom/Kconfig
  source "drivers/pinctrl/samsung/Kconfig"
  source "drivers/pinctrl/sh-pfc/Kconfig"
  source "drivers/pinctrl/spear/Kconfig"
 +source "drivers/pinctrl/sprd/Kconfig"
  source "drivers/pinctrl/stm32/Kconfig"
  source "drivers/pinctrl/sunxi/Kconfig"
  source "drivers/pinctrl/tegra/Kconfig"
diff --combined drivers/pinctrl/Makefile
index 4c44703ac97fcf923ac5cff9350b15359ca72d22,792ffaeaf34002d69b308bd80903fc14dce953ce..c16e27900dbb7e00fe17f2a94dd1f5a87cb0a111
@@@ -18,7 -18,6 +18,7 @@@ obj-$(CONFIG_PINCTRL_AMD)     += pinctrl-am
  obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o
  obj-$(CONFIG_PINCTRL_DIGICOLOR)       += pinctrl-digicolor.o
  obj-$(CONFIG_PINCTRL_FALCON)  += pinctrl-falcon.o
 +obj-$(CONFIG_PINCTRL_GEMINI)  += pinctrl-gemini.o
  obj-$(CONFIG_PINCTRL_MAX77620)        += pinctrl-max77620.o
  obj-$(CONFIG_PINCTRL_MCP23S08)        += pinctrl-mcp23s08.o
  obj-$(CONFIG_PINCTRL_MESON)   += meson/
@@@ -43,6 -42,7 +43,7 @@@ obj-$(CONFIG_PINCTRL_TB10X)   += pinctrl-
  obj-$(CONFIG_PINCTRL_ST)      += pinctrl-st.o
  obj-$(CONFIG_PINCTRL_ZYNQ)    += pinctrl-zynq.o
  obj-$(CONFIG_PINCTRL_INGENIC) += pinctrl-ingenic.o
+ obj-$(CONFIG_PINCTRL_RK805)   += pinctrl-rk805.o
  
  obj-$(CONFIG_ARCH_ASPEED)     += aspeed/
  obj-y                         += bcm/
@@@ -56,7 -56,6 +57,7 @@@ obj-$(CONFIG_ARCH_QCOM)               += qcom
  obj-$(CONFIG_PINCTRL_SAMSUNG) += samsung/
  obj-$(CONFIG_PINCTRL_SH_PFC)  += sh-pfc/
  obj-$(CONFIG_PINCTRL_SPEAR)   += spear/
 +obj-y                         += sprd/
  obj-$(CONFIG_PINCTRL_STM32)   += stm32/
  obj-$(CONFIG_PINCTRL_SUNXI)   += sunxi/
  obj-y                         += ti/
index e740a66cb1d6157a0bd1468c4ab2526ccf42fdd9,008ab58cd19b431c01d68fdfd13ed91af4239c46..0fd6195601baa6f0f53c858a532a6b6b37999c4f
@@@ -559,15 -559,6 +559,15 @@@ config REGULATOR_MT632
          This driver supports the control of different power rails of device
          through regulator interface.
  
 +config REGULATOR_MT6380
 +      tristate "MediaTek MT6380 PMIC"
 +      depends on MTK_PMIC_WRAP
 +      help
 +        Say y here to select this option to enable the power regulator of
 +        MediaTek MT6380 PMIC.
 +        This driver supports the control of different power rails of device
 +        through regulator interface.
 +
  config REGULATOR_MT6397
        tristate "MediaTek MT6397 PMIC"
        depends on MFD_MT6397
@@@ -696,11 -687,11 +696,11 @@@ config REGULATOR_RC5T58
          outputs which can be controlled by i2c communication.
  
  config REGULATOR_RK808
-       tristate "Rockchip RK808/RK818 Power regulators"
+       tristate "Rockchip RK805/RK808/RK818 Power regulators"
        depends on MFD_RK808
        help
          Select this option to enable the power regulator of ROCKCHIP
-         PMIC RK808 and RK818.
+         PMIC RK805,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.
@@@ -709,8 -700,8 +709,8 @@@ config REGULATOR_RN5T61
        tristate "Ricoh RN5T567/618 voltage regulators"
        depends on MFD_RN5T618
        help
 -        Say y here to support the regulators found on Ricoh RN5T567 or
 -        RN5T618 PMIC.
 +        Say y here to support the regulators found on Ricoh RN5T567,
 +        RN5T618 or RC5T619 PMIC.
  
  config REGULATOR_RT5033
        tristate "Richtek RT5033 Regulators"
@@@ -755,18 -746,6 +755,18 @@@ config REGULATOR_SKY8145
          This driver can also be built as a module. If so, the module
          will be called sky81452-regulator.
  
 +config REGULATOR_STM32_VREFBUF
 +      tristate "STMicroelectronics STM32 VREFBUF"
 +      depends on ARCH_STM32 || COMPILE_TEST
 +      help
 +        This driver supports STMicroelectronics STM32 VREFBUF (voltage
 +        reference buffer) which can be used as voltage reference for
 +        internal ADCs, DACs and also for external components through
 +        dedicated Vref+ pin.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called stm32-vrefbuf.
 +
  config REGULATOR_TI_ABB
        tristate "TI Adaptive Body Bias on-chip LDO"
        depends on ARCH_OMAP
index d439c4c6fe50a9def802a3ad86419c0900527c17,bd86a2d78c5ff24f9935217f4ee9f8620f133df6..c482b2e7a7d2a55d7ead20e56a680da6c0791378
@@@ -28,7 -28,7 +28,7 @@@
  #include <linux/platform_device.h>
  #include <linux/of.h>
  #include <linux/of_gpio.h>
- #include <linux/i2c/twl.h>
+ #include <linux/mfd/twl.h>
  #include <linux/slab.h>
  #include <linux/gpio.h>
  #include <sound/core.h>
@@@ -2191,7 -2191,7 +2191,7 @@@ static int twl4030_soc_remove(struct sn
        return 0;
  }
  
 -static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
 +static const struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
        .probe = twl4030_soc_probe,
        .remove = twl4030_soc_remove,
        .read = twl4030_read,
This page took 0.215459 seconds and 4 git commands to generate.