Commit 59e4c636 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/anatop',... 

Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/bd9571mvw-m' and 'regulator/topic/const' into regulator-next
parents bde1e61b 0e69c2ec af367afa e85c5a15 5339c34f

Documentation/devicetree/bindings/regulator/anatop-regulator.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Anatop Voltage regulators 


Required properties:

- compatible: Must be "fsl,anatop-regulator"

- regulator-name: A string used as a descriptive name for regulator outputs

- anatop-reg-offset: Anatop MFD register offset

- anatop-vol-bit-shift: Bit shift for the register

- anatop-vol-bit-width: Number of bits used in the register

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -13631,12 +13631,14 @@ F: drivers/mfd/cs47l24* 
F:	drivers/power/supply/wm83*.c

F:	drivers/rtc/rtc-wm83*.c

F:	drivers/regulator/wm8*.c

F:	drivers/regulator/arizona*

F:	drivers/video/backlight/wm83*_bl.c

F:	drivers/watchdog/wm83*_wdt.c

F:	include/linux/mfd/arizona/

F:	include/linux/mfd/wm831x/

F:	include/linux/mfd/wm8350/

F:	include/linux/mfd/wm8400*

F:	include/linux/regulator/arizona*

F:	include/linux/wm97xx.h

F:	include/sound/wm????.h

F:	sound/soc/codecs/arizona.?

arch/arm/mach-s3c64xx/mach-crag6410-module.c

+6 −2
Original line number Diff line number Diff line
@@ -209,7 +209,9 @@ static const struct i2c_board_info wm1277_devs[] = { 
};



static struct arizona_pdata wm5102_reva_pdata = {

	.ldo1 = {

		.ldoena = S3C64XX_GPN(7),

	},

	.gpio_base = CODEC_GPIO_BASE,

	.irq_flags = IRQF_TRIGGER_HIGH,

	.micd_pol_gpio = CODEC_GPIO_BASE + 4,
@@ -239,7 +241,9 @@ static struct spi_board_info wm5102_reva_spi_devs[] = { 
};



static struct arizona_pdata wm5102_pdata = {

	.ldo1 = {

		.ldoena = S3C64XX_GPN(7),

	},

	.gpio_base = CODEC_GPIO_BASE,

	.irq_flags = IRQF_TRIGGER_HIGH,

	.micd_pol_gpio = CODEC_GPIO_BASE + 2,

drivers/regulator/Kconfig

+22 −3
Original line number Diff line number Diff line
@@ -125,12 +125,20 @@ config REGULATOR_AB8500 
	  This driver supports the regulators found on the ST-Ericsson mixed

	  signal AB8500 PMIC



config REGULATOR_ARIZONA

	tristate "Wolfson Arizona class devices"

config REGULATOR_ARIZONA_LDO1

	tristate "Wolfson Arizona class devices LDO1"

	depends on MFD_ARIZONA

	depends on SND_SOC

	help

	  Support for the regulators found on Wolfson Arizona class

	  Support for the LDO1 regulators found on Wolfson Arizona class

	  devices.



config REGULATOR_ARIZONA_MICSUPP

	tristate "Wolfson Arizona class devices MICSUPP"

	depends on MFD_ARIZONA

	depends on SND_SOC

	help

	  Support for the MICSUPP regulators found on Wolfson Arizona class

	  devices.



config REGULATOR_AS3711
@@ -163,6 +171,17 @@ config REGULATOR_BCM590XX 
	  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

drivers/regulator/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ obj-$(CONFIG_REGULATOR_ACT8865) += act8865-regulator.o 
obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o

obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o

obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o

obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o

obj-$(CONFIG_REGULATOR_ARIZONA_LDO1) += arizona-ldo1.o

obj-$(CONFIG_REGULATOR_ARIZONA_MICSUPP) += arizona-micsupp.o

obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o

obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o

obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o

obj-$(CONFIG_REGULATOR_BCM590XX) += bcm590xx-regulator.o

obj-$(CONFIG_REGULATOR_BD9571MWV) += bd9571mwv-regulator.o

obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o

obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o

obj-$(CONFIG_REGULATOR_DA9055)	+= da9055-regulator.o