Patched in Tegra support.

39 files changed, 159 insertions, 1296 deletions

diff --git a/Documentation/hwmon/ad7314 b/Documentation/hwmon/ad7314
deleted file mode 100644
index 1912549c746..00000000000
--- a/Documentation/hwmon/ad7314
+++ /dev/null
@@ -1,25 +0,0 @@
-Kernel driver ad7314
-====================
-
-Supported chips:
-   * Analog Devices AD7314
-     Prefix: 'ad7314'
-     Datasheet: Publicly available at Analog Devices website.
-   * Analog Devices ADT7301
-     Prefix: 'adt7301'
-     Datasheet: Publicly available at Analog Devices website.
-   * Analog Devices ADT7302
-     Prefix: 'adt7302'
-     Datasheet: Publicly available at Analog Devices website.
-
-Description
------------
-
-Driver supports the above parts.  The ad7314 has a 10 bit
-sensor with 1lsb = 0.25 degrees centigrade. The adt7301 and
-adt7302 have 14 bit sensors with 1lsb = 0.03125 degrees centigrade.
-
-Notes
------
-
-Currently power down mode is not supported.
diff --git a/Documentation/hwmon/adm1275 b/Documentation/hwmon/adm1275
index 2cfa2566712..097b3ccc4be 100644
--- a/Documentation/hwmon/adm1275
+++ b/Documentation/hwmon/adm1275
@@ -2,18 +2,10 @@ Kernel driver adm1275
 =====================
 
 Supported chips:
-  * Analog Devices ADM1075
-    Prefix: 'adm1075'
-    Addresses scanned: -
-    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1075.pdf
   * Analog Devices ADM1275
     Prefix: 'adm1275'
     Addresses scanned: -
     Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1275.pdf
-  * Analog Devices ADM1276
-    Prefix: 'adm1276'
-    Addresses scanned: -
-    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf
 
 Author: Guenter Roeck <guenter.roeck@ericsson.com>
 
@@ -21,13 +13,13 @@ Author: Guenter Roeck <guenter.roeck@ericsson.com>
 Description
 -----------
 
-This driver supports hardware montoring for Analog Devices ADM1075, ADM1275,
-and ADM1276 Hot-Swap Controller and Digital Power Monitor.
+This driver supports hardware montoring for Analog Devices ADM1275 Hot-Swap
+Controller and Digital Power Monitor.
 
-ADM1075, ADM1275, and ADM1276 are hot-swap controllers that allow a circuit
-board to be removed from or inserted into a live backplane. They also feature
-current and voltage readback via an integrated 12-bit analog-to-digital
-converter (ADC), accessed using a PMBus interface.
+The ADM1275 is a hot-swap controller that allows a circuit board to be removed
+from or inserted into a live backplane. It also features current and voltage
+readback via an integrated 12-bit analog-to-digital converter (ADC), accessed
+using a PMBus. interface.
 
 The driver is a client driver to the core PMBus driver. Please see
 Documentation/hwmon/pmbus for details on PMBus client drivers.
@@ -40,10 +32,6 @@ This driver does not auto-detect devices. You will have to instantiate the
 devices explicitly. Please see Documentation/i2c/instantiating-devices for
 details.
 
-The ADM1075, unlike many other PMBus devices, does not support internal voltage
-or current scaling. Reported voltages, currents, and power are raw measurements,
-and will typically have to be scaled.
-
 
 Platform data support
 ---------------------
@@ -59,34 +47,18 @@ The following attributes are supported. Limits are read-write, history reset
 attributes are write-only, all other attributes are read-only.
 
 in1_label               "vin1" or "vout1" depending on chip variant and
-                        configuration. On ADM1075, vout1 reports the voltage on
-                        the VAUX pin.
-in1_input               Measured voltage.
-in1_min                 Minimum Voltage.
-in1_max                 Maximum voltage.
-in1_min_alarm           Voltage low alarm.
-in1_max_alarm           Voltage high alarm.
+                        configuration.
+in1_input               Measured voltage. From READ_VOUT register.
+in1_min                 Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
+in1_max                 Maximum voltage. From VOUT_OV_WARN_LIMIT register.
+in1_min_alarm           Voltage low alarm. From VOLTAGE_UV_WARNING status.
+in1_max_alarm           Voltage high alarm. From VOLTAGE_OV_WARNING status.
 in1_highest             Historical maximum voltage.
 in1_reset_history       Write any value to reset history.
 
 curr1_label             "iout1"
-curr1_input             Measured current.
-curr1_max               Maximum current.
-curr1_max_alarm         Current high alarm.
-curr1_lcrit             Critical minimum current. Depending on the chip
-                        configuration, either curr1_lcrit or curr1_crit is
-                        supported, but not both.
-curr1_lcrit_alarm       Critical current low alarm.
-curr1_crit              Critical maximum current. Depending on the chip
-                        configuration, either curr1_lcrit or curr1_crit is
-                        supported, but not both.
-curr1_crit_alarm        Critical current high alarm.
+curr1_input             Measured current. From READ_IOUT register.
+curr1_max               Maximum current. From IOUT_OC_WARN_LIMIT register.
+curr1_max_alarm         Current high alarm. From IOUT_OC_WARN_LIMIT register.
 curr1_highest           Historical maximum current.
 curr1_reset_history     Write any value to reset history.
-
-power1_label            "pin1"
-power1_input            Input power.
-power1_reset_history    Write any value to reset history.
-
-                        Power attributes are supported on ADM1075 and ADM1276
-                        only.
diff --git a/Documentation/hwmon/ads7828 b/Documentation/hwmon/ads7828
index f6e263e0f60..2bbebe6f771 100644
--- a/Documentation/hwmon/ads7828
+++ b/Documentation/hwmon/ads7828
@@ -4,47 +4,29 @@ Kernel driver ads7828
 Supported chips:
   * Texas Instruments/Burr-Brown ADS7828
     Prefix: 'ads7828'
-    Datasheet: Publicly available at the Texas Instruments website:
+    Addresses scanned: I2C 0x48, 0x49, 0x4a, 0x4b
+    Datasheet: Publicly available at the Texas Instruments website :
                http://focus.ti.com/lit/ds/symlink/ads7828.pdf
 
-  * Texas Instruments ADS7830
-    Prefix: 'ads7830'
-    Datasheet: Publicly available at the Texas Instruments website:
-               http://focus.ti.com/lit/ds/symlink/ads7830.pdf
-
 Authors:
         Steve Hardy <shardy@redhat.com>
-        Vivien Didelot <vivien.didelot@savoirfairelinux.com>
-        Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
-
-Platform data
--------------
-
-The ads7828 driver accepts an optional ads7828_platform_data structure (defined
-in include/linux/platform_data/ads7828.h). The structure fields are:
 
-* diff_input: (bool) Differential operation
-  set to true for differential mode, false for default single ended mode.
+Module Parameters
+-----------------
 
-* ext_vref: (bool) External reference
-  set to true if it operates with an external reference, false for default
-  internal reference.
-
-* vref_mv: (unsigned int) Voltage reference
-  if using an external reference, set this to the reference voltage in mV,
-  otherwise it will default to the internal value (2500mV). This value will be
-  bounded with limits accepted by the chip, described in the datasheet.
-
- If no structure is provided, the configuration defaults to single ended
- operation and internal voltage reference (2.5V).
+* se_input: bool (default Y)
+  Single ended operation - set to N for differential mode
+* int_vref: bool (default Y)
+  Operate with the internal 2.5V reference - set to N for external reference
+* vref_mv: int (default 2500)
+  If using an external reference, set this to the reference voltage in mV
 
 Description
 -----------
 
-This driver implements support for the Texas Instruments ADS7828 and ADS7830.
+This driver implements support for the Texas Instruments ADS7828.
 
-The ADS7828 device is a 12-bit 8-channel A/D converter, while the ADS7830 does
-8-bit sampling.
+This device is a 12-bit 8-channel A-D converter.
 
 It can operate in single ended mode (8 +ve inputs) or in differential mode,
 where 4 differential pairs can be measured.
@@ -52,7 +34,3 @@ where 4 differential pairs can be measured.
 The chip also has the facility to use an external voltage reference.  This
 may be required if your hardware supplies the ADS7828 from a 5V supply, see
 the datasheet for more details.
-
-There is no reliable way to identify this chip, so the driver will not scan
-some addresses to try to auto-detect it. That means that you will have to
-statically declare the device in the platform support code.
diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410
deleted file mode 100644
index 96004000dc2..00000000000
--- a/Documentation/hwmon/adt7410
+++ /dev/null
@@ -1,51 +0,0 @@
-Kernel driver adt7410
-=====================
-
-Supported chips:
-  * Analog Devices ADT7410
-    Prefix: 'adt7410'
-    Addresses scanned: I2C 0x48 - 0x4B
-    Datasheet: Publicly available at the Analog Devices website
-               http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf
-
-Author: Hartmut Knaack <knaack.h@gmx.de>
-
-Description
------------
-
-The ADT7410 is a temperature sensor with rated temperature range of -55°C to
-+150°C. It has a high accuracy of +/-0.5°C and can be operated at a resolution
-of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an INT pin to
-indicate that a minimum or maximum temperature set point has been exceeded, as
-well as a critical temperature (CT) pin to indicate that the critical
-temperature set point has been exceeded. Both pins can be set up with a common
-hysteresis of 0°C - 15°C and a fault queue, ranging from 1 to 4 events. Both
-pins can individually set to be active-low or active-high, while the whole
-device can either run in comparator mode or interrupt mode. The ADT7410
-supports continous temperature sampling, as well as sampling one temperature
-value per second or even justget one sample on demand for power saving.
-Besides, it can completely power down its ADC, if power management is
-required.
-
-Configuration Notes
--------------------
-
-Since the device uses one hysteresis value, which is an offset to minimum,
-maximum and critical temperature, it can only be set for temp#_max_hyst.
-However, temp#_min_hyst and temp#_crit_hyst show their corresponding
-hysteresis.
-The device is set to 16 bit resolution and comparator mode.
-
-sysfs-Interface
----------------
-
-temp#_input             - temperature input
-temp#_min               - temperature minimum setpoint
-temp#_max               - temperature maximum setpoint
-temp#_crit              - critical temperature setpoint
-temp#_min_hyst          - hysteresis for temperature minimum (read-only)
-temp#_max_hyst          - hysteresis for temperature maximum (read/write)
-temp#_crit_hyst         - hysteresis for critical temperature (read-only)
-temp#_min_alarm         - temperature minimum alarm flag
-temp#_max_alarm         - temperature maximum alarm flag
-temp#_crit_alarm        - critical temperature alarm flag
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 3374c085678..84d46c0c71a 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -6,9 +6,7 @@ Supported chips:
     Prefix: 'coretemp'
     CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
                               0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
-                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),
-                              0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),
-                              0x36 (Cedar Trail Atom)
+                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)
     Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
                Volume 3A: System Programming Guide
                http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
@@ -54,17 +52,6 @@ Some information comes from ark.intel.com
 
 Process         Processor                                       TjMax(C)
 
