leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2f123cbcf0
linux/drivers/gpio
History
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 drivers/gpio: Fix drivers who are implicit users of module.h 2011-10-31 19:31:47 -04:00
gpio-ab8500.c
gpio-adp5520.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-adp5588.c gpio: Fix uninitialized variable bit in adp5588_irq_handler 2012-04-10 14:20:55 -06:00
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: Convert drivers to use module_pci_driver() 2012-04-07 14:30:35 -06:00
gpio-cs5535.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-da9052.c Changes queued in gpio/next for the start of the 3.3 merge window 2012-01-07 12:15:36 -08:00
gpio-davinci.c gpio/davinci: fix enabling unbanked GPIO IRQs 2012-03-12 11:53:33 -06:00
gpio-em.c gpio: Emma Mobile GPIO driver V2 2012-05-18 00:00:45 +02:00
gpio-ep93xx.c gpio/generic: initialize basic_mmio_gpio shadow variables properly 2012-05-19 12:17:35 -06:00
gpio-ge.c powerpc/85xx: Board support for GE IMP3A 2012-03-16 11:15:48 -05:00
gpio-generic.c gpio/generic: initialize basic_mmio_gpio shadow variables properly 2012-05-19 12:17:35 -06:00
gpio-ich.c gpio: Add support for Intel ICHx/3100/Series[56] GPIO 2012-05-01 12:00:21 +02:00
gpio-it8761e.c
gpio-janz-ttl.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-ks8695.c
gpio-langwell.c gpio/langwell: re-read the IRQ status register after each iteration 2012-05-10 16:35:28 -06:00
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 ARM/mx35/3ds: gpio: add mc9s08dz60 gpio function 2012-01-30 07:49:08 -07:00
gpio-mc33880.c drivers/gpio: Fix drivers who are implicit users of module.h 2011-10-31 19:31:47 -04:00
gpio-mcp23s08.c gpio-mcp23s08: dbg_show: fix pullup configuration display 2012-05-18 16:48:35 -06:00
gpio-ml-ioh.c gpio: Convert drivers to use module_pci_driver() 2012-04-07 14:30:35 -06:00
gpio-mm-lantiq.c GPIO: MIPS: lantiq: convert gpio-mm-lantiq to OF and of_mm_gpio 2012-05-21 14:31:53 +01:00
gpio-mpc8xxx.c gpio: mpc8xxx: Prevent NULL pointer deref in demux handler 2012-05-18 16:48:36 -06:00
gpio-mpc5200.c drivers/gpio: Fix drivers who are implicit users of module.h 2011-10-31 19:31:47 -04:00
gpio-msic.c gpio: add MSIC gpio driver 2012-05-11 13:14:54 -06:00
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 driver changes for v3.5 merge window 2012-05-24 14:01:46 -07:00
gpio-pl061.c gpio/gpio-pl061: No need of thaw and poweroff routines for hibernate 2012-02-16 06:37:51 -07:00
gpio-pxa.c gpio: pxa: parse gpio from DTS file 2012-05-05 16:36:47 +08:00
gpio-rc5t583.c gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583 2012-05-18 22:59:28 -06:00
gpio-rdc321x.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-sa1100.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
gpio-samsung.c gpio: samsung: add flags specifier to device-tree binding 2012-07-17 21:00:15 +02:00
gpio-sch.c gpio: Add Intel Centerton support to gpio-sch 2012-05-22 23:39:14 +02:00
gpio-sodaville.c gpio/generic: initialize basic_mmio_gpio shadow variables properly 2012-05-19 12:17:35 -06:00
gpio-sta2x11.c gpio-sta2x11: don't use pdata if null 2012-07-05 14:48:49 +02:00
gpio-stmpe.c GPIO changes for v3.4 2012-03-28 14:08:46 -07:00
gpio-stp-xway.c GPIO: MIPS: lantiq: convert gpio-stp-xway to OF 2012-05-21 14:31:53 +01:00
gpio-sx150x.c
gpio-tc3589x.c
gpio-tegra.c gpio: tegra: Hide tegra_gpio_enable/disable() 2012-04-18 10:26:38 -06:00
gpio-timberdale.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
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/twl: Add DT support to gpio-twl4030 driver 2012-03-22 13:05:55 +01:00
gpio-ucb1400.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-vr41xx.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-vx855.c gpio: Convert GPIO drivers to module_platform_driver 2012-01-02 00:26:06 -07:00
gpio-wm831x.c mfd: Convert wm831x to irq_domain 2012-05-20 17:27:07 +02:00
gpio-wm8350.c
gpio-wm8994.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
gpio-xilinx.c gpiolib: output basic details and consolidate gpio device drivers 2011-12-12 13:40:16 -07:00
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