leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59cf4243e5
linux/drivers/hwmon
History
Jean Delvare 59cf4243e5 hwmon: (ntc_thermistor) Fix dependencies 
In commit 9e8269de, support was added for ntc_thermistor devices being
declared in the device tree and implemented on top of IIO. With that
change, a dependency was added to the ntc_thermistor driver:

	depends on (!OF && !IIO) || (OF && IIO)

This construct has the drawback that the driver can no longer be
selected when OF is set and IIO isn't, nor when IIO is set and OF is
not. This is a regression for the original users of the driver.

As the new code depends on IIO and is useless without OF, include it
only if both are enabled, and set the dependencies accordingly. This
is clearer, more simple and more correct.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: 9e8269de hwmon: (ntc_thermistor) Add DT with IIO support to NTC thermistor driver
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Cc: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Cc: Doug Anderson <dianders@chromium.org>
2014-05-25 17:23:08 +02:00
..
pmbus hwmon: (pmbus/ltc2978) Add support for LTM4676 2014-03-19 18:59:40 -07:00
ab8500.c hwmon: Add ST-Ericsson ABX500 hwmon driver 2013-04-16 18:27:52 -07:00
abituguru3.c hwmon: Correct some typos 2013-10-18 09:12:02 -07:00
abituguru.c hwmon: Correct some typos 2013-10-18 09:12:02 -07:00
abx500.c hwmon: (abx500) Staticize abx500_temp_attributes 2013-07-14 16:24:25 -07:00
abx500.h hwmon: Add ST-Ericsson ABX500 hwmon driver 2013-04-16 18:27:52 -07:00
acpi_power_meter.c ACPI: Clean up inclusions of ACPI header files 2013-12-07 01:03:14 +01:00
ad7314.c hwmon: (ad7314) use spi_get_drvdata() and spi_set_drvdata() 2013-04-07 21:16:42 -07:00
ad7414.c hwmon: Replace SENSORS_LIMIT with clamp_val 2013-01-25 21:03:54 -08:00
ad7418.c hwmon: (ad7418) Convert to use devm_ functions 2012-09-23 21:08:29 -07:00
adc128d818.c hwmon: Driver for TI ADC128D818 2014-03-03 08:01:04 -08:00
adcxx.c hwmon: (adcxx) Remove redundant spi_set_drvdata 2013-10-18 09:12:01 -07:00
adm1021.c hwmon: (adm1021) Convert to use devm_hwmon_device_register_with_groups 2014-04-04 18:01:34 +02:00
adm1025.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
adm1026.c hwmon: Remove unnecessary semicolons 2013-10-13 16:16:25 -07:00
adm1029.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
adm1031.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
adm9240.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
ads1015.c hwmon: (ads1015) Add support for ADS1115 2013-08-11 22:10:40 -07:00
ads7828.c hwmon: use dev_get_platdata() 2013-08-11 22:10:39 -07:00
ads7871.c hwmon: Fix CamelCase checkpatch warnings 2013-04-07 21:16:40 -07:00
adt7x10.c hwmon: (adt7x10) Add alarm interrupt support 2013-04-07 21:16:38 -07:00
adt7x10.h hwmon: (adt7x10) Add alarm interrupt support 2013-04-07 21:16:38 -07:00
adt7310.c hwmon: (adt7310) Use spi_w8r16be() instead spi_w8r16() 2013-10-03 13:52:15 +01:00
adt7410.c hwmon: (adt7x10) Add alarm interrupt support 2013-04-07 21:16:38 -07:00
adt7411.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
adt7462.c hwmon: (adt7462) Use error value returned from find_trange_value() 2013-10-13 16:16:26 -07:00
adt7470.c hwmon: Change my email address. 2013-08-27 08:28:01 -07:00
adt7475.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
amc6821.c hwmon: (amc6821) Remove redundant break 2013-09-11 13:01:40 -07:00
applesmc.c hwmon: (applesmc) Always read until end of data 2013-10-09 09:48:55 -07:00
asb100.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
asc7621.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
asus_atk0110.c ACPI: Clean up inclusions of ACPI header files 2013-12-07 01:03:14 +01:00
atxp1.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
coretemp.c Revert "hwmon: (coretemp) Refine TjMax detection" 2014-05-01 04:07:52 -07:00
da9052-hwmon.c hwmon: (da9052) Fix adc to voltage calculation 2014-01-14 21:36:31 -08:00
da9055-hwmon.c hwmon: (da9055) Remove use of regmap_irq_get_virq() 2014-02-06 17:22:33 -08:00
dme1737.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
ds620.c hwmon: use dev_get_platdata() 2013-08-11 22:10:39 -07:00
ds1621.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
emc6w201.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
emc1403.c hwmon: (emc1403) Support full range of known chip revision numbers 2014-05-12 08:37:06 -07:00
emc2103.c hwmon: (emc2103) Return error from i2c_smbus_read_byte_data 2014-03-03 08:01:04 -08:00
f71805f.c hwmon: (f71805f) Fix author's address 2014-04-04 18:01:32 +02:00
f71882fg.c hwmon: (f71882fg) Remove extra return statement 2013-10-13 16:16:27 -07:00
f75375s.c hwmon: (f75375s) Don't crash the kernel unnecessarily 2013-10-13 16:16:27 -07:00
fam15h_power.c hwmon: remove DEFINE_PCI_DEVICE_TABLE macro 2014-01-14 21:36:30 -08:00
fschmd.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
g760a.c hwmon: Replace SENSORS_LIMIT with clamp_val 2013-01-25 21:03:54 -08:00
g762.c hwmon: use dev_get_platdata() 2013-08-11 22:10:39 -07:00
gl518sm.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
gl520sm.c hwmon: Replace SENSORS_LIMIT with clamp_val 2013-01-25 21:03:54 -08:00
gpio-fan.c hwmon: (gpio-fan) Include linux/of.h header 2013-10-18 09:12:02 -07:00
hih6130.c hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK 2013-12-11 13:37:30 -08:00
htu21.c hwmon: (htu21) Add Measurement Specialties HTU21D support 2013-08-29 09:09:12 -07:00
hwmon-vid.c hwmon: (hwmon-vid) Add __maybe_unused attribute to dummy variable 2013-09-10 06:28:17 -07:00
hwmon.c hwmon: Do not accept invalid name attributes 2014-03-03 08:01:06 -08:00
i5k_amb.c hwmon: Change my email address. 2013-08-27 08:28:01 -07:00
ibmaem.c hwmon: (ibmaem) Fix return value 2013-09-11 13:01:32 -07:00
ibmpex.c hwmon: Change my email address. 2013-08-27 08:28:01 -07:00
iio_hwmon.c hwmon: (iio_hwmon) Convert to use hwmon_device_register_with_groups 2014-03-03 08:01:03 -08:00
ina2xx.c hwmon: (ina2xx) Convert to use devm_hwmon_device_register_with_groups 2013-10-13 16:16:29 -07:00
ina209.c hwmon: (ina209) Convert to use devm_hwmon_device_register_with_groups 2013-10-18 09:11:57 -07:00
it87.c hwmon: (it87) Add support for IT8623E 2014-04-04 18:01:35 +02:00
jc42.c hwmon: (jc42) fix coccinelle warnings 2013-10-18 09:12:01 -07:00
jz4740-hwmon.c hwmon: (jz4740) Use devm_ioremap_resource() 2014-03-03 08:01:03 -08:00
k8temp.c hwmon: remove DEFINE_PCI_DEVICE_TABLE macro 2014-01-14 21:36:30 -08:00
k10temp.c hwmon: (k10temp) Add support for AMD F16 M30h processor 2014-04-02 22:09:14 -07:00
Kconfig hwmon: (ntc_thermistor) Fix dependencies 2014-05-25 17:23:08 +02:00
lineage-pem.c hwmon: (lineage-pem) Add missing terminating entry for pem_[input|fan]_attributes 2013-03-14 06:55:21 -07:00
lm63.c hwmon: (lm63) Avoid initializing the same field twice 2014-04-04 18:01:33 +02:00
lm70.c hwmon: (lm70) Remove redundant spi_set_drvdata 2013-10-18 09:12:01 -07:00
lm73.c hwmon: (lm73) Convert to use devm_hwmon_device_register_with_groups 2013-10-13 16:16:28 -07:00
lm75.c hwmon: lm75: expose to thermal fw via DT nodes 2013-12-04 09:34:24 -04:00
lm75.h hwmon: (lm75.h) Update header inclusion 2013-03-18 21:19:49 +01:00
lm77.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
lm78.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
lm80.c hwmon: (lm80) Convert to use devm_hwmon_device_register_with_groups 2014-04-04 18:01:34 +02:00
lm83.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
lm85.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
lm87.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
lm90.c hwmon: (lm90) Convert to use hwmon_device_register_with_groups 2014-04-04 18:01:35 +02:00
lm92.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
lm93.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
lm95234.c hwmon: (lm95234) fix coccinelle warnings 2013-10-18 09:12:00 -07:00
lm95241.c hwmon: (lm95241) Avoid initializing the same field twice 2014-03-03 08:01:04 -08:00
lm95245.c hwmon: (lm95245) Make temp2_crit_hyst read-only 2014-03-03 08:01:06 -08:00
ltc2945.c hwmon: (ltc2945) Don't crash the kernel unnecessarily 2014-04-24 06:09:43 -07:00
ltc4151.c hwmon: (ltc4151) Fix 'Avoid unnecessary line continuations' checkpatch warning 2013-04-07 21:16:40 -07:00
ltc4215.c hwmon: (ltc4215) Convert to devm_hwmon_device_register_with_groups 2014-03-03 08:01:05 -08:00
ltc4222.c hwmon: Driver for Linear Technologies LTC4222 2014-03-03 08:01:03 -08:00
ltc4245.c hwmon: (ltc4245) Remove devicetree conditionals 2014-03-03 08:01:05 -08:00
ltc4260.c hwmon: Driver for Linear Technologies LTC4260 2014-03-03 08:01:03 -08:00
ltc4261.c hwmon: (ltc4261) fix coccinelle warnings 2013-10-18 09:12:00 -07:00
Makefile Revert "powerpc/powernv: hwmon driver for power values, fan rpm and temperature" 2014-04-09 12:56:37 +10:00
max197.c hwmon: use dev_get_platdata() 2013-08-11 22:10:39 -07:00
max1111.c hwmon: remove use of __devexit 2012-11-28 11:50:34 -08:00
max1619.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
max1668.c hwmon: (max1668) Convert to use devm_hwmon_device_register_with_groups 2014-03-03 08:01:04 -08:00
max6639.c hwmon: (max6639) Use SIMPLE_DEV_PM_OPS macro 2014-03-03 08:01:06 -08:00
max6642.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
max6650.c hwmon: (max6650) Introduce local 'dev' variable 2014-03-03 08:01:06 -08:00
max6697.c hwmon: (max6697) fix coccinelle warnings 2013-10-18 09:11:59 -07:00
max16065.c hwmon: (max16065) Convert to use devm_hwmon_device_register_with_groups 2013-10-13 16:16:29 -07:00
mc13783-adc.c hwmon: (mc13783-adc) Increase size of name string 2013-10-13 16:16:26 -07:00
mcp3021.c hwmon: use dev_get_platdata() 2013-08-11 22:10:39 -07:00
nct6775.c Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 2014-01-29 18:56:27 -08:00
ntc_thermistor.c hwmon: (ntc_thermistor) Fix dependencies 2014-05-25 17:23:08 +02:00
pc87360.c hwmon: (pc87360) Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
pc87427.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
pcf8591.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
s3c-hwmon.c hwmon: use dev_get_platdata() 2013-08-11 22:10:39 -07:00
sch56xx-common.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
sch56xx-common.h watchdog: sch56xx: Use watchdog core 2012-05-30 07:55:38 +02:00
sch5627.c hwmon: remove use of __devinit 2012-11-28 11:49:40 -08:00
sch5636.c hwmon: remove use of __devinit 2012-11-28 11:49:40 -08:00
sht15.c New driver for HTU21D (humidity sensor) 2013-09-03 10:43:35 -07:00
sht21.c hwmon: remove use of __devexit 2012-11-28 11:50:34 -08:00
sis5595.c Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 2014-01-29 18:56:27 -08:00
smm665.c hwmon: (smm665): Return error from i2c_smbus_read_word_swapped 2014-03-03 08:01:03 -08:00
smsc47b397.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
smsc47m1.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
smsc47m192.c hwmon: Replace SENSORS_LIMIT with clamp_val 2013-01-25 21:03:54 -08:00
thmc50.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
tmp102.c hwmon: tmp102: expose to thermal fw via DT nodes 2013-12-04 09:34:25 -04:00
tmp401.c hwmon: (tmp401) Convert to use devm_hwmon_device_register_with_groups 2013-10-18 09:11:52 -07:00
tmp421.c hwmon: (tmp421) Fix return value 2013-09-11 13:01:41 -07:00
twl4030-madc-hwmon.c hwmon: (twl4030-madc-hwmon) Fix warning message caused by removal of __devexit 2012-12-16 18:21:33 -08:00
ultra45_env.c hwmon: remove use of __devexit 2012-11-28 11:50:34 -08:00
vexpress.c hwmon: (vexpress) Avoid creating non-existing attributes 2014-04-24 06:02:10 -07:00
via686a.c hwmon: remove DEFINE_PCI_DEVICE_TABLE macro 2014-01-14 21:36:30 -08:00
via-cputemp.c hwmon, via-cputemp: Fix CPU hotplug callback registration 2014-03-20 13:43:48 +01:00
vt1211.c hwmon: Fix checkpatch warning 'quoted string split across lines' 2013-04-07 21:16:40 -07:00
vt8231.c hwmon: remove DEFINE_PCI_DEVICE_TABLE macro 2014-01-14 21:36:30 -08:00
w83l785ts.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
w83l786ng.c hwmon: (w83l768ng) Fix fan speed control range 2013-12-12 08:05:32 +01:00
w83627ehf.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
w83627hf.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
w83781d.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
w83791d.c hwmon: Correct some typos 2013-10-18 09:12:02 -07:00
w83792d.c hwmon: Avoid initializing the same field twice 2014-04-04 18:01:34 +02:00
w83793.c hwmon: (w83793) Clean up a signedness issue 2013-10-19 09:04:25 -07:00
w83795.c Update Jean Delvare's e-mail address 2014-01-29 20:40:08 +01:00
wm831x-hwmon.c hwmon: remove use of __devexit 2012-11-28 11:50:34 -08:00
wm8350-hwmon.c hwmon: remove use of __devexit 2012-11-28 11:50:34 -08:00