-22nm            Core i5/i7 Processors
-                i7 3920XM, 3820QM, 3720QM, 3667U, 3520M         105
-                i5 3427U, 3360M/3320M                           105
-                i7 3770/3770K                                   105
-                i5 3570/3570K, 3550, 3470/3450                  105
-                i7 3770S                                        103
-                i5 3570S/3550S, 3475S/3470S/3450S               103
-                i7 3770T                                        94
-                i5 3570T                                        94
-                i5 3470T                                        91
-
 32nm            Core i3/i5/i7 Processors
                 i7 660UM/640/620, 640LM/620, 620M, 610E         105
                 i5 540UM/520/430, 540M/520/450/430              105
@@ -78,11 +65,6 @@ Process		Processor					TjMax(C)
                 U3400                                           105
                 P4505/P4500                                     90
 
-32nm            Atom Processors
-                Z2460                                           90
-                D2700/2550/2500                                 100
-                N2850/2800/2650/2600                            100
-
 45nm            Xeon Processors 5400 Quad-Core
                 X5492, X5482, X5472, X5470, X5460, X5450        85
                 E5472, E5462, E5450/40/30/20/10/05              85
@@ -98,16 +80,11 @@ Process		Processor					TjMax(C)
 
 45nm            Atom Processors
                 D525/510/425/410                                100
-                Z670/650                                        90
                 Z560/550/540/530P/530/520PT/520/515/510PT/510P  90
                 Z510/500                                        90
-                N570/550                                        100
                 N475/470/455/450                                100
                 N280/270                                        90
                 330/230                                         125
-                E680/660/640/620                                90
-                E680T/660T/640T/620T                            110
-                CE4170/4150/4110                                110
 
 45nm            Core2 Processors
                 Solo ULV SU3500/3300                            100
diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052
deleted file mode 100644
index 5bc51346b68..00000000000
--- a/Documentation/hwmon/da9052
+++ /dev/null
@@ -1,61 +0,0 @@
-Supported chips:
-  * Dialog Semiconductors DA9052-BC and DA9053-AA/Bx PMICs
-    Prefix: 'da9052'
-    Datasheet: Datasheet is not publicly available.
-
-Authors: David Dajun Chen <dchen@diasemi.com>
-
-Description
------------
-
-The DA9052/53 provides an Analogue to Digital Converter (ADC) with 10 bits
-resolution and track and hold circuitry combined with an analogue input
-multiplexer. The analogue input multiplexer will allow conversion of up to 10
-different inputs. The track and hold circuit ensures stable input voltages at
-the input of the ADC during the conversion.
-
-The ADC is used to measure the following inputs:
-Channel 0: VDDOUT - measurement of the system voltage
-Channel 1: ICH - internal battery charger current measurement
-Channel 2: TBAT - output from the battery NTC
-Channel 3: VBAT - measurement of the battery voltage
-Channel 4: ADC_IN4 - high impedance input (0 - 2.5V)
-Channel 5: ADC_IN5 - high impedance input (0 - 2.5V)
-Channel 6: ADC_IN6 - high impedance input (0 - 2.5V)
-Channel 7: XY - TSI interface to measure the X and Y voltage of the touch
-           screen resistive potentiometers
-Channel 8: Internal Tjunc. - sense (internal temp. sensor)
-Channel 9: VBBAT - measurement of the backup battery voltage
-
-By using sysfs attributes we can measure the system voltage VDDOUT, the battery
-charging current ICH, battery temperature TBAT, battery junction temperature
-TJUNC, battery voltage VBAT and the back up battery voltage VBBAT.
-
-Voltage Monitoring
-------------------
-
-Voltages are sampled by a 10 bit ADC.
-
-The battery voltage is calculated as:
-        Milli volt = ((ADC value * 1000) / 512) + 2500
-
-The backup battery voltage is calculated as:
-        Milli volt = (ADC value * 2500) / 512;
-
-The voltages on ADC channels 4, 5 and 6 are calculated as:
-        Milli volt = (ADC value * 2500) / 1023
-
-Temperature Monitoring
-----------------------
-
-Temperatures are sampled by a 10 bit ADC.  Junction and battery temperatures
-are monitored by the ADC channels.
-
-The junction temperature is calculated:
-        Degrees celsius = 1.708 * (TJUNC_RES - T_OFFSET) - 108.8
-The junction temperature attribute is supported by the driver.
-
-The battery temperature is calculated:
-        Degree Celsius = 1 / (t1 + 1/298)- 273
-where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255))
-Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively.
diff --git a/Documentation/hwmon/da9055 b/Documentation/hwmon/da9055
deleted file mode 100644
index 855c3f536e0..00000000000
--- a/Documentation/hwmon/da9055
+++ /dev/null
@@ -1,47 +0,0 @@
-Supported chips:
-  * Dialog Semiconductors DA9055 PMIC
-    Prefix: 'da9055'
-    Datasheet: Datasheet is not publicly available.
-
-Authors: David Dajun Chen <dchen@diasemi.com>
-
-Description
------------
-
-The DA9055 provides an Analogue to Digital Converter (ADC) with 10 bits
-resolution and track and hold circuitry combined with an analogue input
-multiplexer. The analogue input multiplexer will allow conversion of up to 5
-different inputs. The track and hold circuit ensures stable input voltages at
-the input of the ADC during the conversion.
-
-The ADC is used to measure the following inputs:
-Channel 0: VDDOUT - measurement of the system voltage
-Channel 1: ADC_IN1 - high impedance input (0 - 2.5V)
-Channel 2: ADC_IN2 - high impedance input (0 - 2.5V)
-Channel 3: ADC_IN3 - high impedance input (0 - 2.5V)
-Channel 4: Internal Tjunc. - sense (internal temp. sensor)
-
-By using sysfs attributes we can measure the system voltage VDDOUT,
-chip junction temperature and auxiliary channels voltages.
-
-Voltage Monitoring
-------------------
-
-Voltages are sampled in a AUTO mode it can be manually sampled too and results
-are stored in a 10 bit ADC.
-
-The system voltage is calculated as:
-        Milli volt = ((ADC value * 1000) / 85) + 2500
-
-The voltages on ADC channels 1, 2 and 3 are calculated as:
-        Milli volt = (ADC value * 1000) / 102
-
-Temperature Monitoring
-----------------------
-
-Temperatures are sampled by a 10 bit ADC.  Junction temperatures
-are monitored by the ADC channels.
-
-The junction temperature is calculated:
-        Degrees celsius = -0.4084 * (ADC_RES - T_OFFSET) + 307.6332
-The junction temperature attribute is supported by the driver.
diff --git a/Documentation/hwmon/fam15h_power b/Documentation/hwmon/fam15h_power
index 80654813d04..a92918e0bd6 100644
--- a/Documentation/hwmon/fam15h_power
+++ b/Documentation/hwmon/fam15h_power
@@ -10,7 +10,7 @@ Supported chips:
   BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors
     (not yet published)
 
-Author: Andreas Herrmann <herrmann.der.user@googlemail.com>
+Author: Andreas Herrmann <andreas.herrmann3@amd.com>
 
 Description
 -----------
diff --git a/Documentation/hwmon/hih6130 b/Documentation/hwmon/hih6130
deleted file mode 100644
index 73dae918ea7..00000000000
--- a/Documentation/hwmon/hih6130
+++ /dev/null
@@ -1,37 +0,0 @@
-Kernel driver hih6130
-=====================
-
-Supported chips:
-  * Honeywell HIH-6130 / HIH-6131
-    Prefix: 'hih6130'
-    Addresses scanned: none
-    Datasheet: Publicly available at the Honeywell website
-    http://sensing.honeywell.com/index.php?ci_id=3106&la_id=1&defId=44872
-
-Author:
-  Iain Paton <ipaton0@gmail.com>
-
-Description
------------
-
-The HIH-6130 & HIH-6131 are humidity and temperature sensors in a SO8 package.
-The difference between the two devices is that the HIH-6131 has a condensation
-filter.
-
-The devices communicate with the I2C protocol. All sensors are set to the same
-I2C address 0x27 by default, so an entry with I2C_BOARD_INFO("hih6130", 0x27)
-can be used in the board setup code.
-
-Please see Documentation/i2c/instantiating-devices for details on how to
-instantiate I2C devices.
-
-sysfs-Interface
----------------
-
-temp1_input - temperature input
-humidity1_input - humidity input
-
-Notes
------
-
-Command mode and alarms are not currently supported.
diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx
deleted file mode 100644
index 03444f9d833..00000000000
--- a/Documentation/hwmon/ina2xx
+++ /dev/null
@@ -1,47 +0,0 @@
-Kernel driver ina2xx
-====================
-
-Supported chips:
-  * Texas Instruments INA219
-    Prefix: 'ina219'
-    Addresses: I2C 0x40 - 0x4f
-    Datasheet: Publicly available at the Texas Instruments website
-               http://www.ti.com/
-
-  * Texas Instruments INA220
-    Prefix: 'ina220'
-    Addresses: I2C 0x40 - 0x4f
-    Datasheet: Publicly available at the Texas Instruments website
-               http://www.ti.com/
-
-  * Texas Instruments INA226
-    Prefix: 'ina226'
-    Addresses: I2C 0x40 - 0x4f
-    Datasheet: Publicly available at the Texas Instruments website
-               http://www.ti.com/
-
-  * Texas Instruments INA230
-    Prefix: 'ina230'
-    Addresses: I2C 0x40 - 0x4f
-    Datasheet: Publicly available at the Texas Instruments website
-               http://www.ti.com/
-
-Author: Lothar Felten <l-felten@ti.com>
-
-Description
------------
-
-The INA219 is a high-side current shunt and power monitor with an I2C
-interface. The INA219 monitors both shunt drop and supply voltage, with
-programmable conversion times and filtering.
-
-The INA220 is a high or low side current shunt and power monitor with an I2C
-interface. The INA220 monitors both shunt drop and supply voltage.
-
-The INA226 is a current shunt and power monitor with an I2C interface.
-The INA226 monitors both a shunt voltage drop and bus supply voltage.
-
-The INA230 is a high or low side current shunt and power monitor with an I2C
-interface. The INA230 monitors both a shunt voltage drop and bus supply voltage.
-
-The shunt value in micro-ohms can be set via platform data.
diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87
index 8386aadc0a8..6f496a58673 100644
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
@@ -26,18 +26,6 @@ Supported chips:
     Prefix: 'it8721'
     Addresses scanned: from Super I/O config space (8 I/O ports)
     Datasheet: Not publicly available
-  * IT8728F
-    Prefix: 'it8728'
-    Addresses scanned: from Super I/O config space (8 I/O ports)
-    Datasheet: Not publicly available
-  * IT8782F
-    Prefix: 'it8782'
-    Addresses scanned: from Super I/O config space (8 I/O ports)
-    Datasheet: Not publicly available
-  * IT8783E/F
-    Prefix: 'it8783'
-    Addresses scanned: from Super I/O config space (8 I/O ports)
-    Datasheet: Not publicly available
   * SiS950   [clone of IT8705F]
     Prefix: 'it87'
     Addresses scanned: from Super I/O config space (8 I/O ports)
@@ -71,7 +59,7 @@ Module Parameters
 Hardware Interfaces
 -------------------
 
-All the chips supported by this driver are LPC Super-I/O chips, accessed
+All the chips suported by this driver are LPC Super-I/O chips, accessed
 through the LPC bus (ISA-like I/O ports). The IT8712F additionally has an
 SMBus interface to the hardware monitoring functions. This driver no
 longer supports this interface though, as it is slower and less reliable
@@ -83,8 +71,7 @@ Description
 -----------
 
 This driver implements support for the IT8705F, IT8712F, IT8716F,
-IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E, IT8781F, IT8782F,
-IT8783E/F, and SiS950 chips.
+IT8718F, IT8720F, IT8721F, IT8726F, IT8758E and SiS950 chips.
 
 These chips are 'Super I/O chips', supporting floppy disks, infrared ports,
 joysticks and other miscellaneous stuff. For hardware monitoring, they
@@ -108,19 +95,16 @@ The IT8716F, IT8718F, IT8720F, IT8721F/IT8758E and later IT8712F revisions
 have support for 2 additional fans. The additional fans are supported by the
 driver.
 
-The IT8716F, IT8718F, IT8720F, IT8721F/IT8758E, IT8782F, IT8783E/F, and late
-IT8712F and IT8705F also have optional 16-bit tachometer counters for fans 1 to
-3. This is better (no more fan clock divider mess) but not compatible with the
-older chips and revisions. The 16-bit tachometer mode is enabled by the driver
-when one of the above chips is detected.
+The IT8716F, IT8718F, IT8720F and IT8721F/IT8758E, and late IT8712F and
+IT8705F also have optional 16-bit tachometer counters for fans 1 to 3. This
+is better (no more fan clock divider mess) but not compatible with the older
+chips and revisions. The 16-bit tachometer mode is enabled by the driver when
+one of the above chips is detected.
 
 The IT8726F is just bit enhanced IT8716F with additional hardware
 for AMD power sequencing. Therefore the chip will appear as IT8716F
 to userspace applications.
 
-The IT8728F is considered compatible with the IT8721F, until a datasheet
-becomes available (hopefully.)
-
 Temperatures are measured in degrees Celsius. An alarm is triggered once
 when the Overtemperature Shutdown limit is crossed.
 
@@ -137,13 +121,12 @@ alarm is triggered if the voltage has crossed a programmable minimum or
 maximum limit. Note that minimum in this case always means 'closest to
 zero'; this is important for negative voltage measurements. All voltage
 inputs can measure voltages between 0 and 4.08 volts, with a resolution of
-0.016 volt (except IT8721F/IT8758E and IT8728F: 0.012 volt.) The battery
-voltage in8 does not have limit registers.
+0.016 volt (except IT8721F/IT8758E: 0.012 volt.) The battery voltage in8 does
+not have limit registers.
 
-On the IT8721F/IT8758E, IT8782F, and IT8783E/F, some voltage inputs are
-internal and scaled inside the chip (in7 (optional for IT8782F and IT8783E/F),
-in8 and optionally in3). The driver handles this transparently so user-space
-doesn't have to care.
+On the IT8721F/IT8758E, some voltage inputs are internal and scaled inside
+the chip (in7, in8 and optionally in3). The driver handles this transparently
+so user-space doesn't have to care.
 
 The VID lines (IT8712F/IT8716F/IT8718F/IT8720F) encode the core voltage value:
 the voltage level your processor should work with. This is hardcoded by
@@ -209,13 +192,3 @@ doesn't use CPU cycles.
 Trip points must be set properly before switching to automatic fan speed
 control mode. The driver will perform basic integrity checks before
 actually switching to automatic control mode.
-
-
-Temperature offset attributes
------------------------------
-
-The driver supports temp[1-3]_offset sysfs attributes to adjust the reported
-temperature for thermal diodes or diode-connected thermal transistors.
-If a temperature sensor is configured for thermistors, the attribute values
-are ignored. If the thermal sensor type is Intel PECI, the temperature offset
-must be programmed to the critical CPU temperature.
diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42
index 66ecb9fc824..a22ecf48f25 100644
--- a/Documentation/hwmon/jc42
+++ b/Documentation/hwmon/jc42
@@ -3,49 +3,56 @@ Kernel driver jc42
 
 Supported chips:
   * Analog Devices ADT7408
+    Prefix: 'adt7408'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
         http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf
-  * Atmel AT30TS00
-    Datasheets:
-        http://www.atmel.com/Images/doc8585.pdf
-  * IDT TSE2002B3, TSE2002GB2, TS3000B3, TS3000GB2
+  * IDT TSE2002B3, TS3000B3
+    Prefix: 'tse2002b3', 'ts3000b3'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
-        http://www.idt.com/sites/default/files/documents/IDT_TSE2002B3C_DST_20100512_120303152056.pdf
-        http://www.idt.com/sites/default/files/documents/IDT_TSE2002GB2A1_DST_20111107_120303145914.pdf
-        http://www.idt.com/sites/default/files/documents/IDT_TS3000B3A_DST_20101129_120303152013.pdf
-        http://www.idt.com/sites/default/files/documents/IDT_TS3000GB2A1_DST_20111104_120303151012.pdf
+        http://www.idt.com/products/getdoc.cfm?docid=18715691
+        http://www.idt.com/products/getdoc.cfm?docid=18715692
   * Maxim MAX6604
+    Prefix: 'max6604'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
         http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf
-  * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP9843
+  * Microchip MCP9805, MCP98242, MCP98243, MCP9843
+    Prefixes: 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
-        http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf
         http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf
         http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf
         http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf
-  * NXP Semiconductors SE97, SE97B, SE98, SE98A
+  * NXP Semiconductors SE97, SE97B
+    Prefix: 'se97'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
         http://www.nxp.com/documents/data_sheet/SE97.pdf
         http://www.nxp.com/documents/data_sheet/SE97B.pdf
+  * NXP Semiconductors SE98
+    Prefix: 'se98'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
         http://www.nxp.com/documents/data_sheet/SE98.pdf
-        http://www.nxp.com/documents/data_sheet/SE98A.pdf
   * ON Semiconductor CAT34TS02, CAT6095
+    Prefix: 'cat34ts02', 'cat6095'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheet:
         http://www.onsemi.com/pub_link/Collateral/CAT34TS02-D.PDF
         http://www.onsemi.com/pub/Collateral/CAT6095-D.PDF
-  * ST Microelectronics STTS424, STTS424E02, STTS2002, STTS3000
+  * ST Microelectronics STTS424, STTS424E02
+    Prefix: 'stts424'
+    Addresses scanned: I2C 0x18 - 0x1f
     Datasheets:
-        http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00157556.pdf
-        http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00157558.pdf
-        http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00225278.pdf
-        http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATA_BRIEF/CD00270920.pdf
+        http://www.st.com/stonline/products/literature/ds/13447/stts424.pdf
+        http://www.st.com/stonline/products/literature/ds/13448/stts424e02.pdf
   * JEDEC JC 42.4 compliant temperature sensor chips
-    Datasheet:
-        http://www.jedec.org/sites/default/files/docs/4_01_04R19.pdf
-
-  Common for all chips:
     Prefix: 'jc42'
     Addresses scanned: I2C 0x18 - 0x1f
+    Datasheet:
+        http://www.jedec.org/sites/default/files/docs/4_01_04R19.pdf
 
 Author:
         Guenter Roeck <guenter.roeck@ericsson.com>
diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index 90956b61802..a10f73624ad 100644
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -11,7 +11,7 @@ Supported chips:
   Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
 * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
 * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
-* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
+* AMD Family 15h processors: "Bulldozer"
 
   Prefix: 'k10temp'
   Addresses scanned: PCI space
diff --git a/Documentation/hwmon/lm63 b/Documentation/hwmon/lm63
index 4d30d209881..b9843eab1af 100644
--- a/Documentation/hwmon/lm63
+++ b/Documentation/hwmon/lm63
@@ -12,11 +12,6 @@ Supported chips:
     Addresses scanned: I2C 0x18 and 0x4e
     Datasheet: Publicly available at the National Semiconductor website
                http://www.national.com/pf/LM/LM64.html
-  * National Semiconductor LM96163
-    Prefix: 'lm96163'
-    Addresses scanned: I2C 0x4c
-    Datasheet: Publicly available at the National Semiconductor website
-               http://www.national.com/pf/LM/LM96163.html
 
 Author: Jean Delvare <khali@linux-fr.org>
 
@@ -54,24 +49,16 @@ value for measuring the speed of the fan. It can measure fan speeds down to
 Note that the pin used for fan monitoring is shared with an alert out
 function. Depending on how the board designer wanted to use the chip, fan
 speed monitoring will or will not be possible. The proper chip configuration
-is left to the BIOS, and the driver will blindly trust it. Only the original
-LM63 suffers from this limitation, the LM64 and LM96163 have separate pins
-for fan monitoring and alert out. On the LM64, monitoring is always enabled;
-on the LM96163 it can be disabled.
+is left to the BIOS, and the driver will blindly trust it.
 
 A PWM output can be used to control the speed of the fan. The LM63 has two
 PWM modes: manual and automatic. Automatic mode is not fully implemented yet
 (you cannot define your custom PWM/temperature curve), and mode change isn't
 supported either.
 
-The lm63 driver will not update its values more frequently than configured with
-the update_interval sysfs attribute; reading them more often will do no harm,
-but will return 'old' values. Values in the automatic fan control lookup table
-(attributes pwm1_auto_*) have their own independent lifetime of 5 seconds.
+The lm63 driver will not update its values more frequently than every
+second; reading them more often will do no harm, but will return 'old'
+values.
 
 The LM64 is effectively an LM63 with GPIO lines. The driver does not
 support these GPIO lines at present.
-
-The LM96163 is an enhanced version of LM63 with improved temperature accuracy
-and better PWM resolution. For LM96163, the external temperature sensor type is
-configurable as CPU embedded diode(1) or 3904 transistor(2).
diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70
index 86d182942c5..0d240291e3c 100644
--- a/Documentation/hwmon/lm70
+++ b/Documentation/hwmon/lm70
@@ -6,10 +6,6 @@ Supported chips:
     Datasheet: http://www.national.com/pf/LM/LM70.html
   * Texas Instruments TMP121/TMP123
     Information: http://focus.ti.com/docs/prod/folders/print/tmp121.html
-  * National Semiconductor LM71
-    Datasheet: http://www.ti.com/product/LM71
-  * National Semiconductor LM74
-    Datasheet: http://www.ti.com/product/LM74
 
 Author:
         Kaiwan N Billimoria <kaiwan@designergraphix.com>
@@ -35,11 +31,9 @@ As a real (in-tree) example of this "SPI protocol driver" interfacing
 with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c
 and its associated documentation.
 
-The LM74 and TMP121/TMP123 are very similar; main difference is 13-bit
-temperature data (0.0625 degrees celsius resolution).
-
-The LM71 is also very similar; main difference is 14-bit temperature
-data (0.03125 degrees celsius resolution).
+The TMP121/TMP123 are very similar; main differences are 4 wire SPI inter-
+face (read only) and 13-bit temperature data (0.0625 degrees celsius reso-
+lution).
 
 Thanks to
 ---------
diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75
index c91a1d15fa2..a1790401fdd 100644
--- a/Documentation/hwmon/lm75
+++ b/Documentation/hwmon/lm75
@@ -12,46 +12,26 @@ Supported chips:
     Addresses scanned: I2C 0x48 - 0x4f
     Datasheet: Publicly available at the National Semiconductor website
                http://www.national.com/
-  * Dallas Semiconductor DS75, DS1775
-    Prefixes: 'ds75', 'ds1775'
-    Addresses scanned: none
+  * Dallas Semiconductor DS75
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.maxim-ic.com/
+  * Dallas Semiconductor DS1775
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4f
     Datasheet: Publicly available at the Dallas Semiconductor website
                http://www.maxim-ic.com/
   * Maxim MAX6625, MAX6626
