Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
db298da2c3
linux/drivers/input/misc
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
..
88pm80x_onkey.c input: Add onkey support for 88PM80X PMIC 2012-07-25 00:29:19 +02:00
88pm860x_onkey.c mfd: Add ability to wake the system for 88pm860x 2012-03-06 18:46:49 +01:00
ab8500-ponkey.c MFD bits for the 3.6 merge window. 2012-07-30 12:41:17 -07:00
ad714x-i2c.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
ad714x-spi.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
ad714x.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
ad714x.h Input: ad714x - read the interrupt status registers in a row 2011-08-22 09:59:26 -07:00
adxl34x-i2c.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
adxl34x-spi.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
adxl34x.c Merge commit 'v3.2-rc3' into next 2011-11-29 01:51:07 -08:00
adxl34x.h Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
apanel.c
ati_remote2.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-01-10 10:55:52 -08:00
atlas_btns.c Input: atlas_btns - switch to using pr_err() and friends 2010-07-13 09:43:24 -07:00
bfin_rotary.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
bma150.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
cm109.c USB: input: cm109.c: fix up dev_* messages 2012-05-04 15:32:55 -07:00
cma3000_d0x_i2c.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
cma3000_d0x.c Fix comment typo multipy -> multiply 2012-06-03 12:04:08 +02:00
cma3000_d0x.h Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cobalt_btns.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
da9052_onkey.c Input: da9052 - fix memory leak in da9052_onkey_probe() 2012-04-11 22:15:04 -07:00
dm355evm_keys.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
gp2ap002a00f.c Input: synaptics_usb - switch to module_usb_driver() 2012-03-16 23:06:34 -07:00
gpio_tilt_polled.c Input: add generic GPIO-tilt driver 2011-11-30 23:41:16 -08:00
hp_sdc_rtc.c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:49:54 -07:00
ixp4xx-beeper.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
Kconfig input: Add onkey support for 88PM80X PMIC 2012-07-25 00:29:19 +02:00
keyspan_remote.c USB: input: keyspan_remote.c: fix up dev_* messages 2012-05-04 15:32:58 -07:00
kxtj9.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
m68kspkr.c
Makefile input: Add onkey support for 88PM80X PMIC 2012-07-25 00:29:19 +02:00
max8925_onkey.c Input: max8925_onkey - avoid accessing input device too early 2012-03-06 11:03:30 -08:00
max8997_haptic.c Input: add driver support for MAX8997-haptic 2012-03-16 22:49:25 -07:00
mc13783-pwrbutton.c Input: mc13783-pwrbutton - convert to use module_platform_driver() 2011-12-12 00:02:51 -08:00
mma8450.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
mpu3050.c Input: mpu3050 - set IRQF_ONESHOT when requesting the interrupt 2012-05-02 00:22:45 -07:00
pcap_keys.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
pcf8574_keypad.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
pcf50633-input.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
pcspkr.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
pm8xxx-vibrator.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
pmic8xxx-pwrkey.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
powermate.c USB: input: powermate.c: fix up dev_* messages 2012-05-04 15:33:00 -07:00
pwm-beeper.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
rb532_button.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
rotary_encoder.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
sgi_btns.c Input: misc - use macro module_platform_driver() 2011-11-30 23:41:42 -08:00
sparcspkr.c dt/sparc: Eliminate users of of_platform_{,un}register_driver 2011-02-28 01:36:39 -07:00
twl4030-pwrbutton.c Input: revert some over-zealous conversions to module_platform_driver() 2012-01-10 23:12:46 -08:00
twl4030-vibra.c Input: twl4030-vibra - really switch from #if to #ifdef 2012-03-12 22:18:54 -07:00
twl6040-vibra.c Input: twl6040-vibra - update for device tree support 2012-06-12 01:10:50 -07:00
uinput.c Input: uinput - allow for 0/0 min/max on absolute axes. 2011-03-31 00:02:39 -07:00
wistron_btns.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
wm831x-on.c mfd: Convert wm831x to irq_domain 2012-05-20 17:27:07 +02:00
xen-kbdfront.c Xen: consolidate and simplify struct xenbus_driver instantiation 2012-01-04 17:01:17 -05:00
yealink.c USB: input: yealink.c: fix up dev_* messages 2012-05-04 15:33:01 -07:00
yealink.h