1
0
Fork 0
remarkable-linux/include/linux/mfd
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
..
ab5500 mfd: ab5500 chip register access 2011-10-24 14:09:16 +02:00
ab8500 mfd: Refactor ab8500 GPADC API, add raw access 2011-10-24 14:09:10 +02:00
pcf50633 mfd: Convert pcf50633 to use new register map API 2011-10-24 14:09:08 +02:00
pm8xxx drivers/rtc: add support for Qualcomm PMIC8xxx RTC 2011-07-25 20:57:17 -07:00
wm831x Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
wm8350
wm8994 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
88pm860x.h
aat2870.h drivers/video/backlight/aat2870_bl.c: fix setting max_current 2011-08-03 14:25:22 -10:00
ab8500.h mfd: Clean-up ab8500 register file 2011-07-31 23:28:23 +02:00
abx500.h mfd: Fix missing abx500 header file updates 2011-11-02 17:24:06 +01:00
adp5520.h
asic3.h
core.h
da903x.h
davinci_voicecodec.h
db5500-prcmu.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
db8500-prcmu.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
dbx500-prcmu.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
ds1wm.h
ezx-pcap.h
htc-egpio.h
htc-pasic3.h
intel_msic.h mfd: Add Intel MSIC driver 2011-10-24 14:09:15 +02:00
janz.h
max8925.h
max8997-private.h mfd: Wake-up from Suspend MAX8997 support 2011-10-24 14:09:11 +02:00
max8997.h
max8998-private.h
max8998.h
mc13xxx.h input: Add power button support for mc13783 2011-10-24 14:09:14 +02:00
mc13783.h mfd: Remove mc13783 API functions and symbols 2011-10-24 14:09:12 +02:00
mc13892.h
mcp.h
rdc321x.h
stmpe.h mfd: Fix missing stmpe kerneldoc 2011-07-31 23:28:25 +02:00
t7l66xb.h
tc3589x.h
tc6387xb.h
tc6393xb.h
ti_ssp.h
tmio.h
tps6105x.h
tps6507x.h
tps6586x.h regulator: tps6586x: add SMx slew rate setting 2011-08-28 17:41:28 +01:00
tps65910.h mfd: Implement tps65910 IRQ cleanup 2011-07-31 23:28:23 +02:00
tps65912.h tps65912: gpio: add gpio driver 2011-07-31 23:28:22 +02:00
twl4030-audio.h
twl6040.h ASoC: twl6040: Workaround for headset DC offset caused pop noise 2011-10-12 13:11:54 +01:00
ucb1x00.h
wl1273-core.h
wm8400-audio.h
wm8400-private.h mfd: Convert WM8400 to regmap API 2011-08-22 12:32:22 +01:00
wm8400.h