-    Prefixes: 'max6625', 'max6626'
-    Addresses scanned: none
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4b
     Datasheet: Publicly available at the Maxim website
                http://www.maxim-ic.com/
   * Microchip (TelCom) TCN75
     Prefix: 'lm75'
-    Addresses scanned: none
-    Datasheet: Publicly available at the Microchip website
-               http://www.microchip.com/
-  * Microchip MCP9800, MCP9801, MCP9802, MCP9803
-    Prefix: 'mcp980x'
-    Addresses scanned: none
+    Addresses scanned: I2C 0x48 - 0x4f
     Datasheet: Publicly available at the Microchip website
                http://www.microchip.com/
-  * Analog Devices ADT75
-    Prefix: 'adt75'
-    Addresses scanned: none
-    Datasheet: Publicly available at the Analog Devices website
-               http://www.analog.com/adt75
-  * ST Microelectronics STDS75
-    Prefix: 'stds75'
-    Addresses scanned: none
-    Datasheet: Publicly available at the ST website
-               http://www.st.com/internet/analog/product/121769.jsp
-  * Texas Instruments TMP100, TMP101, TMP105, TMP75, TMP175, TMP275
-    Prefixes: 'tmp100', 'tmp101', 'tmp105', 'tmp175', 'tmp75', 'tmp275'
-    Addresses scanned: none
-    Datasheet: Publicly available at the Texas Instruments website
-               http://www.ti.com/product/tmp100
-               http://www.ti.com/product/tmp101
-               http://www.ti.com/product/tmp105
-               http://www.ti.com/product/tmp75
-               http://www.ti.com/product/tmp175
-               http://www.ti.com/product/tmp275
 
 Author: Frodo Looijaard <frodol@dds.nl>
 
@@ -70,16 +50,21 @@ range of -55 to +125 degrees.
 The LM75 only updates its values each 1.5 seconds; reading it more often
 will do no harm, but will return 'old' values.
 
-The original LM75 was typically used in combination with LM78-like chips
-on PC motherboards, to measure the temperature of the processor(s). Clones
-are now used in various embedded designs.
+The LM75 is usually used in combination with LM78-like chips, to measure
+the temperature of the processor(s).
+
+The DS75, DS1775, MAX6625, and MAX6626 are supported as well.
+They are not distinguished from an LM75. While most of these chips
+have three additional bits of accuracy (12 vs. 9 for the LM75),
+the additional bits are not supported. Not only that, but these chips will
+not be detected if not in 9-bit precision mode (use the force parameter if
+needed).
+
+The TCN75 is supported as well, and is not distinguished from an LM75.
 
 The LM75 is essentially an industry standard; there may be other
 LM75 clones not listed here, with or without various enhancements,
-that are supported. The clones are not detected by the driver, unless
-they reproduce the exact register tricks of the original LM75, and must
-therefore be instantiated explicitly. The specific enhancements (such as
-higher resolution) are not currently supported by the driver.
+that are supported.
 
 The LM77 is not supported, contrary to what we pretended for a long time.
 Both chips are simply not compatible, value encoding differs.
diff --git a/Documentation/hwmon/lm80 b/Documentation/hwmon/lm80
index a60b43efc32..cb5b407ba3e 100644
--- a/Documentation/hwmon/lm80
+++ b/Documentation/hwmon/lm80
@@ -7,11 +7,6 @@ Supported chips:
     Addresses scanned: I2C 0x28 - 0x2f
     Datasheet: Publicly available at the National Semiconductor website
                http://www.national.com/
-  * National Semiconductor LM96080
-    Prefix: 'lm96080'
-    Addresses scanned: I2C 0x28 - 0x2f
-    Datasheet: Publicly available at the National Semiconductor website
-               http://www.national.com/
 
 Authors:
         Frodo Looijaard <frodol@dds.nl>,
@@ -22,9 +17,7 @@ Description
 
 This driver implements support for the National Semiconductor LM80.
 It is described as a 'Serial Interface ACPI-Compatible Microprocessor
-System Hardware Monitor'. The LM96080 is a more recent incarnation,
-it is pin and register compatible, with a few additional features not
-yet supported by the driver.
+System Hardware Monitor'.
 
 The LM80 implements one temperature sensor, two fan rotation speed sensors,
 seven voltage sensors, alarms, and some miscellaneous stuff.
diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90
index b466974e142..9cd14cfe651 100644
--- a/Documentation/hwmon/lm90
+++ b/Documentation/hwmon/lm90
@@ -118,10 +118,6 @@ Supported chips:
     Addresses scanned: I2C 0x48 through 0x4F
     Datasheet: Publicly available at NXP website
                http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf
-  * GMT G781
-    Prefix: 'g781'
-    Addresses scanned: I2C 0x4c, 0x4d
-    Datasheet: Not publicly available from GMT
 
 Author: Jean Delvare <khali@linux-fr.org>
 
diff --git a/Documentation/hwmon/ltc2978 b/Documentation/hwmon/ltc2978
deleted file mode 100644
index c365f9beb5d..00000000000
--- a/Documentation/hwmon/ltc2978
+++ /dev/null
@@ -1,103 +0,0 @@
-Kernel driver ltc2978
-=====================
-
-Supported chips:
-  * Linear Technology LTC2978
-    Prefix: 'ltc2978'
-    Addresses scanned: -
-    Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf
-  * Linear Technology LTC3880
-    Prefix: 'ltc3880'
-    Addresses scanned: -
-    Datasheet: http://cds.linear.com/docs/Datasheet/3880f.pdf
-
-Author: Guenter Roeck <guenter.roeck@ericsson.com>
-
-
-Description
------------
-
-The LTC2978 is an octal power supply monitor, supervisor, sequencer and
-margin controller. The LTC3880 is a dual, PolyPhase DC/DC synchronous
-step-down switching regulator controller.
-
-
-Usage Notes
------------
-
-This driver does not probe for PMBus devices. You will have to instantiate
-devices explicitly.
-
-Example: the following commands will load the driver for an LTC2978 at address
-0x60 on I2C bus #1:
-
-# modprobe ltc2978
-# echo ltc2978 0x60 > /sys/bus/i2c/devices/i2c-1/new_device
-
-
-Sysfs attributes
-----------------
-
-in1_label               "vin"
-in1_input               Measured input voltage.
-in1_min                 Minimum input voltage.
-in1_max                 Maximum input voltage.
-in1_lcrit               Critical minimum input voltage.
-in1_crit                Critical maximum input voltage.
-in1_min_alarm           Input voltage low alarm.
-in1_max_alarm           Input voltage high alarm.
-in1_lcrit_alarm         Input voltage critical low alarm.
-in1_crit_alarm          Input voltage critical high alarm.
-in1_lowest              Lowest input voltage. LTC2978 only.
-in1_highest             Highest input voltage.
-in1_reset_history       Reset history. Writing into this attribute will reset
-                        history for all attributes.
-
-in[2-9]_label           "vout[1-8]". Channels 3 to 9 on LTC2978 only.
-in[2-9]_input           Measured output voltage.
-in[2-9]_min             Minimum output voltage.
-in[2-9]_max             Maximum output voltage.
-in[2-9]_lcrit           Critical minimum output voltage.
-in[2-9]_crit            Critical maximum output voltage.
-in[2-9]_min_alarm       Output voltage low alarm.
-in[2-9]_max_alarm       Output voltage high alarm.
-in[2-9]_lcrit_alarm     Output voltage critical low alarm.
-in[2-9]_crit_alarm      Output voltage critical high alarm.
-in[2-9]_lowest          Lowest output voltage. LTC2978 only.
-in[2-9]_highest         Lowest output voltage.
-in[2-9]_reset_history   Reset history. Writing into this attribute will reset
-                        history for all attributes.
-
-temp[1-3]_input         Measured temperature.
-                        On LTC2978, only one temperature measurement is
-                        supported and reflects the internal temperature.
-                        On LTC3880, temp1 and temp2 report external
-                        temperatures, and temp3 reports the internal
-                        temperature.
-temp[1-3]_min           Mimimum temperature.
-temp[1-3]_max           Maximum temperature.
-temp[1-3]_lcrit         Critical low temperature.
-temp[1-3]_crit          Critical high temperature.
-temp[1-3]_min_alarm     Chip temperature low alarm.
-temp[1-3]_max_alarm     Chip temperature high alarm.
-temp[1-3]_lcrit_alarm   Chip temperature critical low alarm.
-temp[1-3]_crit_alarm    Chip temperature critical high alarm.
-temp[1-3]_lowest        Lowest measured temperature. LTC2978 only.
-temp[1-3]_highest       Highest measured temperature.
-temp[1-3]_reset_history Reset history. Writing into this attribute will reset
-                        history for all attributes.
-
-power[1-2]_label        "pout[1-2]". LTC3880 only.
-power[1-2]_input        Measured power.
-
-curr1_label             "iin". LTC3880 only.
-curr1_input             Measured input current.
-curr1_max               Maximum input current.
-curr1_max_alarm         Input current high alarm.
-
-curr[2-3]_label         "iout[1-2]". LTC3880 only.
-curr[2-3]_input         Measured input current.
-curr[2-3]_max           Maximum input current.
-curr[2-3]_crit          Critical input current.
-curr[2-3]_max_alarm     Input current high alarm.
-curr[2-3]_crit_alarm    Input current critical high alarm.
diff --git a/Documentation/hwmon/max16064 b/Documentation/hwmon/max16064
index f8b478076f6..f6e8bcbfacc 100644
--- a/Documentation/hwmon/max16064
+++ b/Documentation/hwmon/max16064
@@ -42,9 +42,9 @@ attributes are read-only.
 
 in[1-4]_label           "vout[1-4]"
 in[1-4]_input           Measured voltage. From READ_VOUT register.
-in[1-4]_min             Minimum Voltage. From VOUT_UV_WARN_LIMIT register.
+in[1-4]_min             Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
 in[1-4]_max             Maximum voltage. From VOUT_OV_WARN_LIMIT register.
-in[1-4]_lcrit           Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.
+in[1-4]_lcrit           Critical minumum Voltage. VOUT_UV_FAULT_LIMIT register.
 in[1-4]_crit            Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.
 in[1-4]_min_alarm       Voltage low alarm. From VOLTAGE_UV_WARNING status.
 in[1-4]_max_alarm       Voltage high alarm. From VOLTAGE_OV_WARNING status.
diff --git a/Documentation/hwmon/max1619 b/Documentation/hwmon/max1619
index e6d87398cc8..d6f8d9cd7d7 100644
--- a/Documentation/hwmon/max1619
+++ b/Documentation/hwmon/max1619
@@ -9,7 +9,7 @@ Supported chips:
                http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf
 
 Authors:
-        Oleksij Rempel <bug-track@fisher-privat.net>,
+        Alexey Fisher <fishor@mail.ru>,
         Jean Delvare <khali@linux-fr.org>
 
 Description
