29 files changed, 1025 insertions, 224 deletions

diff --git a/Documentation/hwmon/ads1015 b/Documentation/hwmon/ads1015
index 063b80d857b1..02d2a459385f 100644
--- a/Documentation/hwmon/ads1015
+++ b/Documentation/hwmon/ads1015
@@ -40,7 +40,7 @@ By default all inputs are exported.
 Platform Data
 -------------
 
-In linux/i2c/ads1015.h platform data is defined, channel_data contains
+In linux/platform_data/ads1015.h platform data is defined, channel_data contains
 configuration data for the used input combinations:
 - pga is the programmable gain amplifier (values are full scale)
   0: +/- 6.144 V
diff --git a/Documentation/hwmon/adt7475 b/Documentation/hwmon/adt7475
index 0502f2b464e1..09d73a10644c 100644
--- a/Documentation/hwmon/adt7475
+++ b/Documentation/hwmon/adt7475
@@ -109,6 +109,15 @@ fan speed) is applied. PWM values range from 0 (off) to 255 (full speed).
 Fan speed may be set to maximum when the temperature sensor associated with
 the PWM control exceeds temp#_max.
 
+At Tmin - hysteresis the PWM output can either be off (0% duty cycle) or at the
+minimum (i.e. auto_point1_pwm). This behaviour can be configured using the
+pwm[1-*]_stall_disable sysfs attribute. A value of 0 means the fans will shut
+off. A value of 1 means the fans will run at auto_point1_pwm.
+
+The responsiveness of the ADT747x to temperature changes can be configured.
+This allows smoothing of the fan speed transition. To set the transition time
+set the value in ms in the temp[1-*]_smoothing sysfs attribute.
+
 Notes
 -----
 
diff --git a/Documentation/hwmon/ir35221 b/Documentation/hwmon/ir35221
new file mode 100644
index 000000000000..f7e112752c04
--- /dev/null
+++ b/Documentation/hwmon/ir35221
@@ -0,0 +1,87 @@
+Kernel driver ir35221
+=====================
+
+Supported chips:
+  * Infinion IR35221
+    Prefix: 'ir35221'
+    Addresses scanned: -
+    Datasheet: Datasheet is not publicly available.
+
+Author: Samuel Mendoza-Jonas <sam@mendozajonas.com>
+
+
+Description
+-----------
+
+IR35221 is a Digital DC-DC Multiphase Converter
+
+
+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 IR35221
+at address 0x70 on I2C bus #4:
+
+# modprobe ir35221
+# echo ir35221 0x70 > /sys/bus/i2c/devices/i2c-4/new_device
+
+
+Sysfs attributes
+----------------
+
+curr1_label             "iin"
+curr1_input             Measured input current
+curr1_max               Maximum current
+curr1_max_alarm         Current high alarm
+
+curr[2-3]_label         "iout[1-2]"
+curr[2-3]_input         Measured output current
+curr[2-3]_crit          Critical maximum current
+curr[2-3]_crit_alarm    Current critical high alarm
+curr[2-3]_highest       Highest output current
+curr[2-3]_lowest        Lowest output current
+curr[2-3]_max           Maximum current
+curr[2-3]_max_alarm     Current high alarm
+
+in1_label               "vin"
+in1_input               Measured input voltage
+in1_crit                Critical maximum input voltage
+in1_crit_alarm          Input voltage critical high alarm
+in1_highest             Highest input voltage
+in1_lowest              Lowest input voltage
+in1_min                 Minimum input voltage
+in1_min_alarm           Input voltage low alarm
+
+in[2-3]_label           "vout[1-2]"
+in[2-3]_input           Measured output voltage
+in[2-3]_lcrit           Critical minimum output voltage
+in[2-3]_lcrit_alarm     Output voltage critical low alarm
+in[2-3]_crit            Critical maximum output voltage
+in[2-3]_crit_alarm      Output voltage critical high alarm
+in[2-3]_highest         Highest output voltage
+in[2-3]_lowest          Lowest output voltage
+in[2-3]_max             Maximum output voltage
+in[2-3]_max_alarm       Output voltage high alarm
+in[2-3]_min             Minimum output voltage
+in[2-3]_min_alarm       Output voltage low alarm
+
+power1_label            "pin"
+power1_input            Measured input power
+power1_alarm            Input power high alarm
+power1_max              Input power limit
+
+power[2-3]_label        "pout[1-2]"
+power[2-3]_input        Measured output power
+power[2-3]_max          Output power limit
+power[2-3]_max_alarm    Output power high alarm
+
+temp[1-2]_input         Measured temperature
+temp[1-2]_crit          Critical high temperature
+temp[1-2]_crit_alarm    Chip temperature critical high alarm
+temp[1-2]_highest       Highest temperature
+temp[1-2]_lowest        Lowest temperature
+temp[1-2]_max           Maximum temperature
+temp[1-2]_max_alarm     Chip temperature high alarm
diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
index b478b0864965..4ca7a9da09f9 100644
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
@@ -96,7 +96,7 @@ slowly, -EAGAIN will be returned when you read the sysfs attribute containing
 the sensor reading.
 
 The LTC4245 chip can be configured to sample all GPIO pins with two methods:
-1) platform data -- see include/linux/i2c/ltc4245.h
+1) platform data -- see include/linux/platform_data/ltc4245.h
 2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip
 
 The default mode of operation is to sample a single GPIO pin.
diff --git a/Documentation/hwmon/pmbus-core b/Documentation/hwmon/pmbus-core
index 31e4720fed18..8ed10e9ddfb5 100644
--- a/Documentation/hwmon/pmbus-core
+++ b/Documentation/hwmon/pmbus-core
@@ -253,7 +253,7 @@ Specifically, it provides the following information.
 PMBus driver platform data
 ==========================
 
-PMBus platform data is defined in include/linux/i2c/pmbus.h. Platform data
+PMBus platform data is defined in include/linux/pmbus.h. Platform data
 currently only provides a flag field with a single bit used.
 
 #define PMBUS_SKIP_STATUS_CHECK (1 << 0)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9a55295e5efc..67ab1aba1fcc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -478,7 +478,7 @@ L:	linux-hwmon@vger.kernel.org
 S:      Maintained
 F:      Documentation/hwmon/ads1015
 F:      drivers/hwmon/ads1015.c
-F:      include/linux/i2c/ads1015.h
+F:      include/linux/platform_data/ads1015.h
 
 ADT746X FAN DRIVER
 M:      Colin Leroy <colin@colino.net>
@@ -10179,7 +10179,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:      Maintained
 F:      Documentation/hwmon/pmbus
 F:      drivers/hwmon/pmbus/
-F:      include/linux/i2c/pmbus.h
+F:      include/linux/pmbus.h