original_kernel/drivers/hwmon
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
..
pmbus hwmon: (zl6100) Add support for ZL9101M and ZL9117M 2012-03-18 18:27:53 -07:00
Kconfig hwmon: Add MCP3021 ADC driver 2012-03-23 10:02:20 +01:00
Makefile hwmon: Add MCP3021 ADC driver 2012-03-23 10:02:20 +01:00
abituguru.c hwmon: (abituguru) Fix checkpatch issues 2012-03-18 18:27:18 -07:00
abituguru3.c hwmon: (abituguru3) Fix multi-line comments 2012-03-18 18:27:12 -07:00
acpi_power_meter.c
ad7314.c hwmon: convert drivers/hwmon/* to use module_spi_driver() 2012-03-18 18:26:51 -07:00
ad7414.c hwmon: (ad7414) Fix multi-line comments 2012-03-18 18:26:58 -07:00
ad7418.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
adcxx.c hwmon: convert drivers/hwmon/* to use module_spi_driver() 2012-03-18 18:26:51 -07:00
adm1021.c hwmon: (adm1021) Fix checkpatch issues 2012-03-18 18:27:19 -07:00
adm1025.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
adm1026.c hwmon: (adm1026) Fix checkpatch issues 2012-03-18 18:27:19 -07:00
adm1029.c hwmon: (adm1029) Fix multi-line comments 2012-03-18 18:27:32 -07:00
adm1031.c hwmon: (adm1031) Fix multi-line comments 2012-03-18 18:27:33 -07:00
adm9240.c hwmon: (adm9240) Fix checkpatch issues 2012-03-18 18:27:20 -07:00
ads1015.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
ads7828.c hwmon: (ads7828) Fix multi-line comments 2012-03-18 18:27:12 -07:00
ads7871.c hwmon: (ads7871) Fix multi-line comments 2012-03-18 18:27:13 -07:00
adt7411.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
adt7462.c hwmon: (adt7462) Fix checkpatch issues 2012-03-18 18:27:02 -07:00
adt7470.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
adt7475.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
amc6821.c hwmon: (amc6821) Fix multi-line comments 2012-03-18 18:27:14 -07:00
applesmc.c hwmon: (applesmc) Silence uninitialized warnings 2012-03-18 18:27:41 -07:00
asb100.c hwmon: (asb100): Fix checkpatch issues 2012-03-18 18:27:21 -07:00
asc7621.c hwmon: (asc7621) Fix multi-line comments 2012-03-18 18:26:54 -07:00
asus_atk0110.c hwmon: (asus_atk0110) Fix multi-line comments 2012-03-18 18:26:59 -07:00
atxp1.c hwmon: (atxp1) Fix checkpatch issues 2012-03-18 18:27:03 -07:00
coretemp.c hwmon changes for v3.4 2012-03-21 10:37:25 -07:00
dme1737.c hwmon: (dme1737) Fix checkpatch issues 2012-03-18 18:27:21 -07:00
ds620.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
ds1621.c hwmon: (ds1621) Fix checkpatch issues 2012-03-18 18:26:51 -07:00
emc6w201.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
emc1403.c hwmon: (emc1403) Fix multi-line comments 2012-03-18 18:27:14 -07:00
emc2103.c hwmon: (emc2103) Fix multi-line comments 2012-03-18 18:27:33 -07:00
exynos4_tmu.c
f71805f.c hwmon: (f71805f) Fix checkpatch issues 2012-03-18 18:26:48 -07:00
f71882fg.c hwmon: (f71882fg) Fix multi-line comments 2012-03-18 18:27:15 -07:00
f75375s.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
fam15h_power.c hwmon: (fam15h_power) Increase output resolution 2012-03-23 10:02:17 +01:00
fschmd.c watchdog: nowayout is bool 2012-03-27 20:06:02 +02:00
g760a.c hwmon: (g760a) Fix multi-line comments 2012-03-18 18:27:16 -07:00
gl518sm.c hwmon: (gl518sm) Fix checkpatch issues 2012-03-18 18:27:22 -07:00
gl520sm.c hwmon: (gl520sm) Fix: do not use assignment in if condition 2012-03-18 18:27:23 -07:00
gpio-fan.c
hwmon-vid.c hwmon: (hwmon-vid) Fix checkpatch issues 2012-03-18 18:27:44 -07:00
hwmon.c hwmon: (hwmon) Fix multi-line comments 2012-03-18 18:26:52 -07:00
i5k_amb.c hwmon: (i5k_amb) fix checkpatch issues 2012-03-18 18:26:30 -07:00
ibmaem.c hwmon: (ibmaem) fix checkpatch issues 2012-03-18 18:26:35 -07:00
ibmpex.c
it87.c hwmon: (it87) Constify fixed string arrays 2012-03-18 18:26:58 -07:00
jc42.c hwmon: (jc42) Remove unnecessary device IDs 2012-03-18 18:27:53 -07:00
jz4740-hwmon.c
k8temp.c hwmon: (k8temp) fix checkpatch issues 2012-03-18 18:26:42 -07:00
k10temp.c hwmon: use DEFINE_PCI_DEVICE_TABLE 2012-03-18 18:26:29 -07:00
lineage-pem.c hwmon: (lineage-pem) Convert to use devm_kzalloc 2012-03-18 18:27:44 -07:00
lm63.c hwmon: (lm63) Let the user adjust the lookup table 2012-03-23 10:02:19 +01:00
lm70.c hwmon: (lm70) Fix: do not use assignment in if condition 2012-03-18 18:27:40 -07:00
lm73.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
lm75.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
lm75.h
lm77.c hwmon: (lm77) Fix checkpatch issues 2012-03-18 18:27:24 -07:00
lm78.c hwmon: (lm78) Fix checkpatch issues 2012-03-18 18:27:24 -07:00
lm80.c hwmon: (lm80) Add detection of NatSemi/TI LM96080 2012-03-18 18:27:43 -07:00
lm83.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
lm85.c hwmon: (lm85) Fix checkpatch issues 2012-03-18 18:27:25 -07:00
lm87.c hwmon: (lm87) Get rid of macro-generated functions 2012-03-18 18:27:42 -07:00
lm90.c hwmon: (lm90) Restore original configuration if probe function fails 2012-03-23 10:02:18 +01:00
lm92.c hwmon: (lm92) Fix checkpatch issues 2012-03-18 18:27:05 -07:00
lm93.c hwmon: (lm93) Fix checkpatch issues 2012-03-18 18:27:06 -07:00
lm95241.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
lm95245.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
ltc4151.c hwmon: (ltc4151) Fix multi-line comments 2012-03-18 18:27:16 -07:00
ltc4215.c hwmon: (ltc4215) Fix multi-line comments 2012-03-18 18:27:02 -07:00
ltc4245.c hwmon: (ltc4245) Fix multi-line comments 2012-03-18 18:27:01 -07:00
ltc4261.c hwmon: (ltc4261) Convert to use devm_kzalloc 2012-03-18 18:27:46 -07:00
max1111.c hwmon: (max1111) Fix multi-line comments 2012-03-18 18:27:17 -07:00
max1619.c hwmon: (max1619): Fix checkpatch issues 2012-03-18 18:27:26 -07:00
max1668.c hwmon: (max1668) Fix multi-line comments 2012-03-18 18:27:35 -07:00
max6639.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
max6642.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
max6650.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
max16065.c hwmon: (max16065) Convert to use devm_kzalloc 2012-03-18 18:27:48 -07:00
mc13783-adc.c MFD changes for 3.4 2012-03-28 13:56:35 -07:00
mcp3021.c hwmon: Add MCP3021 ADC driver 2012-03-23 10:02:20 +01:00
ntc_thermistor.c
pc87360.c hwmon: (pc87360) Fix: do not use assignment in if condition 2012-03-18 18:27:27 -07:00
pc87427.c hwmon: (pc87427) Fix multi-line comments 2012-03-18 18:27:35 -07:00
pcf8591.c hwmon: (pcf8591) Fix checkpatch issues 2012-03-18 18:27:07 -07:00
s3c-hwmon.c
sch56xx-common.c hwmon: (sch56xx) Add support for the integrated watchdog (v2) 2012-03-20 06:42:05 -07:00
sch56xx-common.h hwmon: (sch56xx) Add support for the integrated watchdog (v2) 2012-03-20 06:42:05 -07:00
sch5627.c hwmon: (sch56xx) Add support for the integrated watchdog (v2) 2012-03-20 06:42:05 -07:00
sch5636.c hwmon: (sch56xx) Add support for the integrated watchdog (v2) 2012-03-20 06:42:05 -07:00
sht15.c hwmon: (sht15) fix checkpatch issues 2012-03-18 18:26:36 -07:00
sht21.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
sis5595.c hwmon: (sis5595) Fix checkpatch issues 2012-03-18 18:27:07 -07:00
smm665.c hwmon: (smm665) Convert to use devm_kzalloc 2012-03-18 18:27:47 -07:00
smsc47b397.c hwmon: (smsc47b397) Fix multi-line comments 2012-03-18 18:27:36 -07:00
smsc47m1.c hwmon: (smsc47m1) Fix checkpatch issues 2012-03-18 18:27:09 -07:00
smsc47m192.c hwmon: (smsc47m192) Fix checkpatch issues 2012-03-18 18:27:08 -07:00
thmc50.c hwmon: (thmc50) Fix checkpatch issues 2012-03-18 18:27:10 -07:00
tmp102.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
tmp401.c hwmon changes for v3.4 2012-03-21 10:37:25 -07:00
tmp421.c hwmon: convert drivers/hwmon/* to use module_i2c_driver() 2012-03-18 18:26:50 -07:00
twl4030-madc-hwmon.c
ultra45_env.c hwmon: (ultra45_env) Fix checkpatch issues 2012-03-18 18:27:10 -07:00
via-cputemp.c HWMON: Convert via-cputemp to x86 cpuid autoprobing 2012-01-26 16:48:12 -08:00
via686a.c hwmon: (via686a) Fix checkpatch issues 2012-03-18 18:27:28 -07:00
vt1211.c hwmon: (vt1211) Fix: do not use assignment in if condition 2012-03-18 18:27:29 -07:00
vt8231.c hwmon: (vt8231) Fix multi-line comments 2012-03-18 18:26:49 -07:00
w83l785ts.c hwmon: (w83l785ts) Fix multi-line comments 2012-03-18 18:27:38 -07:00
w83l786ng.c hwmon: (w83l786ng) Fix multi-line comments 2012-03-18 18:27:39 -07:00
w83627ehf.c hwmon: (w83627ehf) Add support for temperature offset registers 2012-03-18 18:27:54 -07:00
w83627hf.c hwmon: (w83627hf) Fix checkpatch issues 2012-03-18 18:27:32 -07:00
w83781d.c hwmon: (w83781d) Fix: do not use assignment in if condition 2012-03-18 18:27:37 -07:00
w83791d.c hwmon: (w83791d) Fix checkpatch issues 2012-03-18 18:27:11 -07:00
w83792d.c hwmon: (w83792d) Fix checkpatch issues 2012-03-18 18:27:30 -07:00
w83793.c watchdog: nowayout is bool 2012-03-27 20:06:02 +02:00
w83795.c hwmon: (w83795) Fix multi-line comments 2012-03-23 10:02:18 +01:00
wm831x-hwmon.c hwmon: (wm831x-hwmon) Fix multi-line comments 2012-03-18 18:26:55 -07:00
wm8350-hwmon.c hwmon: (wm8350-hwmon) Constify fixed string array 2012-03-18 18:27:00 -07:00