From ff043adbb49e19c173e41e6cb304c4a876311c71 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Tue, 28 Feb 2012 10:24:54 -0800
Subject: [PATCH] --- yaml --- r: 292227 b: refs/heads/master c:
 c5f35c9d8285f4a065cb0fc2c57f7526e646b30f h: refs/heads/master i:   292225:
 d9dd97ae3a6b3dc258215396b0865d3fb1c3f998   292223:
 8e3795929ea525b2c504cc8d75c1573a7511b16c v: v3

---
 [refs]                            | 2 +-
 trunk/Documentation/hwmon/pmbus   | 6 ++++++
 trunk/drivers/hwmon/pmbus/Kconfig | 2 +-
 trunk/drivers/hwmon/pmbus/pmbus.c | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2d61b49d736c..8a17cbe29ea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56aad5d143cbce620c079e1acf761b71f59758a0
+refs/heads/master: c5f35c9d8285f4a065cb0fc2c57f7526e646b30f
diff --git a/trunk/Documentation/hwmon/pmbus b/trunk/Documentation/hwmon/pmbus
index d28b591753d1..c2b157ba9006 100644
--- a/trunk/Documentation/hwmon/pmbus
+++ b/trunk/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/trunk/drivers/hwmon/pmbus/Kconfig b/trunk/drivers/hwmon/pmbus/Kconfig
index cfec923f42b7..7968c815f443 100644
--- a/trunk/drivers/hwmon/pmbus/Kconfig
+++ b/trunk/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/trunk/drivers/hwmon/pmbus/pmbus.c b/trunk/drivers/hwmon/pmbus/pmbus.c
index 34887408505b..7d5161dd04f0 100644
--- a/trunk/drivers/hwmon/pmbus/pmbus.c
+++ b/trunk/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},
 	{}
 };