Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (jc42) Use common device ID for TSE2004av compliant sensors

TSE2004av standardizes the device ID of compliant temperature sensors to
be 0x22xx, where xx is the device revision. Use a single define for all
TSE2004av compliant temperature sensors, and relax the device id mask to
match the upper 8 bit of the device id register.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

+10 -33
+10 -33
drivers/hwmon/jc42.c
··· 79 79 #define AT30TS00_DEVID 0x8201 80 80 #define AT30TS00_DEVID_MASK 0xffff 81 81 82 - #define AT30TSE004_DEVID 0x2200 83 - #define AT30TSE004_DEVID_MASK 0xffff 84 - 85 - /* Giantec */ 86 - #define GT30TS00_DEVID 0x2200 87 - #define GT30TS00_DEVID_MASK 0xff00 88 - 89 82 #define GT34TS02_DEVID 0x3300 90 83 #define GT34TS02_DEVID_MASK 0xff00 91 - 92 - /* IDT */ 93 - #define TSE2004_DEVID 0x2200 94 - #define TSE2004_DEVID_MASK 0xff00 95 84 96 85 #define TS3000_DEVID 0x2900 /* Also matches TSE2002 */ 97 86 #define TS3000_DEVID_MASK 0xff00 ··· 105 116 #define MCP98243_DEVID 0x2100 106 117 #define MCP98243_DEVID_MASK 0xfffc 107 118 108 - #define MCP98244_DEVID 0x2200 109 - #define MCP98244_DEVID_MASK 0xfffc 110 - 111 119 #define MCP9843_DEVID 0x0000 /* Also matches mcp9805 */ 112 120 #define MCP9843_DEVID_MASK 0xfffe 113 121 ··· 122 136 #define CAT34TS02C_DEVID 0x0a00 123 137 #define CAT34TS02C_DEVID_MASK 0xfff0 124 138 125 - #define CAT34TS04_DEVID 0x2200 126 - #define CAT34TS04_DEVID_MASK 0xfff0 127 - 128 - #define N34TS04_DEVID 0x2230 129 - #define N34TS04_DEVID_MASK 0xfff0 130 - 131 139 /* ST Microelectronics */ 132 140 #define STTS424_DEVID 0x0101 133 141 #define STTS424_DEVID_MASK 0xffff ··· 132 152 #define STTS2002_DEVID 0x0300 133 153 #define STTS2002_DEVID_MASK 0xffff 134 154 135 - #define STTS2004_DEVID 0x2201 136 - #define STTS2004_DEVID_MASK 0xffff 137 - 138 155 #define STTS3000_DEVID 0x0200 139 156 #define STTS3000_DEVID_MASK 0xffff 140 157 141 - /* Seiko Instruments */ 142 - #define S34TS04A_DEVID 0x2221 143 - #define S34TS04A_DEVID_MASK 0xffff 158 + /* TSE2004 compliant sensors */ 159 + #define TSE2004_DEVID 0x2200 160 + #define TSE2004_DEVID_MASK 0xff00 144 161 145 162 static u16 jc42_hysteresis[] = { 0, 1500, 3000, 6000 }; 146 163 ··· 150 173 static struct jc42_chips jc42_chips[] = { 151 174 { ADT_MANID, ADT7408_DEVID, ADT7408_DEVID_MASK }, 152 175 { ATMEL_MANID, AT30TS00_DEVID, AT30TS00_DEVID_MASK }, 153 - { ATMEL_MANID2, AT30TSE004_DEVID, AT30TSE004_DEVID_MASK }, 154 - { GT_MANID, GT30TS00_DEVID, GT30TS00_DEVID_MASK }, 176 + { ATMEL_MANID2, TSE2004_DEVID, TSE2004_DEVID_MASK }, 177 + { GT_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 155 178 { GT_MANID2, GT34TS02_DEVID, GT34TS02_DEVID_MASK }, 156 179 { IDT_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 157 180 { IDT_MANID, TS3000_DEVID, TS3000_DEVID_MASK }, ··· 161 184 { MCP_MANID, MCP9808_DEVID, MCP9808_DEVID_MASK }, 162 185 { MCP_MANID, MCP98242_DEVID, MCP98242_DEVID_MASK }, 163 186 { MCP_MANID, MCP98243_DEVID, MCP98243_DEVID_MASK }, 164 - { MCP_MANID, MCP98244_DEVID, MCP98244_DEVID_MASK }, 187 + { MCP_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 165 188 { MCP_MANID, MCP9843_DEVID, MCP9843_DEVID_MASK }, 166 189 { NXP_MANID, SE97_DEVID, SE97_DEVID_MASK }, 167 190 { ONS_MANID, CAT6095_DEVID, CAT6095_DEVID_MASK }, 168 191 { ONS_MANID, CAT34TS02C_DEVID, CAT34TS02C_DEVID_MASK }, 169 - { ONS_MANID, CAT34TS04_DEVID, CAT34TS04_DEVID_MASK }, 170 - { ONS_MANID, N34TS04_DEVID, N34TS04_DEVID_MASK }, 192 + { ONS_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 193 + { ONS_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 171 194 { NXP_MANID, SE98_DEVID, SE98_DEVID_MASK }, 172 - { SI_MANID, S34TS04A_DEVID, S34TS04A_DEVID_MASK }, 195 + { SI_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 173 196 { STM_MANID, STTS424_DEVID, STTS424_DEVID_MASK }, 174 197 { STM_MANID, STTS424E_DEVID, STTS424E_DEVID_MASK }, 175 198 { STM_MANID, STTS2002_DEVID, STTS2002_DEVID_MASK }, 176 - { STM_MANID, STTS2004_DEVID, STTS2004_DEVID_MASK }, 199 + { STM_MANID, TSE2004_DEVID, TSE2004_DEVID_MASK }, 177 200 { STM_MANID, STTS3000_DEVID, STTS3000_DEVID_MASK }, 178 201 }; 179 202