diff --git a/Documentation/hwmon/max197 b/Documentation/hwmon/max197
deleted file mode 100644
index 8d89b9009df..00000000000
--- a/Documentation/hwmon/max197
+++ /dev/null
@@ -1,60 +0,0 @@
-Maxim MAX197 driver
-===================
-
-Author:
-  * Vivien Didelot <vivien.didelot@savoirfairelinux.com>
-
-Supported chips:
-  * Maxim MAX197
-    Prefix: 'max197'
-    Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX197.pdf
-
-  * Maxim MAX199
-    Prefix: 'max199'
-    Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX199.pdf
-
-Description
------------
-
-The A/D converters MAX197, and MAX199 are both 8-Channel, Multi-Range, 5V,
-12-Bit DAS with 8+4 Bus Interface and Fault Protection.
-
-The available ranges for the MAX197 are {0,-5V} to 5V, and {0,-10V} to 10V,
-while they are {0,-2V} to 2V, and {0,-4V} to 4V on the MAX199.
-
-Platform data
--------------
-
-The MAX197 platform data (defined in linux/platform_data/max197.h) should be
-filled with a pointer to a conversion function, defined like:
-
-    int convert(u8 ctrl);
-
-ctrl is the control byte to write to start a new conversion.
-On success, the function must return the 12-bit raw value read from the chip,
-or a negative error code otherwise.
-
-Control byte format:
-
-Bit     Name       Description
-7,6     PD1,PD0    Clock and Power-Down modes
-5       ACQMOD     Internal or External Controlled Acquisition
-4       RNG        Full-scale voltage magnitude at the input
-3       BIP        Unipolar or Bipolar conversion mode
-2,1,0   A2,A1,A0   Channel
-
-Sysfs interface
----------------
-
-* in[0-7]_input: The conversion value for the corresponding channel.
-                 RO
-
-* in[0-7]_min:   The lower limit (in mV) for the corresponding channel.
-                 For the MAX197, it will be adjusted to -10000, -5000, or 0.
-                 For the MAX199, it will be adjusted to -4000, -2000, or 0.
-                 RW
-
-* in[0-7]_max:   The higher limit (in mV) for the corresponding channel.
-                 For the MAX197, it will be adjusted to 0, 5000, or 10000.
-                 For the MAX199, it will be adjusted to 0, 2000, or 4000.
-                 RW
diff --git a/Documentation/hwmon/max34440 b/Documentation/hwmon/max34440
index 04482226db2..8ab51536a1e 100644
--- a/Documentation/hwmon/max34440
+++ b/Documentation/hwmon/max34440
@@ -11,11 +11,6 @@ Supported chips:
     Prefixes: 'max34441'
     Addresses scanned: -
     Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34441.pdf
-  * Maxim MAX34446
-    PMBus Power-Supply Data Logger
-    Prefixes: 'max34446'
-    Addresses scanned: -
-    Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34446.pdf
 
 Author: Guenter Roeck <guenter.roeck@ericsson.com>
 
@@ -24,8 +19,8 @@ Description
 -----------
 
 This driver supports hardware montoring for Maxim MAX34440 PMBus 6-Channel
-Power-Supply Manager, MAX34441 PMBus 5-Channel Power-Supply Manager
-and Intelligent Fan Controller, and MAX34446 PMBus Power-Supply Data Logger.
+Power-Supply Manager and MAX34441 PMBus 5-Channel Power-Supply Manager
+and Intelligent Fan Controller.
 
 The driver is a client driver to the core PMBus driver. Please see
 Documentation/hwmon/pmbus for details on PMBus client drivers.
@@ -38,13 +33,6 @@ This driver does not auto-detect devices. You will have to instantiate the
 devices explicitly. Please see Documentation/i2c/instantiating-devices for
 details.
 
-For MAX34446, the value of the currX_crit attribute determines if current or
-voltage measurement is enabled for a given channel. Voltage measurement is
-enabled if currX_crit is set to 0; current measurement is enabled if the
-attribute is set to a positive value. Power measurement is only enabled if
-channel 1 (3) is configured for voltage measurement, and channel 2 (4) is
-configured for current measurement.
-
 
 Platform data support
 ---------------------
@@ -60,39 +48,27 @@ attributes are read-only.
 
 in[1-6]_label           "vout[1-6]".
 in[1-6]_input           Measured voltage. From READ_VOUT register.
-in[1-6]_min             Minimum Voltage. From VOUT_UV_WARN_LIMIT register.
+in[1-6]_min             Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
 in[1-6]_max             Maximum voltage. From VOUT_OV_WARN_LIMIT register.
-in[1-6]_lcrit           Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.
+in[1-6]_lcrit           Critical minumum Voltage. VOUT_UV_FAULT_LIMIT register.
 in[1-6]_crit            Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.
 in[1-6]_min_alarm       Voltage low alarm. From VOLTAGE_UV_WARNING status.
 in[1-6]_max_alarm       Voltage high alarm. From VOLTAGE_OV_WARNING status.
 in[1-6]_lcrit_alarm     Voltage critical low alarm. From VOLTAGE_UV_FAULT status.
 in[1-6]_crit_alarm      Voltage critical high alarm. From VOLTAGE_OV_FAULT status.
-in[1-6]_lowest          Historical minimum voltage.
 in[1-6]_highest         Historical maximum voltage.
 in[1-6]_reset_history   Write any value to reset history.
 
-                        MAX34446 only supports in[1-4].
-
 curr[1-6]_label         "iout[1-6]".
 curr[1-6]_input         Measured current. From READ_IOUT register.
 curr[1-6]_max           Maximum current. From IOUT_OC_WARN_LIMIT register.
 curr[1-6]_crit          Critical maximum current. From IOUT_OC_FAULT_LIMIT register.
 curr[1-6]_max_alarm     Current high alarm. From IOUT_OC_WARNING status.
 curr[1-6]_crit_alarm    Current critical high alarm. From IOUT_OC_FAULT status.
-curr[1-4]_average       Historical average current (MAX34446 only).
 curr[1-6]_highest       Historical maximum current.
 curr[1-6]_reset_history Write any value to reset history.
 
                         in6 and curr6 attributes only exist for MAX34440.
-                        MAX34446 only supports curr[1-4].
-
-power[1,3]_label        "pout[1,3]"
-power[1,3]_input        Measured power.
-power[1,3]_average      Historical average power.
-power[1,3]_highest      Historical maximum power.
-
-                        Power attributes only exist for MAX34446.
 
 temp[1-8]_input         Measured temperatures. From READ_TEMPERATURE_1 register.
                         temp1 is the chip's internal temperature. temp2..temp5
@@ -103,9 +79,7 @@ temp[1-8]_max		Maximum temperature. From OT_WARN_LIMIT register.
 temp[1-8]_crit          Critical high temperature. From OT_FAULT_LIMIT register.
 temp[1-8]_max_alarm     Temperature high alarm.
 temp[1-8]_crit_alarm    Temperature critical high alarm.
-temp[1-8]_average       Historical average temperature (MAX34446 only).
 temp[1-8]_highest       Historical maximum temperature.
 temp[1-8]_reset_history Write any value to reset history.
 
                         temp7 and temp8 attributes only exist for MAX34440.
-                        MAX34446 only supports temp[1-3].
diff --git a/Documentation/hwmon/max8688 b/Documentation/hwmon/max8688
index fe849871df3..71ed10a3c94 100644
--- a/Documentation/hwmon/max8688
+++ b/Documentation/hwmon/max8688
@@ -42,9 +42,9 @@ attributes are read-only.
 
 in1_label               "vout1"
 in1_input               Measured voltage. From READ_VOUT register.
-in1_min                 Minimum Voltage. From VOUT_UV_WARN_LIMIT register.
+in1_min                 Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
 in1_max                 Maximum voltage. From VOUT_OV_WARN_LIMIT register.
-in1_lcrit               Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.
+in1_lcrit               Critical minumum Voltage. VOUT_UV_FAULT_LIMIT register.
 in1_crit                Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.
 in1_min_alarm           Voltage low alarm. From VOLTAGE_UV_WARNING status.
 in1_max_alarm           Voltage high alarm. From VOLTAGE_OV_WARNING status.
diff --git a/Documentation/hwmon/mc13783-adc b/Documentation/hwmon/mc13783-adc
index d0e7b3fa9e7..044531a8640 100644
--- a/Documentation/hwmon/mc13783-adc
+++ b/Documentation/hwmon/mc13783-adc
@@ -3,11 +3,8 @@ Kernel driver mc13783-adc
 
 Supported chips:
   * Freescale Atlas MC13783
-    Prefix: 'mc13783'
+    Prefix: 'mc13783_adc'
     Datasheet: http://www.freescale.com/files/rf_if/doc/data_sheet/MC13783.pdf?fsrch=1
-  * Freescale Atlas MC13892
-    Prefix: 'mc13892'
-    Datasheet: http://cache.freescale.com/files/analog/doc/data_sheet/MC13892.pdf?fsrch=1&sr=1
 
 Authors:
     Sascha Hauer <s.hauer@pengutronix.de>
@@ -16,21 +13,20 @@ Authors:
 Description
 -----------
 
-The Freescale MC13783 and MC13892 are Power Management and Audio Circuits.
-Among other things they contain a 10-bit A/D converter. The converter has 16
-(MC13783) resp. 12 (MC13892) channels which can be used in different modes. The
-A/D converter has a resolution of 2.25mV.
+The Freescale MC13783 is a Power Management and Audio Circuit. Among
+other things it contains a 10-bit A/D converter. The converter has 16
+channels which can be used in different modes.
+The A/D converter has a resolution of 2.25mV. Channels 0-4 have
+a dedicated meaning with chip internal scaling applied. Channels 5-7
+can be used as general purpose inputs or alternatively in a dedicated
+mode. Channels 12-15 are occupied by the touchscreen if it's active.
 
-Some channels can be used as General Purpose inputs or in a dedicated mode with
-a chip internal scaling applied .
+Currently the driver only supports channels 2 and 5-15 with no alternative
+modes for channels 5-7.
 
-Currently the driver only supports the Application Supply channel (BP / BPSNS),
-the General Purpose inputs and touchscreen.
+See this table for the meaning of the different channels and their chip
+internal scaling:
 
-See the following tables for the meaning of the different channels and their
-chip internal scaling:
-
-MC13783:
 Channel Signal                                          Input Range     Scaling
 -------------------------------------------------------------------------------
 0       Battery Voltage (BATT)                          2.50 - 4.65V    -2.40V
@@ -38,7 +34,7 @@ Channel	Signal						Input Range	Scaling
 2       Application Supply (BP)                         2.50 - 4.65V    -2.40V
 3       Charger Voltage (CHRGRAW)                       0 - 10V /       /5
                                                         0 - 20V         /10
-4       Charger Current (CHRGISNSP-CHRGISNSN)           -0.25 - 0.25V   x4
+4       Charger Current (CHRGISNSP-CHRGISNSN)           -0.25V - 0.25V  x4
 5       General Purpose ADIN5 / Battery Pack Thermistor 0 - 2.30V       No
 6       General Purpose ADIN6 / Backup Voltage (LICELL) 0 - 2.30V /     No /
                                                         1.50 - 3.50V    -1.20V
@@ -52,23 +48,3 @@ Channel	Signal						Input Range	Scaling
 13      General Purpose TSX2 / Touchscreen X-plate 2    0 - 2.30V       No
 14      General Purpose TSY1 / Touchscreen Y-plate 1    0 - 2.30V       No
 15      General Purpose TSY2 / Touchscreen Y-plate 2    0 - 2.30V       No
