commit 592758b12f2e327bb5902dabd3d36b2e86049871
author Sven Schuchmann <schuchmann@schleissheimer.de> Fri Sep 21 13:04:22 2012 +0200
committer Guenter Roeck <linux@roeck-us.net> Sun Sep 23 21:08:36 2012 -0700
tree a6dfcb123de6fb8b09b394a28d0f5d66e2387e6c
parent 8b662f38e066d8fc1b73a8655da547c348206904

hwmon: (mcp3021) Add MCP3221 support

This Patch adds support for mcp3221 chip to the
mcp3021 driver.

Signed-off-by: Sven Schuchmann <schuchmann@schleissheimer.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

drivers/hwmon/mcp3021.c

diff --git a/drivers/hwmon/mcp3021.c b/drivers/hwmon/mcp3021.c
index d700b92..eedb322 100644
--- a/drivers/hwmon/mcp3021.c
+++ b/drivers/hwmon/mcp3021.c
@@ -1,5 +1,5 @@
 /*
- * mcp3021.c - driver for the Microchip MCP3021 chip
+ * mcp3021.c - driver for Microchip MCP3021 and MCP3221
  *
  * Copyright (C) 2008-2009, 2012 Freescale Semiconductor, Inc.
  * Author: Mingkai Hu <Mingkai.hu@freescale.com>
@@ -35,9 +35,16 @@
 #define MCP3021_OUTPUT_RES	10	/* 10-bit resolution */
 #define MCP3021_OUTPUT_SCALE	4
 
+#define MCP3221_SAR_SHIFT	0
+#define MCP3221_SAR_MASK	0xfff
+#define MCP3221_OUTPUT_RES	12	/* 12-bit resolution */
+#define MCP3221_OUTPUT_SCALE	1
+
 enum chips {
-	mcp3021
+	mcp3021,
+	mcp3221
 };
+
 /*
  * Client data (each client gets its own)
  */
@@ -127,6 +134,13 @@
 		data->output_res = MCP3021_OUTPUT_RES;
 		data->output_scale = MCP3021_OUTPUT_SCALE;
 		break;
+
+	case mcp3221:
+		data->sar_shift = MCP3221_SAR_SHIFT;
+		data->sar_mask = MCP3221_SAR_MASK;
+		data->output_res = MCP3221_OUTPUT_RES;
+		data->output_scale = MCP3221_OUTPUT_SCALE;
+		break;
 	}
 
 	if (client->dev.platform_data) {
@@ -165,6 +179,7 @@
 
 static const struct i2c_device_id mcp3021_id[] = {
 	{ "mcp3021", mcp3021 },
+	{ "mcp3221", mcp3221 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, mcp3021_id);
@@ -181,5 +196,5 @@
 module_i2c_driver(mcp3021_driver);
 
 MODULE_AUTHOR("Mingkai Hu <Mingkai.hu@freescale.com>");
-MODULE_DESCRIPTION("Microchip MCP3021 driver");
+MODULE_DESCRIPTION("Microchip MCP3021/MCP3221 driver");
 MODULE_LICENSE("GPL");