3 files changed, 9 insertions, 1 deletions

diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus
index d28b591753d1..c2b157ba9006 100644
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
@@ -22,6 +22,12 @@ Supported chips:
         http://www.lineagepower.com/oem/pdf/PDT006A0X.pdf
         http://www.lineagepower.com/oem/pdf/PDT012A0X.pdf
         http://www.lineagepower.com/oem/pdf/UDT020A0X.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: -
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index cfec923f42b7..7968c815f443 100644
--- a/drivers/hwmon/pmbus/Kconfig
+++ b/drivers/hwmon/pmbus/Kconfig
@@ -20,7 +20,7 @@ config SENSORS_PMBUS
         help
           If you say yes here you get hardware monitoring support for generic
           PMBus devices, including but not limited to ADP4000, BMR453, BMR454,
-          NCP4200, and NCP4208.
+          NCP4200, NCP4208, TPS40400, and TPS40422.
 
           This driver can also be built as a module. If so, the module will
           be called pmbus.
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 34887408505b..7d5161dd04f0 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -191,6 +191,8 @@ static const struct i2c_device_id pmbus_id[] = {
         {"pdt006", 1},
         {"pdt012", 1},
         {"pmbus", 0},
+        {"tps40400", 1},
+        {"tps40422", 2},
         {"udt020", 1},
         {}
 };