Linus Torvalds 3e701cdfe6 MFD bits for the 3.6 merge window. ... We have support for a few new drivers: - Samsung s2mps11 - Wolfson Microelectronics wm5102 and wm5110 - Marvell 88PM800 and 88PM805 - TI twl6041 We also have our regular driver improvements: - Device tree and IRQ domain support for STE AB8500 - Regmap and devm_* API conversion for TI tps6586x - Device tree support for Samsung max77686 - devm_* API conversion for STE AB3100 Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910, tps65090, da9052 and twl-core. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQFpGVAAoJEIqAPN1PVmxKFNoP/1dkYngrxxV6cxdyLJ74APhG lVKPgaDxQhdgfwCZJmMeZK1UphZo80cWnEXG6sTHZUEQdTaslSJu5SuPfUM+fo7e 52/dU0nx0ZE04pwPQLHbidS4TmHlbLg9oM2kmIf9RO5rg34GodwVgRL/4+k1qvhz aWYJt9erFhQOpqaSX66mXHSuhvzHypbcE7d2B2Ykmh3NoYiH2w9H9KmIbbb+ZLq8 +Bp/i5Ys/vfooo+8IE2w6KZfIzMwsmmtWjjr/38yuQJaKZCh/zn23DM9HsdrVf++ RzfniRF4YBxmeKi7zi8MFIYys8filTCXA9dXbGSAKCuUCT37yZRnUxTeN1bn7Bux A7KRpG7pUKQKVKqCTndvK5LcQKlT33XyW2ZzV1wVWX2JkCJ+gilPeykb8IabNvGX nIp0STEGR/WdCLEAKo8pJF7Usn0RuUzAug02SG/mQ6dpnLoZqp0Od5W7gRhT7M7h hXr/xKJ6cG5YwicpAdy5kJJ0dRgQrtaHwxrF0B68AXZ7CmAtkPuEGCYhUCFnGQUH XJ0CodAqqVBRyYiQS4zIpIh2nqhIdsgv4OC1+kVLbubQk+PR88zG9Jvg6i1HQi/A OHi7N5Wite3YUrs3sBzDKnEc/Il2YRhVaz2SLVNfZR0PS7hywHN3rK/tVFINTgei jNEz1H6hu7ToNLfs0UzP =c28c -----END PGP SIGNATURE----- Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFD bits from Samuel Ortiz: "We have support for a few new drivers: - Samsung s2mps11 - Wolfson Microelectronics wm5102 and wm5110 - Marvell 88PM800 and 88PM805 - TI twl6041 We also have our regular driver improvements: - Device tree and IRQ domain support for STE AB8500 - Regmap and devm_* API conversion for TI tps6586x - Device tree support for Samsung max77686 - devm_* API conversion for STE AB3100 Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910, tps65090, da9052 and twl-core." Fix up mostly trivial conflicts, with the exception of drivers/usb/host/ehci-omap.c in particular, which had some re-organization of the reset sequence (commit 1a49e2ac96: "EHCI: centralize controller initialization") that clashed with commit 2761a63945 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues"). In particular, commit 2761a63945 moved the usb_add_hcd() to the *middle* of the reset sequence, which clashes fairly badly with the reset sequence re-organization (although it could have been done inside the new omap_ehci_init() function). I left that part of commit 2761a63945 just undone. * tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits) mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core mfd: Arizone core should select MFD_CORE mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ mfd: Add debug trace on entering and leaving arizone runtime suspend mfd: Correct tps65090 cell names mfd: Remove gpio support from tps6586x core driver ARM: tegra: defconfig: Enable tps6586x gpio gpio: tps6586x: Add gpio support through platform driver mfd: Cache tps6586x register through regmap mfd: Use regmap for tps6586x register access. mfd: Use devm managed resources for tps6586x input: Add onkey support for 88PM80X PMIC mfd: Add support for twl6041 mfd: Fix twl6040 revision information mfd: Matches should be NULL when populate anatop child devices input: ab8500-ponkey: Create AB8500 domain IRQ mapping mfd: Add missing out of memory check for pcf50633 Documentation: Describe the AB8500 Device Tree bindings mfd: Add tps65910 32-kHz-crystal-input init mfd: Drop modifying mc13xxx driver's id_table in probe ...		2012-07-30 12:41:17 -07:00
..
88pm80x.c	mfd: Remove __devexit annotation for pm80x_deinit	2012-07-16 15:26:45 +02:00
88pm800.c	mfd: Fix checking return value of 88pm8xx regmap_read()	2012-07-16 15:26:37 +02:00
88pm805.c	mfd: Fix checking return value of 88pm8xx regmap_read()	2012-07-16 15:26:37 +02:00
88pm860x-core.c	mfd: Add pre-regulator device for 88pm860x	2012-07-09 00:16:14 +02:00
88pm860x-i2c.c
aat2870-core.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
ab3100-core.c	mfd: Use devm allocation for ab3100-core	2012-07-09 00:16:11 +02:00
ab3100-otp.c
ab8500-core.c	mfd: Register ab8500 devices using the newly DT:ed MFD API	2012-07-09 00:16:13 +02:00
ab8500-debugfs.c	mfd: Register ab8500 devices using the newly DT:ed MFD API	2012-07-09 00:16:13 +02:00
ab8500-gpadc.c	mfd: Register ab8500 devices using the newly DT:ed MFD API	2012-07-09 00:16:13 +02:00
ab8500-sysctrl.c	mfd: Register ab8500 devices using the newly DT:ed MFD API	2012-07-09 00:16:13 +02:00
abx500-core.c
adp5520.c	mfd: Guard adp5520 PM methods with CONFIG_PM_SLEEP	2012-07-09 00:16:13 +02:00
anatop-mfd.c	mfd: Matches should be NULL when populate anatop child devices	2012-07-17 11:17:24 +02:00
arizona-core.c	mfd: Add debug trace on entering and leaving arizone runtime suspend	2012-07-25 00:52:17 +02:00
arizona-i2c.c	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
arizona-irq.c	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
arizona-spi.c	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
arizona.h	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
asic3.c	mfd: No need to check for the GPIO offset from asic3_gpio_to_irq	2012-05-01 12:00:23 +02:00
cs5535-mfd.c	mfd: Use module_pci_driver	2012-05-01 12:00:21 +02:00
da903x.c
da9052-core.c	mfd: Remove unused variable from da9052_device_init	2012-07-09 00:16:07 +02:00
da9052-i2c.c	mfd: Convert da9052 to use devm_* APIs	2012-05-20 17:27:03 +02:00
da9052-spi.c	mfd: Convert da9052 to use devm_* APIs	2012-05-20 17:27:03 +02:00
davinci_voicecodec.c
db8500-prcmu.c	mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core	2012-07-27 15:32:33 +02:00
dbx500-prcmu-regs.h	mfd: Update db8500-prmcu hostport_access enable	2012-07-09 00:16:10 +02:00
dm355evm_msp.c
ezx-pcap.c
htc-egpio.c
htc-i2cpld.c
htc-pasic3.c
intel_msic.c	mfd: Convert Intel MSIC driver to use devm_* interfaces.	2012-05-01 12:00:23 +02:00
janz-cmodio.c	mfd: Use module_pci_driver	2012-05-01 12:00:21 +02:00
jz4740-adc.c
Kconfig	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
lm3533-core.c	mfd: Mark two lm3533 zone registers as volatile	2012-05-20 17:27:14 +02:00
lm3533-ctrlbank.c	mfd: Use SI-units for the lm3533 max-current interface	2012-05-20 17:27:02 +02:00
lpc_ich.c	watchdog: Convert iTCO_wdt driver to mfd model	2012-05-09 17:20:09 +02:00
lpc_sch.c	mfd: Change tunnelcreek watchdog name on the lpc_sch subdevices array	2012-05-20 17:27:03 +02:00
Makefile	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
max8925-core.c	mfd: Transfer rtc max8925 irq from MFD defined resources	2012-07-09 00:16:10 +02:00
max8925-i2c.c
max8997-irq.c	mfd: Add irq domain support for max8997 interrupts	2012-07-09 00:16:13 +02:00
max8997.c	mfd: Add irq domain support for max8997 interrupts	2012-07-09 00:16:13 +02:00
max8998-irq.c
max8998.c
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: Guard max77686_pmic_dt_match with CONFIG_OF	2012-07-10 11:00:37 +02:00
max77693-irq.c	mfd: Add MAX77693 irq handler	2012-05-20 17:27:06 +02:00
max77693.c	mfd: Fix max77693 irq leak and wrong kfree call	2012-07-09 00:16:11 +02:00
mc13xxx-core.c	mfd: Use devm_* APIs for mc13xxx	2012-07-09 00:16:08 +02:00
mc13xxx-i2c.c	mfd: Drop modifying mc13xxx driver's id_table in probe	2012-07-16 15:40:17 +02:00
mc13xxx-spi.c	mfd: Drop modifying mc13xxx driver's id_table in probe	2012-07-16 15:40:17 +02: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	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
menelaus.c
mfd-core.c	mfd: Make MFD core code Device Tree and IRQ domain aware	2012-07-09 00:16:08 +02:00
omap-usb-host.c	mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues.	2012-07-09 00:16:25 +02:00
palmas.c	mfd: Add missing hunk to change palmas irq to clear on read	2012-07-09 00:16:26 +02:00
pcf50633-adc.c
pcf50633-core.c	mfd: Add missing out of memory check for pcf50633	2012-07-16 15:55:41 +02:00
pcf50633-gpio.c
pcf50633-irq.c
pm8xxx-irq.c
pm8921-core.c
rc5t583-irq.c	mfd: Add support for RICOH PMIC RC5T583	2012-03-16 20:05:45 +01:00
rc5t583.c	mfd: Convert rc5t583 to devm_regmap_init_i2c()	2012-05-09 17:50:29 +02:00
rdc321x-southbridge.c	mfd: Use module_pci_driver	2012-05-01 12:00:21 +02:00
sec-core.c	mfd: Add samsung s2mps11 mfd support	2012-07-16 14:30:47 +02:00
sec-irq.c	mfd: Add s2mps11 irq driver	2012-07-16 14:31:59 +02:00
sm501.c	mfd: Use DIV_ROUND_CLOSEST for sm501 clock	2012-03-16 20:37:47 +01:00
sta2x11-mfd.c	mfd: Add driver for STA2X11 MFD block	2012-05-09 15:34:28 +02:00
stmpe-i2c.c	Viresh has moved	2012-06-20 14:39:36 -07:00
stmpe-spi.c	Viresh has moved	2012-06-20 14:39:36 -07:00
stmpe.c
stmpe.h
t7l66xb.c
tc3589x.c	mfd: Guard tc3589x PM methods with CONFIG_PM_SLEEP	2012-07-09 00:16:13 +02:00
tc6387xb.c
tc6393xb.c
ti-ssp.c
timberdale.c	V4L/DVB: mfd: use reg_shift instead of regstep	2012-07-14 13:30:25 +02:00
timberdale.h
tmio_core.c
tps6105x.c
tps6507x.c
tps6586x.c	mfd: Remove gpio support from tps6586x core driver	2012-07-25 00:40:11 +02:00
tps65010.c
tps65090.c	mfd: Correct tps65090 cell names	2012-07-25 00:44:48 +02:00
tps65217.c	regulator: tps65217: Add device tree support	2012-07-12 18:27:36 +01:00
tps65910-irq.c	mfd: Add tps65910-irq devicetree init and irqdomain support	2012-05-20 17:27:08 +02:00
tps65910.c	mfd: Add tps65910 32-kHz-crystal-input init	2012-07-16 15:43:15 +02:00
tps65911-comparator.c	Fix typo milivolt => millivolt	2012-04-05 16:58:23 -07:00
tps65912-core.c
tps65912-i2c.c
tps65912-irq.c
tps65912-spi.c
twl-core.c	mfd: Move twl-core device_init_wakeup to after platform_device_add	2012-07-09 15:13:41 +02:00
twl-core.h	mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files	2012-03-22 13:04:33 +01:00
twl4030-audio.c
twl4030-irq.c	mfd: enable wakeup on twl4030 IRQ.	2012-05-09 18:02:51 +02:00
twl4030-madc.c
twl4030-power.c
twl6030-irq.c	mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups	2012-03-22 13:05:34 +01:00
twl6030-pwm.c
twl6040-core.c	mfd: Add support for twl6041	2012-07-25 00:27:13 +02:00
twl6040-irq.c	mfd: Add support for Device Tree to twl6040	2012-05-20 17:27:12 +02:00
ucb1x00-assabet.c
ucb1x00-core.c
ucb1x00-ts.c
ucb1400_core.c
vx855.c	mfd: Use module_pci_driver	2012-05-01 12:00:21 +02:00
wl1273-core.c
wm831x-auxadc.c	mfd: Convert wm831x to irq_domain	2012-05-20 17:27:07 +02:00
wm831x-core.c	mfd: Convert wm831x to irq_domain	2012-05-20 17:27:07 +02:00
wm831x-i2c.c
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
wm831x-spi.c	MFD changes for 3.4	2012-03-28 13:56:35 -07:00
wm5102-tables.c	mfd: Mark headphone detect readback wm5102 register volatile	2012-07-09 00:46:29 +02:00
wm5110-tables.c	mfd: Add data tables for the WM5110	2012-07-16 14:59:56 +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: Export wm8400_block_read()	2012-05-20 17:27:05 +02:00
wm8994-core.c	mfd: Also restore wm8994 GPIO IRQ masks after reset	2012-07-09 00:33:29 +02:00
wm8994-irq.c	mfd: Support for user defined wm8994 irq flags	2012-07-09 00:16:10 +02:00
wm8994-regmap.c	mfd: Cache wm8994 chip revision	2012-05-01 12:00:21 +02:00
wm8994.h