1
0
Fork 0
alistair23-linux/drivers/power
Linus Torvalds 4b78147468 MFD changes for 3.5
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPw2QKAAoJEIqAPN1PVmxKfv8P/2L5d38tc3+9wYuGI1l+k7Mz
 xQt2PdAx/kHQGTjLE1DSoeOD6dn4aodFbPaTcsLsU9Eo4IiJnT68b8adr/bqYHKU
 Cod6NSPJMaBxLBJZxXsA7nY69Z6O5SMjXxEQsiDc24gaP0jjwaeY35KJSfMug8nF
 DA6rvEpchkF8QXzBmkO2t2/uPYr1YWqDZQkauLDnLRG01JnGXFz5ajv9N5pYhiFt
 QyYtheg8yEnfwnQ6AlmRtGK75jZRVmrj0kOzRjE9UL7ZwtzswWJes+RE3tlgk89m
 JQ7KASRmmqLpvcVJ9fG9SlGX//yBO6OEp5Km06RTxgmt0XftBDVqBTjk1EG2tfMR
 SR0NIz6gJ0twKAe6U0d+5HMYalOU45H5ha9e3vCqZ8vl9JfmM95RS+TmWbGcRIqj
 04Y5x3I4zq6e9D0u+211BeuRfzkQiefwWJmdPpn0oac3u5LeYbRj/aQ85fqwJWzG
 f99D9VU5xgfFHPAtL3SLFiwgd9yOiMBar6eeIva+okDyOW3KaEUzs8Y4dgDyvYcg
 IU//JGK51vLVmI5kXtGCwYkgRLF/Y7WKZ8TwypT+SY6iv6tPQVvApOZljq7RC9GI
 mXx2z2slA90jlg3TlEFZfxr1WqbZ3TCbonU1riLeMEtkiXUpLtmKC8gbhOqfGvvn
 Nzgt+YqRJXafZdELb/S+
 =Rh0r
 -----END PGP SIGNATURE-----

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

Pull MFD changes from Samuel Ortiz:
 "Besides the usual cleanups, this one brings:

   * Support for 5 new chipsets: Intel's ICH LPC and SCH Centerton,
     ST-E's STAX211, Samsung's MAX77693 and TI's LM3533.

   * Device tree support for the twl6040, tps65910, da9502 and ab8500
     drivers.

   * Fairly big tps56910, ab8500 and db8500 updates.

   * i2c support for mc13xxx.

   * Our regular update for the wm8xxx driver from Mark."

Fix up various conflicts with other trees, largely due to ab5500 removal
etc.

* tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (106 commits)
  mfd: Fix build break of max77693 by adding REGMAP_I2C option
  mfd: Fix twl6040 build failure
  mfd: Fix max77693 build failure
  mfd: ab8500-core should depend on MFD_DB8500_PRCMU
  gpio: tps65910: dt: process gpio specific device node info
  mfd: Remove the parsing of dt info for tps65910 gpio
  mfd: Save device node parsed platform data for tps65910 sub devices
  mfd: Add r_select to lm3533 platform data
  gpio: Add Intel Centerton support to gpio-sch
  mfd: Emulate active low IRQs as well as active high IRQs for wm831x
  mfd: Mark two lm3533 zone registers as volatile
  mfd: Fix return type of lm533 attribute is_visible
  mfd: Enable Device Tree support in the ab8500-pwm driver
  mfd: Enable Device Tree support in the ab8500-sysctrl driver
  mfd: Add support for Device Tree to twl6040
  mfd: Register the twl6040 child for the ASoC codec unconditionally
  mfd: Allocate twl6040 IRQ numbers dynamically
  mfd: twl6040 code cleanup in interrupt initialization part
  mfd: Enable ab8500-gpadc driver for Device Tree
  mfd: Prevent unassigned pointer from being used in ab8500-gpadc driver
  ...
2012-05-29 11:53:11 -07:00
..
Kconfig Various small bugfixes and enhancements, plus two new drivers: 2012-03-30 16:09:02 -07:00
Makefile Various small bugfixes and enhancements, plus two new drivers: 2012-03-30 16:09:02 -07:00
ab8500_btemp.c ab8500_btemp: Get rid of 'enum adc_therm' 2012-03-26 20:41:09 +04:00
ab8500_charger.c ab8500: Turn unneeded global symbols into local ones 2012-03-26 20:41:14 +04:00
ab8500_fg.c ab8500_fg: Fix some build warnings on x86_64 2012-03-26 20:41:26 +04:00
abx500_chargalg.c ab8500: Turn unneeded global symbols into local ones 2012-03-26 20:41:14 +04:00
apm_power.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
bq27x00_battery.c Merge branch 'master' into for-next 2012-04-08 21:48:52 +02:00
charger-manager.c charger-manager: Simplify charger_get_property(), get rid of a warning 2012-03-26 20:41:20 +04:00
collie_battery.c Merge git://git.infradead.org/users/cbou/battery-urgent 2012-01-10 20:55:11 +04:00
da9030_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
da9052-battery.c da9052-battery: Convert to use module_platform_driver 2012-03-26 20:41:17 +04:00
ds2760_battery.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
ds2780_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
ds2781_battery.c DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers 2012-03-08 11:15:33 -08:00
ds2782_battery.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00
gpio-charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
intel_mid_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
isp1704_charger.c Various small bugfixes and enhancements, plus two new drivers: 2012-03-30 16:09:02 -07:00
jz4740-battery.c jz4740-battery: Fix signedness bug 2012-01-06 05:57:17 +04:00
lp8727_charger.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00
max8903_charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
max8925_power.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
max8997_charger.c max8997_charger: Remove duplicate module.h 2012-01-06 04:59:25 +04:00
max8998_charger.c Revert "max8998_charger: Include linux/module.h just once" 2012-03-26 20:41:27 +04:00
max17040_battery.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00
max17042_battery.c max17042_battery: Clean up interrupt handling 2012-03-26 20:41:29 +04:00
olpc_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
pcf50633-charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
pda_power.c power_supply: Convert all users to new usb_phy 2012-02-13 13:53:21 +02:00
pmu_battery.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
power_supply_core.c power_supply: Drop usage of nowarn variant of sysfs_create_link() 2012-01-07 15:24:51 +04:00
power_supply_leds.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
power_supply_sysfs.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
s3c_adc_battery.c s3c_adc_battery: Average over more than one adc sample 2012-01-06 06:13:35 +04:00
sbs-battery.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00
smb347-charger.c Add I2C driver for Summit Microelectronics SMB347 Battery Charger. 2012-03-26 20:41:01 +04:00
test_power.c power: Make test_power driver more dynamic. 2011-05-20 19:25:08 +04:00
tosa_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
twl4030_charger.c power_supply: Convert all users to new usb_phy 2012-02-13 13:53:21 +02:00
wm97xx_battery.c wm97xx_battery: Use DEFINE_MUTEX() for work_lock 2012-01-06 05:00:30 +04:00
wm831x_backup.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
wm831x_power.c mfd: Convert wm831x to irq_domain 2012-05-20 17:27:07 +02:00
wm8350_power.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
z2_battery.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00