From 6a966c10999040541c3c2733bca10f7c658b799b Mon Sep 17 00:00:00 2001
From: Guenter Roeck <guenter.roeck@ericsson.com>
Date: Sat, 25 Jun 2011 15:13:44 -0700
Subject: [PATCH] --- yaml --- r: 261748 b: refs/heads/master c:
 e0455e380b5bdf8dff7c8e29423d2446d9f59040 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4323c74ba76e..a6aa4062ef5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1061d8518f8bde548a03a5ff77dbe9a4202ad826
+refs/heads/master: e0455e380b5bdf8dff7c8e29423d2446d9f59040
diff --git a/trunk/Documentation/hwmon/pmbus b/trunk/Documentation/hwmon/pmbus
index 5e462fc7f99b..c36c1c1a62bb 100644
--- a/trunk/Documentation/hwmon/pmbus
+++ b/trunk/Documentation/hwmon/pmbus
@@ -13,6 +13,13 @@ Supported chips:
     Prefix: 'ltc2978'
     Addresses scanned: -
     Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf
+  * ON Semiconductor ADP4000, NCP4200, NCP4208
+    Prefixes: 'adp4000', 'ncp4200', 'ncp4208'
+    Addresses scanned: -
+    Datasheets:
+	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
   * Generic PMBus devices
     Prefix: 'pmbus'
     Addresses scanned: -
diff --git a/trunk/drivers/hwmon/pmbus/Kconfig b/trunk/drivers/hwmon/pmbus/Kconfig
index 794129f48594..0a822a45085d 100644
--- a/trunk/drivers/hwmon/pmbus/Kconfig
+++ b/trunk/drivers/hwmon/pmbus/Kconfig
@@ -19,8 +19,8 @@ config SENSORS_PMBUS
 	default y
 	help
 	  If you say yes here you get hardware monitoring support for generic
-	  PMBus devices, including but not limited to BMR450, BMR451, BMR453,
-	  BMR454, and LTC2978.
+	  PMBus devices, including but not limited to ADP4000, BMR450, BMR451,
+	  BMR453, BMR454, LTC2978, NCP4200, and NCP4208.
 
 	  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 4d8e31bcd7a3..73de9f1f3194 100644
--- a/trunk/drivers/hwmon/pmbus/pmbus.c
+++ b/trunk/drivers/hwmon/pmbus/pmbus.c
@@ -200,11 +200,14 @@ static int pmbus_remove(struct i2c_client *client)
  * Use driver_data to set the number of pages supported by the chip.
  */
 static const struct i2c_device_id pmbus_id[] = {
+	{"adp4000", 1},
 	{"bmr450", 1},
 	{"bmr451", 1},
 	{"bmr453", 1},
 	{"bmr454", 1},
 	{"ltc2978", 8},
+	{"ncp4200", 1},
+	{"ncp4208", 1},
 	{"pmbus", 0},
 	{}
 };