diff options
author | Alison Schofield <amsfield22@gmail.com> | 2016-06-27 20:23:27 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2016-06-27 21:58:04 -0400 |
commit | a31887dc9be1a65cde2562ed10e7fbf5c82581a2 (patch) | |
tree | 8c38fc2732f0d46e71e5fd8addde55f2c5ec4426 | |
parent | 9ad0df1adac20d694fbb8e7cb7bac04e0645a927 (diff) |
hwmon: (jc42) Add support for Microchip MCP9808 temperature sensor
MCP9808 is not officially compliant to JC-42, similar to MCP9804,
but its registers are compatible to JC-42.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Cc: Daniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-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 f7f1830a2566..b4b671f22453 100644 --- a/Documentation/hwmon/jc42 +++ b/Documentation/hwmon/jc42 | |||
@@ -18,10 +18,11 @@ Supported chips: | |||
18 | * Maxim MAX6604 | 18 | * Maxim MAX6604 |
19 | Datasheets: | 19 | Datasheets: |
20 | http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf | 20 | http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf |
21 | * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP98244, MCP9843 | 21 | * Microchip MCP9804, MCP9805, MCP9808, MCP98242, MCP98243, MCP98244, MCP9843 |
22 | Datasheets: | 22 | Datasheets: |
23 | http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf | 23 | http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf |
24 | http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf | 24 | http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf |
25 | http://ww1.microchip.com/downloads/en/DeviceDoc/25095A.pdf | ||
25 | http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf | 26 | http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf |
26 | http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf | 27 | http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf |
27 | http://ww1.microchip.com/downloads/en/DeviceDoc/22327A.pdf | 28 | http://ww1.microchip.com/downloads/en/DeviceDoc/22327A.pdf |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index b2aa13bd89dc..91f145e0cd45 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -645,8 +645,8 @@ config SENSORS_JC42 | |||
645 | temperature sensors, which are used on many DDR3 memory modules for | 645 | temperature sensors, which are used on many DDR3 memory modules for |
646 | mobile devices and servers. Support will include, but not be limited | 646 | mobile devices and servers. Support will include, but not be limited |
647 | to, ADT7408, AT30TS00, CAT34TS02, CAT6095, MAX6604, MCP9804, MCP9805, | 647 | to, ADT7408, AT30TS00, CAT34TS02, CAT6095, MAX6604, MCP9804, MCP9805, |
648 | MCP98242, MCP98243, MCP98244, MCP9843, SE97, SE98, STTS424(E), | 648 | MCP9808, MCP98242, MCP98243, MCP98244, MCP9843, SE97, SE98, |
649 | STTS2002, STTS3000, TSE2002, TSE2004, TS3000, and TS3001. | 649 | STTS424(E), STTS2002, STTS3000, TSE2002, TSE2004, TS3000, and TS3001. |
650 | 650 | ||
651 | This driver can also be built as a module. If so, the module | 651 | This driver can also be built as a module. If so, the module |
652 | will be called jc42. | 652 | will be called jc42. |
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c index 9887d3224a86..f67c1bbe2c51 100644 --- a/drivers/hwmon/jc42.c +++ b/drivers/hwmon/jc42.c | |||
@@ -104,6 +104,9 @@ static const unsigned short normal_i2c[] = { | |||
104 | #define MCP9804_DEVID 0x0200 | 104 | #define MCP9804_DEVID 0x0200 |
105 | #define MCP9804_DEVID_MASK 0xfffc | 105 | #define MCP9804_DEVID_MASK 0xfffc |
106 | 106 | ||
107 | #define MCP9808_DEVID 0x0400 | ||
108 | #define MCP9808_DEVID_MASK 0xfffc | ||
109 | |||
107 | #define MCP98242_DEVID 0x2000 | 110 | #define MCP98242_DEVID 0x2000 |
108 | #define MCP98242_DEVID_MASK 0xfffc | 111 | #define MCP98242_DEVID_MASK 0xfffc |
109 | 112 | ||
@@ -160,6 +163,7 @@ static struct jc42_chips jc42_chips[] = { | |||
160 | { IDT_MANID, TS3001_DEVID, TS3001_DEVID_MASK }, | 163 | { IDT_MANID, TS3001_DEVID, TS3001_DEVID_MASK }, |
161 | { MAX_MANID, MAX6604_DEVID, MAX6604_DEVID_MASK }, | 164 | { MAX_MANID, MAX6604_DEVID, MAX6604_DEVID_MASK }, |
162 | { MCP_MANID, MCP9804_DEVID, MCP9804_DEVID_MASK }, | 165 | { MCP_MANID, MCP9804_DEVID, MCP9804_DEVID_MASK }, |
166 | { MCP_MANID, MCP9808_DEVID, MCP9808_DEVID_MASK }, | ||
163 | { MCP_MANID, MCP98242_DEVID, MCP98242_DEVID_MASK }, | 167 | { MCP_MANID, MCP98242_DEVID, MCP98242_DEVID_MASK }, |
164 | { MCP_MANID, MCP98243_DEVID, MCP98243_DEVID_MASK }, | 168 | { MCP_MANID, MCP98243_DEVID, MCP98243_DEVID_MASK }, |
165 | { MCP_MANID, MCP98244_DEVID, MCP98244_DEVID_MASK }, | 169 | { MCP_MANID, MCP98244_DEVID, MCP98244_DEVID_MASK }, |