Commit 96c015b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm85) Don't bind to Winbond/Nuvoton WPCD377I
  hwmon: (pcf8591) Documentation clean-ups
  hwmon: Clearly mark ACPI drivers as such
  hwmon: Use resource_size
  hwmon: Include <linux/io.h> instead of <asm/io.h>
  hwmon: (tmp421) Add documentation
  hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips
  hwmon-vid: Ignore 6th VID pin of AMD family 0Fh processors
  hwmon: (asus_atk0110) Add maintainer information
  hwmon: (abituguru3) Support multiple DMI strings per chip ID
parents 3aee0605 5cfaf338

Documentation/hwmon/pcf8591

+15 −13
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ Kernel driver pcf8591 
=====================



Supported chips:

  * Philips PCF8591

  * Philips/NXP PCF8591

    Prefix: 'pcf8591'

    Addresses scanned: I2C 0x48 - 0x4f

    Datasheet: Publicly available at the Philips Semiconductor website

               http://www.semiconductors.philips.com/pip/PCF8591P.html

    Datasheet: Publicly available at the NXP website

               http://www.nxp.com/pip/PCF8591_6.html



Authors:

        Aurelien Jarno <aurelien@aurel32.net>
@@ -16,9 +16,10 @@ Authors: 


Description

-----------



The PCF8591 is an 8-bit A/D and D/A converter (4 analog inputs and one

analog output) for the I2C bus produced by Philips Semiconductors. It

is designed to provide a byte I2C interface to up to 4 separate devices.

analog output) for the I2C bus produced by Philips Semiconductors (now NXP).

It is designed to provide a byte I2C interface to up to 4 separate devices.



The PCF8591 has 4 analog inputs programmable as single-ended or

differential inputs :
@@ -59,7 +60,7 @@ Accessing PCF8591 via /sys interface 


! Be careful !

The PCF8591 is plainly impossible to detect! Stupid chip.

So every chip with address in the interval [48..4f] is

So every chip with address in the interval [0x48..0x4f] is

detected as PCF8591. If you have other chips in this address

range, the workaround is to load this module after the one

for your others chips.
@@ -67,19 +68,20 @@ for your others chips. 
On detection (i.e. insmod, modprobe et al.), directories are being

created for each detected PCF8591:



/sys/bus/devices/<0>-<1>/

/sys/bus/i2c/devices/<0>-<1>/

where <0> is the bus the chip was detected on (e. g. i2c-0)

and <1> the chip address ([48..4f])



Inside these directories, there are such files:

in0, in1, in2, in3, out0_enable, out0_output, name

in0_input, in1_input, in2_input, in3_input, out0_enable, out0_output, name



Name contains chip name.



The in0, in1, in2 and in3 files are RO. Reading gives the value of the

corresponding channel. Depending on the current analog inputs configuration,

files in2 and/or in3 do not exist. Values range are from 0 to 255 for single

ended inputs and -128 to +127 for differential inputs (8-bit ADC).

The in0_input, in1_input, in2_input and in3_input files are RO. Reading gives

the value of the corresponding channel. Depending on the current analog inputs

configuration, files in2_input and in3_input may not exist. Values range

from 0 to 255 for single ended inputs and -128 to +127 for differential inputs

(8-bit ADC).



The out0_enable file is RW. Reading gives "1" for analog output enabled and

"0" for analog output disabled. Writing accepts "0" and "1" accordingly.

Documentation/hwmon/tmp421

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Kernel driver tmp421

====================



Supported chips:

  * Texas Instruments TMP421

    Prefix: 'tmp421'

    Addresses scanned: I2C 0x2a, 0x4c, 0x4d, 0x4e and 0x4f

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp421.html

  * Texas Instruments TMP422

    Prefix: 'tmp422'

    Addresses scanned: I2C 0x2a, 0x4c, 0x4d, 0x4e and 0x4f

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp421.html

  * Texas Instruments TMP423

    Prefix: 'tmp423'

    Addresses scanned: I2C 0x2a, 0x4c, 0x4d, 0x4e and 0x4f

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp421.html



Authors:

	Andre Prendel <andre.prendel@gmx.de>



Description

-----------



This driver implements support for Texas Instruments TMP421, TMP422

and TMP423 temperature sensor chips. These chips implement one local

and up to one (TMP421), up to two (TMP422) or up to three (TMP423)

remote sensors. Temperature is measured in degrees Celsius. The chips

are wired over I2C/SMBus and specified over a temperature range of -40

to +125 degrees Celsius. Resolution for both the local and remote

channels is 0.0625 degree C.



The chips support only temperature measurement. The driver exports

the temperature values via the following sysfs files:



temp[1-4]_input

temp[2-4]_fault

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -931,6 +931,12 @@ W: http://wireless.kernel.org/en/users/Drivers/ar9170 
S:	Maintained

F:	drivers/net/wireless/ath/ar9170/



ATK0110 HWMON DRIVER

M:	Luca Tettamanti <kronos.it@gmail.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	drivers/hwmon/asus_atk0110.c



ATI_REMOTE2 DRIVER

M:	Ville Syrjala <syrjala@sci.fi>

S:	Maintained

drivers/hwmon/Kconfig

+64 −46
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ config HWMON_VID 
	tristate

	default n



config HWMON_DEBUG_CHIP

	bool "Hardware Monitoring Chip debugging messages"

	default n

	help

	  Say Y here if you want the I2C chip drivers to produce a bunch of

	  debug messages to the system log.  Select this if you are having

	  a problem with I2C support and want to see more of what is going

	  on.



comment "Native drivers"



config SENSORS_ABITUGURU

	tristate "Abit uGuru (rev 1 & 2)"

	depends on X86 && EXPERIMENTAL