-
-MC13892:
-Channel Signal                                          Input Range     Scaling
--------------------------------------------------------------------------------
-0       Battery Voltage (BATT)                          0 - 4.8V        /2
-1       Battery Current (BATT - BATTISNSCC)             -60 - 60 mV     x20
-2       Application Supply (BPSNS)                      0 - 4.8V        /2
-3       Charger Voltage (CHRGRAW)                       0 - 12V /       /5
-                                                        0 - 20V         /10
-4       Charger Current (CHRGISNS-BPSNS) /              -0.3 - 0.3V /   x4 /
-        Touchscreen X-plate 1                           0 - 2.4V        No
-5       General Purpose ADIN5 / Battery Pack Thermistor 0 - 2.4V        No
-6       General Purpose ADIN6 / Backup Voltage (LICELL) 0 - 2.4V /      No
-        Backup Voltage (LICELL)                         0 - 3.6V        x2/3
-7       General Purpose ADIN7 / UID / Die Temperature   0 - 2.4V /      No /
-                                                        0 - 4.8V        /2
-12      General Purpose TSX1 / Touchscreen X-plate 1    0 - 2.4V        No
-13      General Purpose TSX2 / Touchscreen X-plate 2    0 - 2.4V        No
-14      General Purpose TSY1 / Touchscreen Y-plate 1    0 - 2.4V        No
-15      General Purpose TSY2 / Touchscreen Y-plate 2    0 - 2.4V        No
diff --git a/Documentation/hwmon/mcp3021 b/Documentation/hwmon/mcp3021
deleted file mode 100644
index 74a6b72adf5..00000000000
--- a/Documentation/hwmon/mcp3021
+++ /dev/null
@@ -1,29 +0,0 @@
-Kernel driver MCP3021
-======================
-
-Supported chips:
-  * Microchip Technology MCP3021
-    Prefix: 'mcp3021'
-    Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21805a.pdf
-  * Microchip Technology MCP3221
-    Prefix: 'mcp3221'
-    Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21732c.pdf
-
-Authors:
-   Mingkai Hu
-   Sven Schuchmann <schuchmann@schleissheimer.de>
-
-Description
------------
-
-This driver implements support for the Microchip Technology MCP3021 and
-MCP3221 chip.
-
-The Microchip Technology Inc. MCP3021 is a successive approximation A/D
-converter (ADC) with 10-bit resolution. The MCP3221 has 12-bit resolution.
-
-These devices provide one single-ended input with very low power consumption.
-Communication to the MCP3021/MCP3221  is performed using a 2-wire I2C
-compatible interface. Standard (100 kHz) and Fast (400 kHz) I2C modes are
-available. The default I2C device address is 0x4d (contact the Microchip
-factory for additional address options).
diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus
index 3d3a0f97f96..c36c1c1a62b 100644
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
@@ -2,11 +2,17 @@ Kernel driver pmbus
 ====================
 
 Supported chips:
-  * Ericsson BMR453, BMR454
-    Prefixes: 'bmr453', 'bmr454'
+  * Ericsson BMR45X series
+    DC/DC Converter
+    Prefixes: 'bmr450', 'bmr451', 'bmr453', 'bmr454'
     Addresses scanned: -
     Datasheet:
  http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146395
+  * Linear Technology LTC2978
+    Octal PMBus Power Supply Monitor and Controller
+    Prefix: 'ltc2978'
+    Addresses scanned: -
+    Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf
   * ON Semiconductor ADP4000, NCP4200, NCP4208
     Prefixes: 'adp4000', 'ncp4200', 'ncp4208'
     Addresses scanned: -
@@ -14,21 +20,6 @@ Supported chips:
         http://www.onsemi.com/pub_link/Collateral/ADP4000-D.PDF
         http://www.onsemi.com/pub_link/Collateral/NCP4200-D.PDF
         http://www.onsemi.com/pub_link/Collateral/JUNE%202009-%20REV.%200.PDF
-  * Lineage Power
-    Prefixes: 'mdt040', 'pdt003', 'pdt006', 'pdt012', 'udt020'
-    Addresses scanned: -
-    Datasheets:
-        http://www.lineagepower.com/oem/pdf/PDT003A0X.pdf
-        http://www.lineagepower.com/oem/pdf/PDT006A0X.pdf
-        http://www.lineagepower.com/oem/pdf/PDT012A0X.pdf
-        http://www.lineagepower.com/oem/pdf/UDT020A0X.pdf
-        http://www.lineagepower.com/oem/pdf/MDT040A0X.pdf
-  * Texas Instruments TPS40400, TPS40422
-    Prefixes: 'tps40400', 'tps40422'
-    Addresses scanned: -
-    Datasheets:
-        http://www.ti.com/lit/gpn/tps40400
-        http://www.ti.com/lit/gpn/tps40422
   * Generic PMBus devices
     Prefix: 'pmbus'
     Addresses scanned: -
@@ -138,7 +129,7 @@ Sysfs entries
 
 When probing the chip, the driver identifies which PMBus registers are
 supported, and determines available sensors from this information.
-Attribute files only exist if respective sensors are supported by the chip.
+Attribute files only exist if respective sensors are suported by the chip.
 Labels are provided to inform the user about the sensor associated with
 a given sysfs entry.
 
diff --git a/Documentation/hwmon/pmbus-core b/Documentation/hwmon/pmbus-core
deleted file mode 100644
index 31e4720fed1..00000000000
--- a/Documentation/hwmon/pmbus-core
+++ /dev/null
@@ -1,283 +0,0 @@
-PMBus core driver and internal API
-==================================
-
-Introduction
-============
-
-[from pmbus.org] The Power Management Bus (PMBus) is an open standard
-power-management protocol with a fully defined command language that facilitates
-communication with power converters and other devices in a power system. The
-protocol is implemented over the industry-standard SMBus serial interface and
-enables programming, control, and real-time monitoring of compliant power
-conversion products. This flexible and highly versatile standard allows for
-communication between devices based on both analog and digital technologies, and
-provides true interoperability which will reduce design complexity and shorten
-time to market for power system designers. Pioneered by leading power supply and
-semiconductor companies, this open power system standard is maintained and
-promoted by the PMBus Implementers Forum (PMBus-IF), comprising 30+ adopters
-with the objective to provide support to, and facilitate adoption among, users.
-
-Unfortunately, while PMBus commands are standardized, there are no mandatory
-commands, and manufacturers can add as many non-standard commands as they like.
-Also, different PMBUs devices act differently if non-supported commands are
-executed. Some devices return an error, some devices return 0xff or 0xffff and
-set a status error flag, and some devices may simply hang up.
-
-Despite all those difficulties, a generic PMBus device driver is still useful
-and supported since kernel version 2.6.39. However, it was necessary to support
-device specific extensions in addition to the core PMBus driver, since it is
-simply unknown what new device specific functionality PMBus device developers
-come up with next.
-
-To make device specific extensions as scalable as possible, and to avoid having
-to modify the core PMBus driver repeatedly for new devices, the PMBus driver was
-split into core, generic, and device specific code. The core code (in
-pmbus_core.c) provides generic functionality. The generic code (in pmbus.c)
-provides support for generic PMBus devices. Device specific code is responsible
-for device specific initialization and, if needed, maps device specific
-functionality into generic functionality. This is to some degree comparable
-to PCI code, where generic code is augmented as needed with quirks for all kinds
-of devices.
-
-PMBus device capabilities auto-detection
-========================================
-
-For generic PMBus devices, code in pmbus.c attempts to auto-detect all supported
-PMBus commands. Auto-detection is somewhat limited, since there are simply too
-many variables to consider. For example, it is almost impossible to autodetect
-which PMBus commands are paged and which commands are replicated across all
-pages (see the PMBus specification for details on multi-page PMBus devices).
-
-For this reason, it often makes sense to provide a device specific driver if not
-all commands can be auto-detected. The data structures in this driver can be
-used to inform the core driver about functionality supported by individual
-chips.
-
-Some commands are always auto-detected. This applies to all limit commands
-(lcrit, min, max, and crit attributes) as well as associated alarm attributes.
-Limits and alarm attributes are auto-detected because there are simply too many
-possible combinations to provide a manual configuration interface.
-
-PMBus internal API
-==================
-
-The API between core and device specific PMBus code is defined in
-drivers/hwmon/pmbus/pmbus.h. In addition to the internal API, pmbus.h defines
-standard PMBus commands and virtual PMBus commands.
-
-Standard PMBus commands
------------------------
-
-Standard PMBus commands (commands values 0x00 to 0xff) are defined in the PMBUs
-specification.
-
-Virtual PMBus commands
-----------------------
-
-Virtual PMBus commands are provided to enable support for non-standard
-functionality which has been implemented by several chip vendors and is thus
-desirable to support.
-
-Virtual PMBus commands start with command value 0x100 and can thus easily be
-distinguished from standard PMBus commands (which can not have values larger
-than 0xff). Support for virtual PMBus commands is device specific and thus has
-to be implemented in device specific code.
-
-Virtual commands are named PMBUS_VIRT_xxx and start with PMBUS_VIRT_BASE. All
-virtual commands are word sized.
-
-There are currently two types of virtual commands.
-
-- READ commands are read-only; writes are either ignored or return an error.
-- RESET commands are read/write. Reading reset registers returns zero
-  (used for detection), writing any value causes the associated history to be
-  reset.
-
-Virtual commands have to be handled in device specific driver code. Chip driver
-code returns non-negative values if a virtual command is supported, or a
-negative error code if not. The chip driver may return -ENODATA or any other
-Linux error code in this case, though an error code other than -ENODATA is
-handled more efficiently and thus preferred. Either case, the calling PMBus
-core code will abort if the chip driver returns an error code when reading
-or writing virtual registers (in other words, the PMBus core code will never
-send a virtual command to a chip).
-
-PMBus driver information
-------------------------
-
-PMBus driver information, defined in struct pmbus_driver_info, is the main means
-for device specific drivers to pass information to the core PMBus driver.
-Specifically, it provides the following information.
-
-- For devices supporting its data in Direct Data Format, it provides coefficients
-  for converting register values into normalized data. This data is usually
-  provided by chip manufacturers in device datasheets.
-- Supported chip functionality can be provided to the core driver. This may be
-  necessary for chips which react badly if non-supported commands are executed,
-  and/or to speed up device detection and initialization.
-- Several function entry points are provided to support overriding and/or
-  augmenting generic command execution. This functionality can be used to map
-  non-standard PMBus commands to standard commands, or to augment standard
-  command return values with device specific information.
-
-  API functions
-  -------------
-
-  Functions provided by chip driver
-  ---------------------------------
-
-  All functions return the command return value (read) or zero (write) if
-  successful. A return value of -ENODATA indicates that there is no manufacturer
-  specific command, but that a standard PMBus command may exist. Any other
-  negative return value indicates that the commands does not exist for this
-  chip, and that no attempt should be made to read or write the standard
-  command.
-
-  As mentioned above, an exception to this rule applies to virtual commands,
-  which  _must_ be handled in driver specific code. See "Virtual PMBus Commands"
-  above for more details.
-
-  Command execution in the core PMBus driver code is as follows.
-
-        if (chip_access_function) {
-                status = chip_access_function();
-                if (status != -ENODATA)
-                        return status;
-        }
-        if (command >= PMBUS_VIRT_BASE) /* For word commands/registers only */
-                return -EINVAL;
-        return generic_access();
-
-  Chip drivers may provide pointers to the following functions in struct
-  pmbus_driver_info. All functions are optional.
-
-  int (*read_byte_data)(struct i2c_client *client, int page, int reg);
-
-  Read byte from page <page>, register <reg>.
-  <page> may be -1, which means "current page".
-
-  int (*read_word_data)(struct i2c_client *client, int page, int reg);
-
-  Read word from page <page>, register <reg>.
-
-  int (*write_word_data)(struct i2c_client *client, int page, int reg,
-                         u16 word);
-
-  Write word to page <page>, register <reg>.
-
-  int (*write_byte)(struct i2c_client *client, int page, u8 value);
-
-  Write byte to page <page>, register <reg>.
-  <page> may be -1, which means "current page".
-
-  int (*identify)(struct i2c_client *client, struct pmbus_driver_info *info);
-
-  Determine supported PMBus functionality. This function is only necessary
-  if a chip driver supports multiple chips, and the chip functionality is not
-  pre-determined. It is currently only used by the generic pmbus driver
-  (pmbus.c).
-
-  Functions exported by core driver
-  ---------------------------------
-
-  Chip drivers are expected to use the following functions to read or write
-  PMBus registers. Chip drivers may also use direct I2C commands. If direct I2C
-  commands are used, the chip driver code must not directly modify the current
-  page, since the selected page is cached in the core driver and the core driver
-  will assume that it is selected. Using pmbus_set_page() to select a new page
-  is mandatory.
-
-  int pmbus_set_page(struct i2c_client *client, u8 page);
-
-  Set PMBus page register to <page> for subsequent commands.
-
-  int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 reg);
-
-  Read word data from <page>, <reg>. Similar to i2c_smbus_read_word_data(), but
-  selects page first.
-
-  int pmbus_write_word_data(struct i2c_client *client, u8 page, u8 reg,
-                            u16 word);
-
-  Write word data to <page>, <reg>. Similar to i2c_smbus_write_word_data(), but
-  selects page first.
-
-  int pmbus_read_byte_data(struct i2c_client *client, int page, u8 reg);
-
-  Read byte data from <page>, <reg>. Similar to i2c_smbus_read_byte_data(), but
-  selects page first. <page> may be -1, which means "current page".
-
-  int pmbus_write_byte(struct i2c_client *client, int page, u8 value);
-
-  Write byte data to <page>, <reg>. Similar to i2c_smbus_write_byte(), but
-  selects page first. <page> may be -1, which means "current page".
-
-  void pmbus_clear_faults(struct i2c_client *client);
-
-  Execute PMBus "Clear Fault" command on all chip pages.
-  This function calls the device specific write_byte function if defined.
-  Therefore, it must _not_ be called from that function.
-
-  bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg);
-
-  Check if byte register exists. Return true if the register exists, false
-  otherwise.
-  This function calls the device specific write_byte function if defined to
-  obtain the chip status. Therefore, it must _not_ be called from that function.
-
-  bool pmbus_check_word_register(struct i2c_client *client, int page, int reg);
-
-  Check if word register exists. Return true if the register exists, false
-  otherwise.
-  This function calls the device specific write_byte function if defined to
-  obtain the chip status. Therefore, it must _not_ be called from that function.
-
-  int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
-                     struct pmbus_driver_info *info);
-
-  Execute probe function. Similar to standard probe function for other drivers,
-  with the pointer to struct pmbus_driver_info as additional argument. Calls
-  identify function if supported. Must only be called from device probe
-  function.
-
-  void pmbus_do_remove(struct i2c_client *client);
-
-  Execute driver remove function. Similar to standard driver remove function.
-
-  const struct pmbus_driver_info
-        *pmbus_get_driver_info(struct i2c_client *client);
-
-  Return pointer to struct pmbus_driver_info as passed to pmbus_do_probe().
-
-
-PMBus driver platform data
-==========================
-
-PMBus platform data is defined in include/linux/i2c/pmbus.h. Platform data
-currently only provides a flag field with a single bit used.
-
-#define PMBUS_SKIP_STATUS_CHECK (1 << 0)
-
-struct pmbus_platform_data {
-        u32 flags;              /* Device specific flags */
-};
-
-
-Flags
------
-
-PMBUS_SKIP_STATUS_CHECK
-
-During register detection, skip checking the status register for
-communication or command errors.
-
-Some PMBus chips respond with valid data when trying to read an unsupported
-register. For such chips, checking the status register is mandatory when
-trying to determine if a chip register exists or not.
-Other PMBus chips don't support the STATUS_CML register, or report
-communication errors for no explicable reason. For such chips, checking the
-status register must be disabled.
-
-Some i2c controllers do not support single-byte commands (write commands with
-no data, i2c_smbus_write_byte()). With such controllers, clearing the status
-register is impossible, and the PMBUS_SKIP_STATUS_CHECK flag must be set.
diff --git a/Documentation/hwmon/sch5627 b/Documentation/hwmon/sch5627
index 0551d266c51..446a054e491 100644
--- a/Documentation/hwmon/sch5627
+++ b/Documentation/hwmon/sch5627
@@ -16,11 +16,6 @@ Description
 SMSC SCH5627 Super I/O chips include complete hardware monitoring
 capabilities. They can monitor up to 5 voltages, 4 fans and 8 temperatures.
 
