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
..
abx500	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
arizona	mfd: Initial support for the WM5110	2012-07-16 15:00:32 +02:00
da9052	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
pcf50633
pm8xxx
samsung	mfd: Add s2mps11 irq driver	2012-07-16 14:31:59 +02:00
wm831x	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
wm8350	mfd: Remove custom wm8350 cache implementation	2012-07-09 00:16:10 +02:00
wm8994	mfd: Support for user defined wm8994 irq flags	2012-07-09 00:16:10 +02:00
88pm80x.h	mfd: Remove __devexit annotation for pm80x_deinit	2012-07-16 15:26:45 +02:00
88pm860x.h	mfd: Add pre-regulator device for 88pm860x	2012-07-09 00:16:14 +02:00
aat2870.h
abx500.h
adp5520.h
anatop.h	mfd: Make anatop register accessor more flexible and rename meaningfully	2012-05-20 17:27:07 +02:00
asic3.h	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
core.h	mfd: Attaching a node to new 'struct mfd_cell' of_compatible variable	2012-07-09 00:16:13 +02:00
da903x.h
davinci_voicecodec.h
db8500-prcmu.h	mfd: Update db8500-prmcu hostport_access enable	2012-07-09 00:16:10 +02:00
dbx500-prcmu.h	mfd: Update db8500-prmcu hostport_access enable	2012-07-09 00:16:10 +02:00
ds1wm.h
ezx-pcap.h
htc-egpio.h
htc-pasic3.h
intel_msic.h
janz.h
lm3533.h	mfd: Add r_select to lm3533 platform data	2012-05-22 23:47:42 +02:00
lpc_ich.h	watchdog: Convert iTCO_wdt driver to mfd model	2012-05-09 17:20:09 +02:00
max8925.h
max8997-private.h	mfd: Add irq domain support for max8997 interrupts	2012-07-09 00:16:13 +02:00
max8997.h	mfd: Add irq domain support for max8997 interrupts	2012-07-09 00:16:13 +02:00
max8998-private.h
max8998.h
max77686-private.h	mfd: Remove unused max77686 iolock mutex	2012-07-09 00:16:14 +02:00
max77686.h	mfd: Remove the clocks from the list of max77686 regulators	2012-07-09 15:13:43 +02:00
max77693-private.h	mfd: Remove unused max77693 iolock mutex	2012-07-09 00:16:07 +02:00
max77693.h	mfd: Add MAX77693 irq handler	2012-05-20 17:27:06 +02:00
mc13xxx.h	mfd: mc13xxx: add codec platform data	2012-05-18 16:42:08 +01:00
mc13783.h
mc13892.h
mcp.h
palmas.h	mfd: palmas PMIC device support	2012-05-18 16:54:47 +01:00
rc5t583.h	GPIO driver changes for v3.5 merge window	2012-05-24 14:01:46 -07:00
rdc321x.h
sta2x11-mfd.h
stmpe.h	mfd: Allow for const stmpe keyboard data	2012-05-09 17:20:29 +02:00
t7l66xb.h
tc3589x.h
tc6387xb.h
tc6393xb.h
ti_ssp.h
tmio.h	mmc: tmio: support caps2 flags	2012-07-21 00:02:18 -04:00
tps6105x.h
tps6507x.h
tps6586x.h
tps65090.h
tps65217.h	regulator: tps65217: Add device tree support	2012-07-12 18:27:36 +01:00
tps65910.h	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
tps65912.h
twl4030-audio.h
twl6040.h	mfd: Add support for twl6041	2012-07-25 00:27:13 +02:00
ucb1x00.h
wl1273-core.h
wm8400-audio.h
wm8400-private.h	mfd: Remove wm8400 custom cache implementation	2012-05-20 17:27:01 +02:00
wm8400.h