@@ -248,18 +259,6 @@ config SENSORS_ASB100 
	  This driver can also be built as a module.  If so, the module

	  will be called asb100.



config SENSORS_ATK0110

	tristate "ASUS ATK0110 ACPI hwmon"

	depends on X86 && ACPI && EXPERIMENTAL

	help

	  If you say yes here you get support for the ACPI hardware

	  monitoring interface found in many ASUS motherboards. This

	  driver will provide readings of fans, voltages and temperatures

	  through the system firmware.



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

	  will be called asus_atk0110.



config SENSORS_ATXP1

	tristate "Attansic ATXP1 VID controller"

	depends on I2C && EXPERIMENTAL
@@ -814,6 +813,16 @@ config SENSORS_TMP401 
	  This driver can also be built as a module.  If so, the module

	  will be called tmp401.



config SENSORS_TMP421

	tristate "Texas Instruments TMP421 and compatible"

	depends on I2C && EXPERIMENTAL

	help

	  If you say yes here you get support for Texas Instruments TMP421,

	  TMP422 and TMP423 temperature sensor chips.



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

	  will be called tmp421.



config SENSORS_VIA686A

	tristate "VIA686A"

	depends on PCI
@@ -964,34 +973,6 @@ config SENSORS_HDAPS 
	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of hdaps.



config SENSORS_LIS3LV02D

	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"

	depends on ACPI && INPUT

	select INPUT_POLLDEV

	select NEW_LEDS

	select LEDS_CLASS

	default n

	help

	  This driver provides support for the LIS3LV02Dx accelerometer. In

	  particular, it can be found in a number of HP laptops, which have the

	  "Mobile Data Protection System 3D" or "3D DriveGuard" feature. On such

	  systems the driver should load automatically (via ACPI). The

	  accelerometer might also be found in other systems, connected via SPI

	  or I2C.  The accelerometer data is readable via

	  /sys/devices/platform/lis3lv02d.



	  This driver also provides an absolute input class device, allowing

	  the laptop to act as a pinball machine-esque joystick. On HP laptops,

	  if the led infrastructure is activated, support for a led indicating

	  disk protection will be provided as hp:red:hddprotection.



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

	  will be called lis3lv02d and a specific module for HP laptops will be

	  called hp_accel.



	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of lis3lv02d.



config SENSORS_LIS3_SPI

	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"

	depends on !ACPI && SPI_MASTER && INPUT
@@ -1034,13 +1015,50 @@ config SENSORS_APPLESMC 
	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of applesmc.



config HWMON_DEBUG_CHIP

	bool "Hardware Monitoring Chip debugging messages"

if ACPI



comment "ACPI drivers"



config SENSORS_ATK0110

	tristate "ASUS ATK0110"

	depends on X86 && EXPERIMENTAL

	help

	  If you say yes here you get support for the ACPI hardware

	  monitoring interface found in many ASUS motherboards. This

	  driver will provide readings of fans, voltages and temperatures

	  through the system firmware.



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

	  will be called asus_atk0110.



config SENSORS_LIS3LV02D

	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"

	depends on INPUT

	select INPUT_POLLDEV

	select NEW_LEDS

	select LEDS_CLASS

	default n

	help

	  Say Y here if you want the I2C chip drivers to produce a bunch of

	  debug messages to the system log.  Select this if you are having

	  a problem with I2C support and want to see more of what is going

	  on.

	  This driver provides support for the LIS3LV02Dx accelerometer. In

	  particular, it can be found in a number of HP laptops, which have the

	  "Mobile Data Protection System 3D" or "3D DriveGuard" feature. On such

	  systems the driver should load automatically (via ACPI). The

	  accelerometer might also be found in other systems, connected via SPI

	  or I2C.  The accelerometer data is readable via

	  /sys/devices/platform/lis3lv02d.



	  This driver also provides an absolute input class device, allowing

	  the laptop to act as a pinball machine-esque joystick. On HP laptops,

	  if the led infrastructure is activated, support for a led indicating

	  disk protection will be provided as hp:red:hddprotection.



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

	  will be called lis3lv02d and a specific module for HP laptops will be

	  called hp_accel.



	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of lis3lv02d.



endif # ACPI



endif # HWMON

drivers/hwmon/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
obj-$(CONFIG_HWMON)		+= hwmon.o

obj-$(CONFIG_HWMON_VID)		+= hwmon-vid.o



# APCI drivers

obj-$(CONFIG_SENSORS_ATK0110)	+= asus_atk0110.o



# Native drivers

# asb100, then w83781d go first, as they can override other drivers' addresses.

obj-$(CONFIG_SENSORS_ASB100)	+= asb100.o

obj-$(CONFIG_SENSORS_W83627HF)	+= w83627hf.o
@@ -29,10 +33,8 @@ obj-$(CONFIG_SENSORS_ADT7462) += adt7462.o 
obj-$(CONFIG_SENSORS_ADT7470)	+= adt7470.o

obj-$(CONFIG_SENSORS_ADT7473)	+= adt7473.o

obj-$(CONFIG_SENSORS_ADT7475)	+= adt7475.o



obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o

obj-$(CONFIG_SENSORS_AMS)	+= ams/

obj-$(CONFIG_SENSORS_ATK0110)	+= asus_atk0110.o

obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o

obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o

obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
@@ -84,6 +86,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o 
obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o

obj-$(CONFIG_SENSORS_THMC50)	+= thmc50.o

obj-$(CONFIG_SENSORS_TMP401)	+= tmp401.o

obj-$(CONFIG_SENSORS_TMP421)	+= tmp421.o

obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o

obj-$(CONFIG_SENSORS_VT1211)	+= vt1211.o

obj-$(CONFIG_SENSORS_VT8231)	+= vt8231.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE