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
..
devres.c	gpio: export devm_gpio_request_one	2012-07-05 14:49:13 +02:00
gpio-74x164.c
gpio-ab8500.c
gpio-adp5520.c
gpio-adp5588.c
gpio-amd8111.c	gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips	2012-07-12 13:40:13 +02:00
gpio-arizona.c	gpiolib: Add support for Wolfson Microelectronics Arizona class devices	2012-07-17 20:59:53 +02:00
gpio-bt8xx.c
gpio-cs5535.c
gpio-da9052.c
gpio-davinci.c
gpio-em.c
gpio-ep93xx.c
gpio-ge.c
gpio-generic.c
gpio-ich.c
gpio-it8761e.c
gpio-janz-ttl.c
gpio-ks8695.c
gpio-langwell.c
gpio-lpc32xx.c	gpio: gpio-lpc32xx: Add gpio_to_irq mapping	2012-07-12 13:40:17 +02:00
gpio-max730x.c
gpio-max732x.c
gpio-max7300.c
gpio-max7301.c
gpio-mc9s08dz60.c
gpio-mc33880.c
gpio-mcp23s08.c
gpio-ml-ioh.c
gpio-mm-lantiq.c
gpio-mpc8xxx.c
gpio-mpc5200.c
gpio-msic.c
gpio-msm-v1.c
gpio-msm-v2.c
gpio-mxc.c	GPIO changes for v3.6:	2012-07-26 13:56:38 -07:00
gpio-mxs.c	arm-soc: device tree conversions, part 2	2012-05-26 12:57:47 -07:00
gpio-omap.c	GPIO changes for v3.6:	2012-07-26 13:56:38 -07:00
gpio-pca953x.c	gpio/pca953x: increase variables size to support 24 bit of data	2012-07-17 21:00:18 +02:00
gpio-pcf857x.c	gpio: pcf857x: share 8/16 bit access functions	2012-07-12 13:40:17 +02:00
gpio-pch.c
gpio-pl061.c
gpio-pxa.c
gpio-rc5t583.c
gpio-rdc321x.c
gpio-sa1100.c
gpio-samsung.c	gpio: samsung: add flags specifier to device-tree binding	2012-07-17 21:00:15 +02:00
gpio-sch.c
gpio-sodaville.c
gpio-sta2x11.c	gpio-sta2x11: don't use pdata if null	2012-07-05 14:48:49 +02:00
gpio-stmpe.c
gpio-stp-xway.c
gpio-sx150x.c
gpio-tc3589x.c
gpio-tegra.c
gpio-timberdale.c
gpio-tnetv107x.c
gpio-tps6586x.c	gpio: tps6586x: Add gpio support through platform driver	2012-07-25 00:36:54 +02:00
gpio-tps65910.c	gpio/gpio-tps65910: gpio_chip.of_node referenced without CONFIG_OF_GPIO defined	2012-07-10 22:53:31 +02:00
gpio-tps65912.c
gpio-twl4030.c
gpio-ucb1400.c
gpio-vr41xx.c
gpio-vx855.c
gpio-wm831x.c
gpio-wm8350.c
gpio-wm8994.c	GPIO changes for v3.6:	2012-07-26 13:56:38 -07:00
gpio-xilinx.c
gpiolib-of.c	gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available	2012-07-17 21:00:21 +02:00
gpiolib.c	gpiolib: Defer failed gpio requests by default	2012-07-17 21:00:20 +02:00
Kconfig	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
Makefile	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00