kevin/linux
1
Fork 0
Code
a0a4194c94
linux/drivers/regulator
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
88pm8607.c regulator: 88pm8607: Fix off-by-one value range checking in the case of no id is matched 2011-08-08 17:15:08 +01:00
aat2870-regulator.c regulator: aat2870-regulator.c needs module.h 2011-08-08 17:12:51 +01:00
ab3100.c mfd: Use mfd cell platform_data for ab3100 cells platform bits 2011-05-26 19:44:58 +02:00
ab8500.c regulator: add ab8500 enable and raise time delays 2011-03-26 14:15:06 +00:00
ad5398.c i2c: Remove obsolete cleanup for clientdata 2010-09-30 14:14:22 +02:00
bq24022.c Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc 2010-05-25 10:16:02 +01:00
core.c Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator 2011-11-01 15:06:20 -07:00
da903x.c regulator: Report actual configured voltage to set_voltage() 2011-01-12 14:32:59 +00:00
db8500-prcmu.c mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
dummy.c regulator: Properly register dummy regulator driver 2011-06-08 20:15:34 +01:00
dummy.h regulator: fix build when CONFIG_REGULATOR_DUMMY=n 2010-10-28 22:40:32 +01:00
fixed.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
gpio-regulator.c regulator: Add module.h include to gpio-regulator 2011-10-11 13:59:13 +01:00
isl6271a-regulator.c regulator: missing index in PTR_ERR() in isl6271a_probe() 2011-01-12 14:33:06 +00:00
Kconfig regulator: gpio-regulator add dependency on GENERIC_GPIO 2011-10-12 10:50:40 +01:00
lp3971.c regulator: Report actual configured voltage to set_voltage() 2011-01-12 14:32:59 +00:00
lp3972.c regulator: Report actual configured voltage to set_voltage() 2011-01-12 14:32:59 +00:00
Makefile regulator: Add driver for gpio-controlled regulators 2011-10-09 12:36:21 +01:00
max1586.c regulator: Report actual configured voltage to set_voltage() 2011-01-12 14:32:59 +00:00
max8649.c regulator: Ensure enough enable time for max8649 2011-08-08 17:15:08 +01:00
max8660.c regulator: Report actual configured voltage to set_voltage() 2011-01-12 14:32:59 +00:00
max8925-regulator.c regulator: Enable max8925 i2c sequence for control 2011-05-26 19:45:33 +02:00
max8952.c regulator: max8952: removed unused mutex. 2011-08-08 17:15:09 +01:00
max8997.c regulator: max8997: Fix setting inappropriate value for ramp_delay variable 2011-07-08 19:14:58 +01:00
max8998.c regulator: Fix memory leak in max8998_pmic_probe failure path 2011-05-27 10:49:09 +01:00
mc13xxx-regulator-core.c regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage 2011-05-27 10:49:10 +01:00
mc13xxx.h make mc13783 regulator code generic 2011-01-12 14:33:03 +00:00
mc13783-regulator.c regulator: Finish mc13783 conversion to the mc13xxx API 2011-10-24 14:09:15 +02:00
mc13892-regulator.c regulator: mc13892: Fix voltage unit in test case. 2011-05-27 10:49:10 +01:00
pcap-regulator.c regulator: Fix typo in PCAP regulator_set_voltage() 2011-01-12 14:33:00 +00:00
pcf50633-regulator.c regulator: Report actual configured voltage to set_voltage() 2011-01-12 14:32:59 +00:00
tps6105x-regulator.c regulator: Add missing platform_set_drvdata in tps6105x_regulator_probe 2011-05-27 10:34:36 +01:00
tps6507x-regulator.c regulator: tps6507x: Remove num_voltages array 2011-08-08 17:15:09 +01:00
tps6524x-regulator.c regulator: fix tps6524x section mismatch 2011-03-26 14:15:06 +00:00
tps6586x-regulator.c regulator: tps6586x: add SMx slew rate setting 2011-08-28 17:41:28 +01:00
tps65023-regulator.c regulator: remove duplicate REG_CTRL2 defines in tps65023 2011-10-09 12:05:27 +01:00
tps65910-regulator.c regulator: tps65910: Fix array access out of bounds bug 2011-07-22 11:41:57 +01:00
tps65912-regulator.c regulator: tps65912: Remove unused define of TPS65912_MAX_REG_ID 2011-08-08 17:12:51 +01:00
twl-regulator.c regulator: TWL: Remove entry of RES_ID for 6030 macros 2011-07-22 11:30:05 +01:00
userspace-consumer.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
virtual.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wm831x-dcdc.c regulator: Improve WM831x DVS VSEL selection algorithm 2011-07-28 10:20:49 +01:00
wm831x-isink.c regulator: Convert WM831x regulators to genirq 2011-03-26 14:15:04 +00:00
wm831x-ldo.c regulator: Fix WM831x regulator ID lookups for multiple WM831xs 2011-07-28 10:20:48 +01:00
wm8350-regulator.c regulator: Convert WM835x to use get_voltage_sel() 2011-01-12 14:33:04 +00:00
wm8400-regulator.c regulator: Convert WM8400 to get_voltage_sel() 2011-05-27 10:34:37 +01:00
wm8994-regulator.c regulator: Add WM1811 support 2011-10-07 12:49:18 +01:00