-The SMSC SCH5627 hardware monitoring part also contains an integrated
-watchdog. In order for this watchdog to function some motherboard specific
-initialization most be done by the BIOS, so if the watchdog is not enabled
-by the BIOS the sch5627 driver will not register a watchdog device.
-
 The hardware monitoring part of the SMSC SCH5627 is accessed by talking
 through an embedded microcontroller. An application note describing the
 protocol for communicating with the microcontroller is available upon
diff --git a/Documentation/hwmon/sch5636 b/Documentation/hwmon/sch5636
index 7b0a01da071..f83bd1c260f 100644
--- a/Documentation/hwmon/sch5636
+++ b/Documentation/hwmon/sch5636
@@ -26,9 +26,6 @@ temperatures. Note that the driver detects how many fan headers /
 temperature sensors are actually implemented on the motherboard, so you will
 likely see fewer temperature and fan inputs.
 
-The Fujitsu Theseus hwmon solution also contains an integrated watchdog.
-This watchdog is fully supported by the sch5636 driver.
-
 An application note describing the Theseus' registers, as well as an
 application note describing the protocol for communicating with the
 microcontroller is available upon request. Please mail me if you want a copy.
diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches
index 843751c41fe..86f42e8e9e4 100644
--- a/Documentation/hwmon/submitting-patches
+++ b/Documentation/hwmon/submitting-patches
@@ -60,7 +60,8 @@ increase the chances of your change being accepted.
 
 * Add the driver to Kconfig and Makefile in alphabetical order.
 
-* Make sure that all dependencies are listed in Kconfig.
+* Make sure that all dependencies are listed in Kconfig. For new drivers, it
+  is most likely prudent to add a dependency on EXPERIMENTAL.
 
 * Avoid forward declarations if you can. Rearrange the code if necessary.
 
@@ -69,9 +70,6 @@ increase the chances of your change being accepted.
   review more difficult. It may also result in code which is more complicated
   than necessary. Use inline functions or just regular functions instead.
 
-* Use devres functions whenever possible to allocate resources. For rationale
-  and supported functions, please see Documentation/driver-model/devres.txt.
-
 * If the driver has a detect function, make sure it is silent. Debug messages
   and messages printed after a successful detection are acceptable, but it
   must not print messages such as "Chip XXX not found/supported".
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 1f4dd855a29..a4aa8f600e0 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -304,7 +304,7 @@ value (fastest fan speed) wins.
 temp[1-*]_type  Sensor type selection.
                 Integers 1 to 6
                 RW
-                1: CPU embedded diode
+                1: PII/Celeron Diode
                 2: 3904 transistor
                 3: thermal diode
                 4: thermistor
diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon
index c3a3a5be10a..ef7984317ce 100644
--- a/Documentation/hwmon/twl4030-madc-hwmon
+++ b/Documentation/hwmon/twl4030-madc-hwmon
@@ -41,5 +41,5 @@ Channel Signal
 
 The Sysfs nodes will represent the voltage in the units of mV,
 the temperature channel shows the converted temperature in
-degree Celsius. The Battery charging current channel represents
+degree celcius. The Battery charging current channel represents
 battery charging current in mA.
diff --git a/Documentation/hwmon/ucd9000 b/Documentation/hwmon/ucd9000
index 0df5f276505..40ca6db50c4 100644
--- a/Documentation/hwmon/ucd9000
+++ b/Documentation/hwmon/ucd9000
@@ -70,9 +70,9 @@ attributes are read-only.
 
 in[1-12]_label          "vout[1-12]".
 in[1-12]_input          Measured voltage. From READ_VOUT register.
-in[1-12]_min            Minimum Voltage. From VOUT_UV_WARN_LIMIT register.
+in[1-12]_min            Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
 in[1-12]_max            Maximum voltage. From VOUT_OV_WARN_LIMIT register.
-in[1-12]_lcrit          Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.
+in[1-12]_lcrit          Critical minumum Voltage. VOUT_UV_FAULT_LIMIT register.
 in[1-12]_crit           Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.
 in[1-12]_min_alarm      Voltage low alarm. From VOLTAGE_UV_WARNING status.
 in[1-12]_max_alarm      Voltage high alarm. From VOLTAGE_OV_WARNING status.
@@ -82,7 +82,7 @@ in[1-12]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT status.
 curr[1-12]_label        "iout[1-12]".
 curr[1-12]_input        Measured current. From READ_IOUT register.
 curr[1-12]_max          Maximum current. From IOUT_OC_WARN_LIMIT register.
-curr[1-12]_lcrit        Critical minimum output current. From IOUT_UC_FAULT_LIMIT
+curr[1-12]_lcrit        Critical minumum output current. From IOUT_UC_FAULT_LIMIT
                         register.
 curr[1-12]_crit         Critical maximum current. From IOUT_OC_FAULT_LIMIT register.
 curr[1-12]_max_alarm    Current high alarm. From IOUT_OC_WARNING status.
diff --git a/Documentation/hwmon/ucd9200 b/Documentation/hwmon/ucd9200
index fd7d07b1908..3c58607f72f 100644
--- a/Documentation/hwmon/ucd9200
+++ b/Documentation/hwmon/ucd9200
@@ -54,9 +54,9 @@ attributes are read-only.
 
 in1_label               "vin".
 in1_input               Measured voltage. From READ_VIN register.
-in1_min                 Minimum Voltage. From VIN_UV_WARN_LIMIT register.
+in1_min                 Minumum Voltage. From VIN_UV_WARN_LIMIT register.
 in1_max                 Maximum voltage. From VIN_OV_WARN_LIMIT register.
-in1_lcrit               Critical minimum Voltage. VIN_UV_FAULT_LIMIT register.
+in1_lcrit               Critical minumum Voltage. VIN_UV_FAULT_LIMIT register.
 in1_crit                Critical maximum voltage. From VIN_OV_FAULT_LIMIT register.
 in1_min_alarm           Voltage low alarm. From VIN_UV_WARNING status.
 in1_max_alarm           Voltage high alarm. From VIN_OV_WARNING status.
@@ -65,9 +65,9 @@ in1_crit_alarm		Voltage critical high alarm. From VIN_OV_FAULT status.
 
 in[2-5]_label           "vout[1-4]".
 in[2-5]_input           Measured voltage. From READ_VOUT register.
