diff options
| author | Sven Schuchmann <schuchmann@schleissheimer.de> | 2012-09-21 13:04:22 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-24 06:08:36 +0200 |
| commit | 592758b12f2e327bb5902dabd3d36b2e86049871 (patch) | |
| tree | a6dfcb123de6fb8b09b394a28d0f5d66e2387e6c /drivers | |
| parent | hwmon: (mcp3021) Prepare MCP3021 driver to support other chips (diff) | |
| download | linux-592758b12f2e327bb5902dabd3d36b2e86049871.tar.xz linux-592758b12f2e327bb5902dabd3d36b2e86049871.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/hwmon/mcp3021.c | 21 |
2 files changed, 22 insertions, 6 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 6bc49cfb9f7b..c74e73b2069a 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -855,11 +855,12 @@ config SENSORS_MAX6650 will be called max6650. config SENSORS_MCP3021 - tristate "Microchip MCP3021" + tristate "Microchip MCP3021 and compatibles" depends on I2C help - If you say yes here you get support for the MCP3021 chip - that is a A/D converter (ADC) with 10-bit resolution. + If you say yes here you get support for MCP3021 and MCP3221. + The MCP3021 is a A/D converter (ADC) with 10-bit and the MCP3221 + with 12-bit resolution. This driver can also be built as a module. If so, the module will be called mcp3021. diff --git a/drivers/hwmon/mcp3021.c b/drivers/hwmon/mcp3021.c index d700b9271174..eedb32292d6d 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 @@ static int mcp3021_probe(struct i2c_client *client, 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 int mcp3021_remove(struct i2c_client *client) static const struct i2c_device_id mcp3021_id[] = { { "mcp3021", mcp3021 }, + { "mcp3221", mcp3221 }, { } }; MODULE_DEVICE_TABLE(i2c, mcp3021_id); @@ -181,5 +196,5 @@ static struct i2c_driver mcp3021_driver = { 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"); |