From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Apr 2017 13:17:25 +0000 (+0900)
Subject: Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona... 
X-Git-Tag: v4.13~826^2~3
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=59e4c636df102c914b03696df11ec5d988af5df1

Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/bd9571mvw-m' and 'regulator/topic/const' into regulator-next
---

59e4c636df102c914b03696df11ec5d988af5df1
diff --cc MAINTAINERS
index 38d3e4ed7208,9bf5aa617cf2,6ed8ef18e7b6,c265a5fe4848,9bf5aa617cf2..785343129ca0
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -2589,22 -2536,7 -2588,9 -2588,9 -2536,7 +2589,22 @@@@@@ M:	Daniel Borkmann <daniel@iogearbox.ne
     L:	netdev@vger.kernel.org
     L:	linux-kernel@vger.kernel.org
     S:	Supported
 ++++F:	arch/x86/net/bpf_jit*
 ++++F:	Documentation/networking/filter.txt
 ++++F:	include/linux/bpf*
 ++++F:	include/linux/filter.h
 ++++F:	include/uapi/linux/bpf*
 ++++F:	include/uapi/linux/filter.h
     F:	kernel/bpf/
  -- F:	tools/testing/selftests/bpf/
 ++++F:	kernel/trace/bpf_trace.c
 +  +F:	lib/test_bpf.c
 ++++F:	net/bpf/
 ++++F:	net/core/filter.c
 ++++F:	net/sched/act_bpf.c
 ++++F:	net/sched/cls_bpf.c
 ++++F:	samples/bpf/
 ++++F:	tools/net/bpf*
 ++++F:	tools/testing/selftests/bpf/
     
     BROADCOM B44 10/100 ETHERNET DRIVER
     M:	Michael Chan <michael.chan@broadcom.com>
@@@@@@ -8324,13 -8006,6 -8302,14 -8302,14 -8006,6 +8324,13 @@@@@@ F:	drivers/media/platform/atmel/atmel-i
     F:	drivers/media/platform/atmel/atmel-isc-regs.h
     F:	devicetree/bindings/media/atmel-isc.txt
     
 +  +MICROCHIP USB251XB DRIVER
 +  +M:	Richard Leitner <richard.leitner@skidata.com>
 +  +L:	linux-usb@vger.kernel.org
 +  +S:	Maintained
 +  +F:	drivers/usb/misc/usb251xb.c
  -- F:	include/linux/platform_data/usb251xb.h
 +  +F:	Documentation/devicetree/bindings/usb/usb251xb.txt
 +  +
     MICROSOFT SURFACE PRO 3 BUTTON DRIVER
     M:	Chen Yu <yu.c.chen@intel.com>
     L:	platform-driver-x86@vger.kernel.org
@@@@@@ -13319,9 -12814,8 -13296,9 -13296,9 -12814,8 +13319,9 @@@@@@ F:	drivers/virtio
     F:	tools/virtio/
     F:	drivers/net/virtio_net.c
     F:	drivers/block/virtio_blk.c
 ----F:	include/linux/virtio_*.h
 ++++F:	include/linux/virtio*.h
     F:	include/uapi/linux/virtio_*.h
 +  +F:	drivers/crypto/virtio/
     
     VIRTIO DRIVERS FOR S390
     M:	Christian Borntraeger <borntraeger@de.ibm.com>
diff --cc drivers/regulator/Kconfig
index be06eb29c681,936f7ccc9736,c026b09c479c,a27b97c5695b,936f7ccc9736..9ecd70373f0b
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@ -163,13 -163,6 -171,13 -163,24 -163,6 +171,24 @@@@@@ config REGULATOR_BCM590X
     	  BCM590xx PMUs. This will enable support for the software
     	  controllable LDO/Switching regulators.
     
+++ +config REGULATOR_BD9571MWV
+++ +	tristate "ROHM BD9571MWV Regulators"
+++ +	depends on MFD_BD9571MWV
+++ +	help
+++ +	  This driver provides support for the voltage regulators on the
+++ +	  ROHM BD9571MWV PMIC. This will enable support for the software
+++ +	  controllable regulator and voltage sampling units.
+++ +
+++ +	  This driver can also be built as a module. If so, the module
+++ +	  will be called bd9571mwv-regulator.
+++ +
 +  +config REGULATOR_CPCAP
 +  +	tristate "Motorola CPCAP regulator"
 +  +	depends on MFD_CPCAP
 +  +	help
 +  +	  Say y here for CPCAP regulator found on some Motorola phones
 +  +	  and tablets such as Droid 4.
 +  +
     config REGULATOR_DA903X
     	tristate "Dialog Semiconductor DA9030/DA9034 regulators"
     	depends on PMIC_DA903X