1
linux/drivers/input/misc
Linus Torvalds 30304e5a79 MFD changes for 3.4
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcXgCAAoJEIqAPN1PVmxKh2oP/2Ns+dr4oOF8z+uqYG1oisJd
 CxBTC1Bi9gYBtpiMztPiHZWiQtVXoDgLbLkx6ooWH5dpwCdvU6TVBZUJp4wpELtx
 mMk5vJy4/INHgI0nk5wUOr76rNlQfIcK04f+LHBSG1iljUkoVR3FefVKgoyIP+Wv
 oiCeuCyQcYIUmG1pVt1x43OoS+2xgjWQA67AalLLRj1DOA5OkvUL7NGsrZ1iZTUh
 YHQJsK6ER3MgbFFEImtn10NNFwAEG04o6vi42DFW1O0awm6kmVoLjo46wS+UiKoh
 Vx8t5ZGvlYOZ1ZM9N5ETgQnihBt7cOhA3ivZar8h+WiYVTRJs1ZSkpmnlpmM4YY9
 RCZ5DRw3N39R0ezkNVGSr1Xn1vkysIiZI82frrJiPUYLKihsrBzj2Jq3O25iILCf
 Iyv7HBEJxAb3x0zlF6kPhaA8OW4dssaHTLNx5IJSOKwiwVLdm4RPyOHh9QVz++p/
 p0hvSQWK1MUruBbBrjF/FN+FidgK2iU0iDW/GoDwI7OKymSxg7sauLtp0cZpo6nT
 F+Ep6yl/uR5vxih4LSYFJOjoeKuwIo/x92H0qJ3UroaUs9DNJ7UCKchXXiQ1Wtnz
 tAAsWP1YsMxMzlMxqW5J9w4LJynJ8bqrC0L8+HWzIUwikA8wv8/47Pmc/vPW0Y3N
 5L7KMS8/iFCsS8rPmGeP
 =onDl
 -----END PGP SIGNATURE-----

Merge tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFD changes from Samuel Ortiz:
 - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
   TI's TPS65090 and TPS65217.
 - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
   the abx500 and db8500 ST-E chipsets.
 - Some minor fixes and update for the wm8994 from Mark.
 - The beginning of a long term TWL cleanup effort coming from the TI
   folks.
 - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
   drivers.

Fix up trivial conflicts due to duplicate patches and header file
cleanups (<linux/device.h> removal etc).

* tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
  gpio/twl: Add DT support to gpio-twl4030 driver
  gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
  mfd: Detach twl6040 from the pmic mfd driver
  mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
  mfd: Micro-optimization on twl4030 IRQ handler
  mfd: Make twl4030 SIH SPARSE_IRQ capable
  mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
  mfd: Remove references already defineid in header file from twl-core
  mfd: Remove unneeded header from twl-core
  mfd: Make twl-core not depend on pdata->irq_base/end
  ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
  mfd: Return twl6030_mmc_card_detect IRQ for board setup
  Revert "mfd: Add platform data for MAX8997 haptic driver"
  mfd: Add support for TPS65090
  mfd: Add some da9052-i2c section annotations
  mfd: Build rtc5t583 only if I2C config is selected to y.
  mfd: Add anatop mfd driver
  mfd: Fix compilation error in tps65910.h
  mfd: Add 8420 variant to db8500-prcmu
  mfd: Add 8520 PRCMU variant to db8500-prcmu
  ...
2012-03-28 13:56:35 -07:00
..
88pm860x_onkey.c mfd: Add ability to wake the system for 88pm860x 2012-03-06 18:46:49 +01:00
ab8500-ponkey.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08: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
ad714x.h
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
adxl34x.h
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
bfin_rotary.c
bma150.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
cm109.c
cma3000_d0x_i2c.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
cma3000_d0x.c Merge branch 'next' into for-linus 2012-01-08 23:38:23 -08:00
cma3000_d0x.h
cobalt_btns.c
da9052_onkey.c Input: add support for OnKey module for DA9052/53 PMIC 2012-03-04 08:45:14 -08:00
dm355evm_keys.c
gp2ap002a00f.c Input: synaptics_usb - switch to module_usb_driver() 2012-03-16 23:06:34 -07:00
gpio_tilt_polled.c
hp_sdc_rtc.c
ixp4xx-beeper.c
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-03-22 20:20:18 -07:00
keyspan_remote.c
kxtj9.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
m68kspkr.c
Makefile Input: add driver support for MAX8997-haptic 2012-03-16 22:49:25 -07: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
mma8450.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
mpu3050.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
pcap_keys.c
pcf8574_keypad.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
pcf50633-input.c
pcspkr.c
pm8xxx-vibrator.c
pmic8xxx-pwrkey.c
powermate.c
pwm-beeper.c
rb532_button.c
rotary_encoder.c
sgi_btns.c
sparcspkr.c
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
uinput.c
wistron_btns.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
wm831x-on.c
xen-kbdfront.c Xen: consolidate and simplify struct xenbus_driver instantiation 2012-01-04 17:01:17 -05:00
yealink.c
yealink.h