-in[2-5]_min             Minimum Voltage. From VOUT_UV_WARN_LIMIT register.
+in[2-5]_min             Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
 in[2-5]_max             Maximum voltage. From VOUT_OV_WARN_LIMIT register.
-in[2-5]_lcrit           Critical minimum Voltage. VOUT_UV_FAULT_LIMIT register.
+in[2-5]_lcrit           Critical minumum Voltage. VOUT_UV_FAULT_LIMIT register.
 in[2-5]_crit            Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.
 in[2-5]_min_alarm       Voltage low alarm. From VOLTAGE_UV_WARNING status.
 in[2-5]_max_alarm       Voltage high alarm. From VOLTAGE_OV_WARNING status.
@@ -80,7 +80,7 @@ curr1_input		Measured current. From READ_IIN register.
 curr[2-5]_label         "iout[1-4]".
 curr[2-5]_input         Measured current. From READ_IOUT register.
 curr[2-5]_max           Maximum current. From IOUT_OC_WARN_LIMIT register.
-curr[2-5]_lcrit         Critical minimum output current. From IOUT_UC_FAULT_LIMIT
+curr[2-5]_lcrit         Critical minumum output current. From IOUT_UC_FAULT_LIMIT
                         register.
 curr[2-5]_crit          Critical maximum current. From IOUT_OC_FAULT_LIMIT register.
 curr[2-5]_max_alarm     Current high alarm. From IOUT_OC_WARNING status.
diff --git a/Documentation/hwmon/vexpress b/Documentation/hwmon/vexpress
deleted file mode 100644
index 557d6d5ad90..00000000000
--- a/Documentation/hwmon/vexpress
+++ /dev/null
@@ -1,34 +0,0 @@
-Kernel driver vexpress
-======================
-
-Supported systems:
-  * ARM Ltd. Versatile Express platform
-    Prefix: 'vexpress'
-    Datasheets:
-      * "Hardware Description" sections of the Technical Reference Manuals
-        for the Versatile Express boards:
-        http://infocenter.arm.com/help/topic/com.arm.doc.subset.boards.express/index.html
-      * Section "4.4.14. System Configuration registers" of the V2M-P1 TRM:
-        http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0447-/index.html
-
-Author: Pawel Moll
-
-Description
------------
-
-Versatile Express platform (http://www.arm.com/versatileexpress/) is a
-reference & prototyping system for ARM Ltd. processors. It can be set up
-from a wide range of boards, each of them containing (apart of the main
-chip/FPGA) a number of microcontrollers responsible for platform
-configuration and control. Theses microcontrollers can also monitor the
-board and its environment by a number of internal and external sensors,
-providing information about power lines voltages and currents, board
-temperature and power usage. Some of them also calculate consumed energy
-and provide a cumulative use counter.
-
-The configuration devices are _not_ memory mapped and must be accessed
-via a custom interface, abstracted by the "vexpress_config" API.
-
-As these devices are non-discoverable, they must be described in a Device
-Tree passed to the kernel. Details of the DT binding for them can be found
-in Documentation/devicetree/bindings/hwmon/vexpress.txt.
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
index ceaf6f652b0..76ffef94ed7 100644
--- a/Documentation/hwmon/w83627ehf
+++ b/Documentation/hwmon/w83627ehf
@@ -14,10 +14,6 @@ Supported chips:
     Prefix: 'w83627dhg'
     Addresses scanned: ISA address retrieved from Super I/O registers
     Datasheet: not available
-  * Winbond W83627UHG
-    Prefix: 'w83627uhg'
-    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: available from www.nuvoton.com
   * Winbond W83667HG
     Prefix: 'w83667hg'
     Addresses scanned: ISA address retrieved from Super I/O registers
@@ -46,13 +42,14 @@ Description
 -----------
 
 This driver implements support for the Winbond W83627EHF, W83627EHG,
-W83627DHG, W83627DHG-P, W83627UHG, W83667HG, W83667HG-B, W83667HG-I
-(NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively
-as Winbond chips.
-
-The chips implement 3 to 4 temperature sensors (9 for NCT6775F and NCT6776F),
-2 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID
-(except for 627UHG), alarms with beep warnings (control unimplemented),
+W83627DHG, W83627DHG-P, W83667HG, W83667HG-B, W83667HG-I (NCT6775F),
+and NCT6776F super I/O chips. We will refer to them collectively as
+Winbond chips.
+
+The chips implement three temperature sensors (up to four for 667HG-B, and nine
+for NCT6775F and NCT6776F), five fan rotation speed sensors, ten analog voltage
+sensors (only nine for the 627DHG), one VID (6 pins for the 627EHF/EHG, 8 pins
+for the 627DHG and 667HG), alarms with beep warnings (control unimplemented),
 and some automatic fan regulation strategies (plus manual fan control mode).
 
 The temperature sensor sources on W82677HG-B, NCT6775F, and NCT6776F are
@@ -89,16 +86,17 @@ follows:
 
 temp1 -> pwm1
 temp2 -> pwm2
-temp3 -> pwm3 (not on 627UHG)
+temp3 -> pwm3
 prog  -> pwm4 (not on 667HG and 667HG-B; the programmable setting is not
                supported by the driver)
 
 /sys files
 ----------
 
-name - this is a standard hwmon device entry, it contains the name of
-       the device (see the prefix in the list of supported devices at
-       the top of this file)
+name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,
+       it is set to "w83627ehf", for the W83627DHG it is set to "w83627dhg",
+       for the W83667HG and W83667HG-B it is set to "w83667hg", for NCT6775F it
+       is set to "nct6775", and for NCT6776F it is set to "nct6776".
 
 pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
            0 (stop) to 255 (full)
@@ -143,13 +141,8 @@ pwm[1-4]_min_output - minimum fan speed (range 1 - 255), when the temperature
 pwm[1-4]_stop_time  - how many milliseconds [ms] must elapse to switch
                       corresponding fan off. (when the temperature was below
                       defined range).
-pwm[1-4]_start_output-minimum fan speed (range 1 - 255) when spinning up
-pwm[1-4]_step_output- rate of fan speed change (1 - 255)
-pwm[1-4]_stop_output- minimum fan speed (range 1 - 255) when spinning down
-pwm[1-4]_max_output - maximum fan speed (range 1 - 255), when the temperature
-                      is above defined range.
 
-Note: last six functions are influenced by other control bits, not yet exported
+Note: last two functions are influenced by other control bits, not yet exported
       by the driver, so a change might not have any effect.
 
 Implementation Details
diff --git a/Documentation/hwmon/wm831x b/Documentation/hwmon/wm831x
index 11446757c8c..24f47d8f6a4 100644
--- a/Documentation/hwmon/wm831x
+++ b/Documentation/hwmon/wm831x
@@ -22,7 +22,7 @@ reporting of all the input values but does not provide any alarms.
 Voltage Monitoring
 ------------------
 
-Voltages are sampled by a 12 bit ADC.  Voltages in millivolts are 1.465
+Voltages are sampled by a 12 bit ADC.  Voltages in milivolts are 1.465
 times the ADC value.
 
 Temperature Monitoring
diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100
deleted file mode 100644
index a995b41724f..00000000000
--- a/Documentation/hwmon/zl6100
+++ /dev/null
@@ -1,146 +0,0 @@
-Kernel driver zl6100
-====================
-
-Supported chips:
-  * Intersil / Zilker Labs ZL2004
-    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: -
-    Datasheet: http://www.intersil.com/data/fn/fn6850.pdf
-  * Intersil / Zilker Labs ZL2008
-    Prefix: 'zl2008'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn6859.pdf
-  * Intersil / Zilker Labs ZL2105
-    Prefix: 'zl2105'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn6851.pdf
-  * Intersil / Zilker Labs ZL2106
-    Prefix: 'zl2106'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn6852.pdf
-  * Intersil / Zilker Labs ZL6100
-    Prefix: 'zl6100'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn6876.pdf
-  * Intersil / Zilker Labs ZL6105
-    Prefix: 'zl6105'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn6906.pdf
-  * Intersil / Zilker Labs ZL9101M
-    Prefix: 'zl9101'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn7669.pdf
-  * Intersil / Zilker Labs ZL9117M
-    Prefix: 'zl9117'
-    Addresses scanned: -
-    Datasheet: http://www.intersil.com/data/fn/fn7914.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>
-
-
-Description
------------
-
-This driver supports hardware montoring for Intersil / Zilker Labs ZL6100 and
-compatible digital DC-DC controllers.
-
-The driver is a client driver to the core PMBus driver. Please see
-Documentation/hwmon/pmbus and Documentation.hwmon/pmbus-core for details
-on PMBus client drivers.
-
-
-Usage Notes
------------
-
-This driver does not auto-detect devices. You will have to instantiate the
-devices explicitly. Please see Documentation/i2c/instantiating-devices for
-details.
-
-WARNING: Do not access chip registers using the i2cdump command, and do not use
-any of the i2ctools commands on a command register used to save and restore
-configuration data (0x11, 0x12, 0x15, 0x16, and 0xf4). The chips supported by
-this driver interpret any access to those command registers (including read
-commands) as request to execute the command in question. Unless write accesses
-to those registers are protected, this may result in power loss, board resets,
-and/or Flash corruption. Worst case, your board may turn into a brick.
-
-
-Platform data support
----------------------
-
-The driver supports standard PMBus driver platform data.
-
-
-Module parameters
------------------
-
-delay
------
-
-Intersil/Zilker Labs DC-DC controllers require a minimum interval between I2C
-bus accesses. According to Intersil, the minimum interval is 2 ms, though 1 ms
-appears to be sufficient and has not caused any problems in testing. The problem
-is known to affect all currently supported chips. For manual override, the
-driver provides a writeable module parameter, 'delay', which can be used to set
-the interval to a value between 0 and 65,535 microseconds.
-
-
-Sysfs entries
--------------
-
-The following attributes are supported. Limits are read-write; all other
-attributes are read-only.
-
-in1_label               "vin"
-in1_input               Measured input voltage.
-in1_min                 Minimum input voltage.
-in1_max                 Maximum input voltage.
-in1_lcrit               Critical minimum input voltage.
-in1_crit                Critical maximum input voltage.
-in1_min_alarm           Input voltage low alarm.
-in1_max_alarm           Input voltage high alarm.
-in1_lcrit_alarm         Input voltage critical low alarm.
-in1_crit_alarm          Input voltage critical high alarm.
-
-in2_label               "vout1"
-in2_input               Measured output voltage.
-in2_lcrit               Critical minimum output Voltage.
-in2_crit                Critical maximum output voltage.
-in2_lcrit_alarm         Critical output voltage critical low alarm.
-in2_crit_alarm          Critical output voltage critical high alarm.
-
-curr1_label             "iout1"
-curr1_input             Measured output current.
-curr1_lcrit             Critical minimum output current.
-curr1_crit              Critical maximum output current.
-curr1_lcrit_alarm       Output current critical low alarm.
-curr1_crit_alarm        Output current critical high alarm.
-
-temp[12]_input          Measured temperature.
-temp[12]_min            Minimum temperature.
-temp[12]_max            Maximum temperature.
-temp[12]_lcrit          Critical low temperature.
-temp[12]_crit           Critical high temperature.
-temp[12]_min_alarm      Chip temperature low alarm.
-temp[12]_max_alarm      Chip temperature high alarm.
-temp[12]_lcrit_alarm    Chip temperature critical low alarm.
-temp[12]_crit_alarm     Chip temperature critical high alarm.