diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-01-28 23:35:19 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2013-02-06 12:58:07 -0500 |
commit | d47682803776f147ee9662a505c63bbbf27a1274 (patch) | |
tree | 076dca54f493d1574283583951302e9fc101d16c | |
parent | f880b12c1832ee588e61bf7190d767ab88dcc8d0 (diff) |
hwmon: (jc42) Add support for MCP98244
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r-- | Documentation/hwmon/jc42 | 3 | ||||
-rw-r--r-- | drivers/hwmon/Kconfig | 4 | ||||
-rw-r--r-- | drivers/hwmon/jc42.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42 index 66ecb9fc8246..165077121238 100644 --- a/Documentation/hwmon/jc42 +++ b/Documentation/hwmon/jc42 | |||
@@ -17,12 +17,13 @@ Supported chips: | |||
17 | * Maxim MAX6604 | 17 | * Maxim MAX6604 |
18 | Datasheets: | 18 | Datasheets: |
19 | http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf | 19 | http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf |
20 | * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP9843 | 20 | * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP98244, MCP9843 |
21 | Datasheets: | 21 | Datasheets: |
22 | http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf | 22 | http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf |
23 | http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf | 23 | http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf |
24 | http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf | 24 | http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf |
25 | http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf | 25 | http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf |
26 | http://ww1.microchip.com/downloads/en/DeviceDoc/22327A.pdf | ||
26 | * NXP Semiconductors SE97, SE97B, SE98, SE98A | 27 | * NXP Semiconductors SE97, SE97B, SE98, SE98A |
27 | Datasheets: | 28 | Datasheets: |
28 | http://www.nxp.com/documents/data_sheet/SE97.pdf | 29 | http://www.nxp.com/documents/data_sheet/SE97.pdf |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 5e77cef09ca6..52d5174792ee 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -530,8 +530,8 @@ config SENSORS_JC42 | |||
530 | temperature sensors, which are used on many DDR3 memory modules for | 530 | temperature sensors, which are used on many DDR3 memory modules for |
531 | mobile devices and servers. Support will include, but not be limited | 531 | mobile devices and servers. Support will include, but not be limited |
532 | to, ADT7408, AT30TS00, CAT34TS02, CAT6095, MAX6604, MCP9804, MCP9805, | 532 | to, ADT7408, AT30TS00, CAT34TS02, CAT6095, MAX6604, MCP9804, MCP9805, |
533 | MCP98242, MCP98243, MCP9843, SE97, SE98, STTS424(E), STTS2002, | 533 | MCP98242, MCP98243, MCP98244, MCP9843, SE97, SE98, STTS424(E), |
534 | STTS3000, TSE2002B3, TSE2002GB2, TS3000B3, and TS3000GB2. | 534 | STTS2002, STTS3000, TSE2002B3, TSE2002GB2, TS3000B3, and TS3000GB2. |
535 | 535 | ||
536 | This driver can also be built as a module. If so, the module | 536 | This driver can also be built as a module. If so, the module |
537 | will be called jc42. | 537 | will be called jc42. |
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c index 82d962488f55..4a58f130fd4e 100644 --- a/drivers/hwmon/jc42.c +++ b/drivers/hwmon/jc42.c | |||
@@ -103,6 +103,9 @@ static const unsigned short normal_i2c[] = { | |||
103 | #define MCP98243_DEVID 0x2100 | 103 | #define MCP98243_DEVID 0x2100 |
104 | #define MCP98243_DEVID_MASK 0xfffc | 104 | #define MCP98243_DEVID_MASK 0xfffc |
105 | 105 | ||
106 | #define MCP98244_DEVID 0x2200 | ||
107 | #define MCP98244_DEVID_MASK 0xfffc | ||
108 | |||
106 | #define MCP9843_DEVID 0x0000 /* Also matches mcp9805 */ | 109 | #define MCP9843_DEVID 0x0000 /* Also matches mcp9805 */ |
107 | #define MCP9843_DEVID_MASK 0xfffe | 110 | #define MCP9843_DEVID_MASK 0xfffe |
108 | 111 | ||
@@ -147,6 +150,7 @@ static struct jc42_chips jc42_chips[] = { | |||
147 | { MCP_MANID, MCP9804_DEVID, MCP9804_DEVID_MASK }, | 150 | { MCP_MANID, MCP9804_DEVID, MCP9804_DEVID_MASK }, |
148 | { MCP_MANID, MCP98242_DEVID, MCP98242_DEVID_MASK }, | 151 | { MCP_MANID, MCP98242_DEVID, MCP98242_DEVID_MASK }, |
149 | { MCP_MANID, MCP98243_DEVID, MCP98243_DEVID_MASK }, | 152 | { MCP_MANID, MCP98243_DEVID, MCP98243_DEVID_MASK }, |
153 | { MCP_MANID, MCP98244_DEVID, MCP98244_DEVID_MASK }, | ||
150 | { MCP_MANID, MCP9843_DEVID, MCP9843_DEVID_MASK }, | 154 | { MCP_MANID, MCP9843_DEVID, MCP9843_DEVID_MASK }, |
151 | { NXP_MANID, SE97_DEVID, SE97_DEVID_MASK }, | 155 | { NXP_MANID, SE97_DEVID, SE97_DEVID_MASK }, |
152 | { ONS_MANID, CAT6095_DEVID, CAT6095_DEVID_MASK }, | 156 | { ONS_MANID, CAT6095_DEVID, CAT6095_DEVID_MASK }, |