Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/hwmon
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
pmbus hwmon: (pmbus_core) Simplify sign extensions 2011-10-24 11:09:44 -07:00
abituguru.c hwmon: (abituguru) Depend on DMI 2011-05-25 20:43:33 +02:00
abituguru3.c hwmon: (abituguru) Depend on DMI 2011-05-25 20:43:33 +02:00
acpi_power_meter.c Move ACPI power meter driver to hwmon 2011-05-25 20:43:32 +02:00
ad7314.c hwmon: AD7314 driver (ported from IIO) 2011-10-24 11:09:41 -07:00
ad7414.c hwmon: (ad7414) add MODULE_DEVICE_TABLE 2011-02-26 08:59:32 -08:00
ad7418.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
adcxx.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
adm1021.c i2c: Drop I2C_CLIENT_INSMOD_2 to 8 2009-12-14 21:17:27 +01:00
adm1025.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
adm1026.c Fix common misspellings 2011-03-31 11:26:23 -03:00
adm1029.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
adm1031.c hwmon: (adm1031) Replace update_rate sysfs attribute with update_interval 2010-09-17 17:24:14 +02:00
adm9240.c hwmon: (adm9240) Implement the standard intrusion detection interface 2011-01-12 21:55:09 +01:00
ads1015.c hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
ads7828.c hwmon: (ads7828) Update email contact details 2011-01-12 21:55:08 +01:00
ads7871.c hwmon: (ads7871) Fix ads7871_probe error paths 2010-08-25 15:42:10 +02:00
adt7411.c hwmon: (adt7411) add MODULE_DEVICE_TABLE 2011-02-26 08:59:32 -08:00
adt7462.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
adt7470.c hwmon: (adt7470) Use pr_fmt and pr_<level> 2011-01-08 10:55:02 -08:00
adt7475.c hwmon: I2C addresses are constant 2010-10-28 20:31:50 +02:00
amc6821.c hwmon: Change mail address of Hans J. Koch 2010-11-15 21:38:56 +01:00
applesmc.c hwmon: (applesmc) Properly initialize lockdep attributes 2011-01-23 09:28:50 -08:00
asb100.c hwmon: (asb1000) Use pr_fmt and pr_<level> 2011-01-08 10:55:03 -08:00
asc7621.c hwmon: I2C addresses are constant 2010-10-28 20:31:50 +02:00
asus_atk0110.c hwmon: (asus_atk0110) Fix memory leak 2011-07-17 18:39:18 +02:00
atxp1.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
coretemp.c coretemp: Get microcode revision from cpu_data 2011-10-14 13:16:42 +02:00
dme1737.c hwmon: (dme1737) Minor cleanups 2011-01-12 21:55:13 +01:00
ds620.c hwmon: (ds620) Fix handling of negative temperatures 2011-09-21 17:25:18 -07:00
ds1621.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
emc6w201.c hwmon: (emc6w201) Properly handle all errors 2011-07-03 13:32:53 +02:00
emc1403.c hwmon: (emc1403) Fix I2C address range 2011-02-09 13:45:52 -08:00
emc2103.c hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller 2010-08-14 21:08:54 +02:00
exynos4_tmu.c hwmon: (exynos4_tmu) Remove IRQF_DISABLED 2011-10-24 11:09:36 -07:00
f71805f.c hwmon: (f71805f) Use pr_fmt and pr_<level> 2011-01-08 10:55:07 -08:00
f71882fg.c hwmon/f71882fg: Make the decision wether to register fan attr. per fan 2011-10-24 11:09:38 -07:00
f75375s.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
fam15h_power.c hwmon: Add driver for AMD family 15h processor power information 2011-05-25 20:43:31 +02:00
fschmd.c hwmon: (fschmd) Drop useless mutex 2011-01-12 21:55:11 +01:00
g760a.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
gl518sm.c i2c: Drop I2C_CLIENT_INSMOD_2 to 8 2009-12-14 21:17:27 +01:00
gl520sm.c treewide: fix potentially dangerous trailing ';' in #defined values/expressions 2011-07-21 14:10:00 +02:00
gpio-fan.c drivers: Final irq namespace conversion 2011-03-29 14:48:19 +02:00
hwmon-vid.c hwmon-vid: Add support for VIA family 6 model D CPU 2011-07-25 21:46:10 +02:00
hwmon.c hwmon: convert idr to ida and use ida_simple interface 2011-10-31 17:30:51 -07:00
i5k_amb.c hwmon: (i5k_amb) Drop i5k_channel_pci_id 2011-08-23 21:04:28 -07:00
ibmaem.c drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get() 2011-10-31 17:30:51 -07:00
ibmpex.c hwmon: (ibmpex) Initialize sysfs attributes 2011-06-17 23:22:27 -07:00
it87.c hwmon: (it87) Add chassis intrusion detection support 2011-07-25 21:46:10 +02:00
jc42.c hwmon: (jc42) Change detection class 2011-05-25 20:43:32 +02:00
jz4740-hwmon.c jz4740: silence warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
k8temp.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
k10temp.c hwmon: (k10temp) Add support for Fam15h (Bulldozer) 2011-05-25 20:43:31 +02:00
Kconfig hwmon: (lm75) Add support for Analog Devices ADT75 2011-10-24 11:09:45 -07:00
lineage-pem.c hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes 2011-03-16 06:57:34 -07:00
lm63.c hwmon: (lm63) Consider LM64 temperature offset 2011-02-09 13:45:42 -08:00
lm70.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
lm73.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
lm75.c hwmon: (lm75) Document why clones are not detected 2011-10-24 11:09:47 -07:00
lm75.h hwmon: (lm75) Add suspend/resume feature 2010-08-14 21:08:50 +02:00
lm77.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
lm78.c hwmon: (lm78) Become the maintainer 2011-07-25 21:46:11 +02:00
lm80.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
lm83.c i2c: Drop I2C_CLIENT_INSMOD_2 to 8 2009-12-14 21:17:27 +01:00
lm85.c hwmon: (lm85) Fix error paths in probe function 2011-04-29 16:33:36 +02:00
lm87.c i2c: Drop I2C_CLIENT_INSMOD_2 to 8 2009-12-14 21:17:27 +01:00
lm90.c hwmon: (lm90) Refactor reading of config2 register 2011-07-28 20:16:36 -07:00
lm92.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
lm93.c hwmon: (lm93) Add support for LM94 2011-01-18 12:22:54 -08:00
lm95241.c hwmon: (lm95241) Add support for LM95231 2011-07-28 00:17:35 -07:00
lm95245.c hwmon: LM95245 driver 2011-07-28 00:17:35 -07:00
ltc4151.c hwmon: Add support for LTC4151 2011-03-14 22:39:11 -07:00
ltc4215.c hwmon: (ltc4215) make sysfs file match the alarm cause 2010-12-13 09:54:50 -08:00
ltc4245.c hwmon: (ltc4245) Expose all GPIO pins as analog voltages 2010-08-14 21:08:49 +02:00
ltc4261.c hwmon: (ltc4261) Fix error message format 2010-11-05 10:17:19 -07:00
Makefile hwmon: AD7314 driver (ported from IIO) 2011-10-24 11:09:41 -07:00
max1111.c hwmon: (max1111) Avoid extra memory allocations 2011-07-25 21:46:10 +02:00
max1619.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
max1668.c hwmon: (max1668) Add support for tempX_fault attributes 2011-07-28 00:17:33 -07:00
max6639.c hwmon: (max6639) Set reasonable default PWM frequency 2011-03-14 22:36:25 -07:00
max6642.c hwmon: (max6642): Better chip detection schema 2011-06-04 10:34:28 -07:00
max6650.c hwmon: (max6650) Properly support the MAX6650 2011-05-25 20:43:32 +02:00
max16065.c hwmon: (max16065) Fix current calculation 2011-09-06 08:56:06 -07:00
mc13783-adc.c hwmon: Convert mc13783-adc to mc13xxx API 2011-10-24 14:09:12 +02:00
ntc_thermistor.c hwmon: (ntc_thermistor) Simplify if sequence 2011-08-22 14:04:05 -07:00
pc87360.c hwmon: (pc87360) Use pr_fmt and pr_<level> 2011-01-12 21:55:11 +01:00
pc87427.c hwmon: (pc87427) Use pr_fmt and pr_<level> 2011-01-12 21:55:11 +01:00
pcf8591.c hwmon: (pcf8591) Use pr_fmt and pr_<level> 2011-01-08 10:55:16 -08:00
s3c-hwmon.c hwmon: (s3c) Initialize sysfs attributes 2011-06-17 23:22:27 -07:00
sch56xx-common.c hwmon: New driver sch5636 2011-07-25 21:46:09 +02:00
sch56xx-common.h hwmon: (sch5627) Factor out some code shared with sch5636 driver 2011-07-25 21:46:09 +02:00
sch5627.c hwmon: (sch5627) Factor out some code shared with sch5636 driver 2011-07-25 21:46:09 +02:00
sch5636.c hwmon: New driver sch5636 2011-07-25 21:46:09 +02:00
sht15.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
sht21.c hwmon: driver for Sensirion SHT21 humidity and temperature sensor 2011-01-08 10:56:28 -08:00
sis5595.c hwmon: (sis5595) Use pr_fmt and pr_<level> 2011-01-08 10:55:18 -08:00
smm665.c hwmon: driver for SMM665 Six-Channel Active DC Output Controller/Monitor 2010-08-09 20:45:10 -07:00
smsc47b397.c hwmon: (smsc47b397) Use pr_fmt and pr_<level> 2011-01-08 10:55:19 -08:00
smsc47m1.c hwmon: (smsc47m1) Use pr_fmt and pr_<level> 2011-01-08 10:55:27 -08:00
smsc47m192.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
thmc50.c i2c: Drop I2C_CLIENT_INSMOD_2 to 8 2009-12-14 21:17:27 +01:00
tmp102.c Fix common misspellings 2011-03-31 11:26:23 -03:00
tmp401.c hwmon: (tmp401) Reorganize code to get rid of static forward declarations 2010-05-27 19:58:49 +02:00
tmp421.c hwmon: I2C addresses are constant 2010-10-28 20:31:50 +02:00
twl4030-madc-hwmon.c hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails 2011-05-01 09:06:35 -07:00
ultra45_env.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
via-cputemp.c hwmon: (via-cputemp) Add VID reporting support 2011-07-25 21:46:10 +02:00
via686a.c hwmon: (via686a) Initialize fan_div values 2011-01-12 21:55:09 +01:00
vt1211.c hwmon: (vt1211) Use pr_fmt and pr_<level> 2011-01-08 10:55:30 -08:00
vt8231.c hwmon: (vt8231) Use pr_fmt and pr_<level> 2011-01-08 10:55:31 -08:00
w83l785ts.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
w83l786ng.c i2c: Drop I2C_CLIENT_INSMOD_1 2009-12-14 21:17:26 +01:00
w83627ehf.c hwmon: (w83627ehf) Better fix for negative temperature values 2011-10-24 11:09:48 -07:00
w83627hf.c hwmon: (w83627hf) Use pr_fmt and pr_<level> 2011-01-08 10:55:33 -08:00
w83781d.c hwmon: (w83781d) Use pr_fmt and pr_<level> 2011-01-12 21:55:11 +01:00
w83791d.c hwmon: (w83791d) rename prototype parameter from 'register' to 'reg' 2011-09-21 17:25:18 -07:00
w83792d.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83793.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83795.c hwmon: (w83795) Silent false warning from gcc 2011-01-12 21:55:09 +01:00
wm831x-hwmon.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
wm8350-hwmon.c hwmon: Add WM835x PMIC hardware monitoring driver 2009-09-17 09:46:51 +02:00