linux/drivers/mfd
Anton Vorontsov 76d8a23b12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.

Conflicts:
	drivers/power/ab8500_btemp.c
	drivers/power/ab8500_charger.c
	drivers/power/ab8500_fg.c
	drivers/power/abx500_chargalg.c
	drivers/power/max8925_power.c

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
2012-12-11 22:15:57 -08:00
..
88pm80x.c mfd: remove use of __devinit 2012-11-28 12:20:19 -08:00
88pm800.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
88pm805.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
88pm860x-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
88pm860x-i2c.c mfd: Convert struct i2c_msg initialization to C99 format 2012-09-21 23:40:34 +02:00
aat2870-core.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
ab3100-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
ab3100-otp.c
ab8500-core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
ab8500-debugfs.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
ab8500-gpadc.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
ab8500-sysctrl.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
abx500-core.c
adp5520.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
arizona-core.c Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
arizona-i2c.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
arizona-irq.c mfd: wm5110: Disable control interface error report for WM5110 rev B 2012-11-20 12:46:44 +01:00
arizona-spi.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
arizona.h mfd: Initial support for the WM5110 2012-07-16 15:00:32 +02:00
asic3.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
cs5535-mfd.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
da903x.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
da9052-core.c mfd: remove use of __devinitdata 2012-11-28 12:21:11 -08:00
da9052-i2c.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
da9052-spi.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
da9055-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
da9055-i2c.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
davinci_voicecodec.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
db8500-prcmu.c Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
dbx500-prcmu-regs.h mfd: dbx500: Provide a more accurate smp_twd clock 2012-09-23 20:51:34 +02:00
dm355evm_msp.c
ezx-pcap.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
htc-egpio.c
htc-i2cpld.c mfd: remove use of __devinit 2012-11-28 12:20:19 -08:00
htc-pasic3.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
intel_msic.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
janz-cmodio.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
jz4740-adc.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
Kconfig drivers: mfd: fix dependencies for MFD_RTSX_PCI 2012-11-15 17:32:53 -08:00
lm3533-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
lm3533-ctrlbank.c mfd: Use SI-units for the lm3533 max-current interface 2012-05-20 17:27:02 +02:00
lp8788-irq.c mfd: Add lp8788 mfd driver 2012-09-23 20:51:34 +02:00
lp8788.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
lpc_ich.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
lpc_sch.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
Makefile drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
max8907.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
max8925-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
max8925-i2c.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
max8997-irq.c mfd: Add irq domain support for max8997 interrupts 2012-07-09 00:16:13 +02:00
max8997.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
max8998-irq.c
max8998.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
max77686-irq.c mfd: Allow to specify max77686 interrupt through DT or platform file also 2012-07-09 15:13:42 +02:00
max77686.c mfd: remove use of __devinitdata 2012-11-28 12:21:11 -08:00
max77693-irq.c mfd: MAX77693: Fix interrupt handling bug 2012-09-16 00:32:57 +02:00
max77693.c mfd: MAX77693: Fix NULL pointer error when initializing irqs 2012-09-16 00:33:09 +02:00
mc13xxx-core.c mfd: Use devm_* APIs for mc13xxx: remove leftover kfree 2012-09-21 23:40:35 +02:00
mc13xxx-i2c.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
mc13xxx-spi.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
mc13xxx.h mfd: Move the mc13xxx-core spi specific code into a separate module 2012-05-01 12:35:40 +02:00
mcp-core.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mcp-sa11x0.c ARM: sa1100: move platform_data definitions 2012-09-14 11:18:57 +02:00
menelaus.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
mfd-core.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
omap-usb-host.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
omap-usb-tll.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
palmas.c mfd: remove use of __devinitdata 2012-11-28 12:21:11 -08:00
pcf50633-adc.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
pcf50633-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
pcf50633-gpio.c mfd: Include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c 2012-03-06 18:46:51 +01:00
pcf50633-irq.c mfd: Include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c 2012-03-06 18:46:51 +01:00
pm8xxx-irq.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
pm8921-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
rc5t583-irq.c mfd: rc5t583: Fix warning messages 2012-09-23 20:51:33 +02:00
rc5t583.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
rdc321x-southbridge.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
rtl8411.c drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
rts5209.c drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
rts5229.c drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
rtsx_pcr.c drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
rtsx_pcr.h drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
sec-core.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
sec-irq.c mfd: Add s2mps11 irq driver 2012-07-16 14:31:59 +02:00
sm501.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
smsc-ece1099.c mfd: smsc: Add support for smsc gpio io/keypad driver 2012-10-01 15:27:48 +02:00
sta2x11-mfd.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
stmpe-i2c.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
stmpe-spi.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
stmpe.c gpio: stmpe: Add DT support for stmpe gpio 2012-12-01 17:45:16 +01:00
stmpe.h
syscon.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
t7l66xb.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
tc3589x.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tc6387xb.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tc6393xb.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
ti-ssp.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
timberdale.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
timberdale.h
tmio_core.c
tps6105x.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tps6507x.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
tps6586x.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tps65010.c mfd: remove IRQF_SAMPLE_RANDOM which is now a no-op 2012-07-19 10:38:33 -04:00
tps65090.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tps65217.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tps65910-irq.c mfd: Add tps65910-irq devicetree init and irqdomain support 2012-05-20 17:27:08 +02:00
tps65910.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tps65911-comparator.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
tps65912-core.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
tps65912-i2c.c
tps65912-irq.c
tps65912-spi.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
twl4030-audio.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
twl4030-irq.c mfd: twl4030: Fix chained irq handling on resume from suspend 2012-11-21 17:46:41 +01:00
twl4030-madc.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
twl4030-power.c mfd: remove use of __devinit 2012-11-28 12:20:19 -08:00
twl6030-irq.c mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups 2012-03-22 13:05:34 +01:00
twl6040-core.c mfd: twl6040: Add twl6040-gpio child 2012-09-19 12:21:20 +02:00
twl6040-irq.c mfd: Add support for Device Tree to twl6040 2012-05-20 17:27:12 +02:00
twl-core.c Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
twl-core.h mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files 2012-03-22 13:04:33 +01:00
ucb1x00-assabet.c MFD: ucb1x00-assabet: add support for UCB1x00 GPIO switches 2012-02-18 23:15:44 +00:00
ucb1x00-core.c MFD: ucb1x00-core: add wakeup support 2012-02-18 23:15:43 +00:00
ucb1x00-ts.c MFD: ucb1x00: convert to use genirq 2012-02-18 23:15:43 +00:00
ucb1400_core.c
vx855.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
wl1273-core.c mfd: remove use of __devinit 2012-11-28 12:20:19 -08:00
wm831x-auxadc.c mfd: Convert wm831x to irq_domain 2012-05-20 17:27:07 +02:00
wm831x-core.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
wm831x-i2c.c mfd: wm831x: Convert to devm_regmap_init() 2012-02-22 13:57:05 +00:00
wm831x-irq.c mfd: Emulate active low IRQs as well as active high IRQs for wm831x 2012-05-20 17:27:14 +02:00
wm831x-otp.c mfd: wm831x: Feed the device UUID into device_add_randomness() 2012-07-19 10:38:31 -04:00
wm831x-spi.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
wm5102-tables.c mfd: wm5102: Update register patch for latest evaluation 2012-11-20 12:46:44 +01:00
wm5110-tables.c mfd: wm5110: Add register patches for revision B 2012-09-28 23:57:28 +02:00
wm8350-core.c mfd: Remove custom wm8350 cache implementation 2012-07-09 00:16:10 +02:00
wm8350-gpio.c
wm8350-i2c.c mfd: Add regmap cache support for wm8350 2012-07-09 00:16:10 +02:00
wm8350-irq.c mfd: Rely on regmap cache in wm8350 interrupt controller 2012-07-09 00:16:10 +02:00
wm8350-regmap.c mfd: Remove custom wm8350 cache implementation 2012-07-09 00:16:10 +02:00
wm8400-core.c mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
wm8994-core.c mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
wm8994-irq.c mfd: wm8994: Flag the interrupt block as requiring runtime PM be enabled 2012-08-07 20:30:00 +01:00
wm8994-regmap.c mfd: wm8994: Implement support for WM1811 devices with higher cust_ids 2012-09-14 09:52:11 +02:00
wm8994.h