Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6950d76c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of... 

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  max1111.c: fix checkpatch warning
  hwmon: (lm75) fix checkpatch warnings
  hwmon: (lm80) fix checkpatch messages
  hwmon: replaced strict_str* with kstr*
  hwmon: (lm75) fix checkpatch warning
  hwmon: (lm75) added error handling
  hwmon: (ltc4261) set data->valid to 0 if error
  hwmon: (f75375s) Add support for F75387SG/RG
  hwmon: (f75375s) Disable setting DC fan control mode for F75373
  hwmon: (f75375s) Initialize pwmX_mode and pwmX_enable if there is no platform data
  hwmon: (f75375s) Fix value range for PWM modes
  hwmon: (f75375s) Use standard sysfs attribute names
  hwmon: (f75375s) Fix checkpatch errors and warnings
  hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled
  hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]
  hwmon: (pmbus/zl6100) Add support for ZL2005
  hwmon: (pmbus/adm1275) Validate device ID
parents b7d845f8 91c8eabe

Documentation/hwmon/pmbus

+2 −3
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ Kernel driver pmbus 
====================



Supported chips:

  * Ericsson BMR45X series

    DC/DC Converter

    Prefixes: 'bmr450', 'bmr451', 'bmr453', 'bmr454'

  * Ericsson BMR453, BMR454

    Prefixes: 'bmr453', 'bmr454'

    Addresses scanned: -

    Datasheet:

 http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146395

Documentation/hwmon/zl6100

+15 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ Supported chips: 
    Prefix: 'zl2004'

    Addresses scanned: -

    Datasheet: http://www.intersil.com/data/fn/fn6847.pdf

  * Intersil / Zilker Labs ZL2005

    Prefix: 'zl2005'

    Addresses scanned: -

    Datasheet: http://www.intersil.com/data/fn/fn6848.pdf

  * Intersil / Zilker Labs ZL2006

    Prefix: 'zl2006'

    Addresses scanned: -
@@ -30,6 +34,17 @@ Supported chips: 
    Prefix: 'zl6105'

    Addresses scanned: -

    Datasheet: http://www.intersil.com/data/fn/fn6906.pdf

  * Ericsson BMR450, BMR451

    Prefix: 'bmr450', 'bmr451'

    Addresses scanned: -

    Datasheet:

http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146401

  * Ericsson BMR462, BMR463, BMR464

    Prefixes: 'bmr462', 'bmr463', 'bmr464'

    Addresses scanned: -

    Datasheet:

http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256





Author: Guenter Roeck <guenter.roeck@ericsson.com>

drivers/hwmon/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -367,11 +367,11 @@ config SENSORS_F71882FG 
	  will be called f71882fg.



config SENSORS_F75375S

	tristate "Fintek F75375S/SP and F75373"

	tristate "Fintek F75375S/SP, F75373 and F75387"

	depends on I2C

	help

	  If you say yes here you get support for hardware monitoring

	  features of the Fintek F75375S/SP and F75373

	  features of the Fintek F75375S/SP, F75373 and F75387



	  This driver can also be built as a module.  If so, the module

	  will be called f75375s.

drivers/hwmon/acpi_power_meter.c

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static ssize_t set_avg_interval(struct device *dev, 
	unsigned long long data;

	acpi_status status;



	res = strict_strtoul(buf, 10, &temp);

	res = kstrtoul(buf, 10, &temp);

	if (res)

		return res;
@@ -241,7 +241,7 @@ static ssize_t set_cap(struct device *dev, struct device_attribute *devattr, 
	unsigned long long data;

	acpi_status status;



	res = strict_strtoul(buf, 10, &temp);

	res = kstrtoul(buf, 10, &temp);

	if (res)

		return res;
@@ -311,7 +311,7 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr, 
	int res;

	unsigned long temp;



	res = strict_strtoul(buf, 10, &temp);

	res = kstrtoul(buf, 10, &temp);

	if (res)

		return res;

drivers/hwmon/adcxx.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static ssize_t adcxx_set_max(struct device *dev, 
	struct adcxx *adc = spi_get_drvdata(spi);

	unsigned long value;



	if (strict_strtoul(buf, 10, &value))

	if (kstrtoul(buf, 10, &value))

		return -EINVAL;



	if (mutex_lock_interruptible(&adc->lock))