---

yaml --- r: 292227 b: refs/heads/master c: c5f35c9 h: refs/heads/master i: 292225: d9dd97a 292223: 8e37959 v: v3
git-mirror · Mar 19, 2012 · ff043ad · ff043ad
1 parent 83f4f86
commit ff043ad
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -191,6 +191,8 @@ static const struct i2c_device_id pmbus_id[] = {
 	{"pdt006", 1},
 	{"pdt012", 1},
 	{"pmbus", 0},
+	{"tps40400", 1},
+	{"tps40422", 2},
 	{"udt020", 1},
 	{}
 };