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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'hwmon-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

- Fix up chip IDs (isl68137)

- error handling for invalid temperatures and use true module name
(drivetemp)

- Fix static symbol warnings (k10temp)

- Use valid hwmon device name (jc42)

* tag 'hwmon-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (jc42) Fix name to have no illegal characters
hwmon: (k10temp) make some symbols static
hwmon: (drivetemp) Return -ENODATA for invalid temperatures
hwmon: (drivetemp) Use drivetemp's true module name in Kconfig section
hwmon: (pmbus/isl68137) Fix up chip IDs

Linus Torvalds eeaa7625 c0d73a86

+134 -50
+38 -38
Documentation/hwmon/isl68137.rst
··· 16 16 17 17 * Renesas ISL68220 18 18 19 - Prefix: 'raa_dmpvr2_2rail' 19 + Prefix: 'isl68220' 20 20 21 21 Addresses scanned: - 22 22 ··· 26 26 27 27 * Renesas ISL68221 28 28 29 - Prefix: 'raa_dmpvr2_3rail' 29 + Prefix: 'isl68221' 30 30 31 31 Addresses scanned: - 32 32 ··· 36 36 37 37 * Renesas ISL68222 38 38 39 - Prefix: 'raa_dmpvr2_2rail' 39 + Prefix: 'isl68222' 40 40 41 41 Addresses scanned: - 42 42 ··· 46 46 47 47 * Renesas ISL68223 48 48 49 - Prefix: 'raa_dmpvr2_2rail' 49 + Prefix: 'isl68223' 50 50 51 51 Addresses scanned: - 52 52 ··· 56 56 57 57 * Renesas ISL68224 58 58 59 - Prefix: 'raa_dmpvr2_3rail' 59 + Prefix: 'isl68224' 60 60 61 61 Addresses scanned: - 62 62 ··· 66 66 67 67 * Renesas ISL68225 68 68 69 - Prefix: 'raa_dmpvr2_2rail' 69 + Prefix: 'isl68225' 70 70 71 71 Addresses scanned: - 72 72 ··· 76 76 77 77 * Renesas ISL68226 78 78 79 - Prefix: 'raa_dmpvr2_3rail' 79 + Prefix: 'isl68226' 80 80 81 81 Addresses scanned: - 82 82 ··· 86 86 87 87 * Renesas ISL68227 88 88 89 - Prefix: 'raa_dmpvr2_1rail' 89 + Prefix: 'isl68227' 90 90 91 91 Addresses scanned: - 92 92 ··· 96 96 97 97 * Renesas ISL68229 98 98 99 - Prefix: 'raa_dmpvr2_3rail' 99 + Prefix: 'isl68229' 100 100 101 101 Addresses scanned: - 102 102 ··· 106 106 107 107 * Renesas ISL68233 108 108 109 - Prefix: 'raa_dmpvr2_2rail' 109 + Prefix: 'isl68233' 110 110 111 111 Addresses scanned: - 112 112 ··· 116 116 117 117 * Renesas ISL68239 118 118 119 - Prefix: 'raa_dmpvr2_3rail' 119 + Prefix: 'isl68239' 120 120 121 121 Addresses scanned: - 122 122 ··· 126 126 127 127 * Renesas ISL69222 128 128 129 - Prefix: 'raa_dmpvr2_2rail' 129 + Prefix: 'isl69222' 130 130 131 131 Addresses scanned: - 132 132 ··· 136 136 137 137 * Renesas ISL69223 138 138 139 - Prefix: 'raa_dmpvr2_3rail' 139 + Prefix: 'isl69223' 140 140 141 141 Addresses scanned: - 142 142 ··· 146 146 147 147 * Renesas ISL69224 148 148 149 - Prefix: 'raa_dmpvr2_2rail' 149 + Prefix: 'isl69224' 150 150 151 151 Addresses scanned: - 152 152 ··· 156 156 157 157 * Renesas ISL69225 158 158 159 - Prefix: 'raa_dmpvr2_2rail' 159 + Prefix: 'isl69225' 160 160 161 161 Addresses scanned: - 162 162 ··· 166 166 167 167 * Renesas ISL69227 168 168 169 - Prefix: 'raa_dmpvr2_3rail' 169 + Prefix: 'isl69227' 170 170 171 171 Addresses scanned: - 172 172 ··· 176 176 177 177 * Renesas ISL69228 178 178 179 - Prefix: 'raa_dmpvr2_3rail' 179 + Prefix: 'isl69228' 180 180 181 181 Addresses scanned: - 182 182 ··· 186 186 187 187 * Renesas ISL69234 188 188 189 - Prefix: 'raa_dmpvr2_2rail' 189 + Prefix: 'isl69234' 190 190 191 191 Addresses scanned: - 192 192 ··· 196 196 197 197 * Renesas ISL69236 198 198 199 - Prefix: 'raa_dmpvr2_2rail' 199 + Prefix: 'isl69236' 200 200 201 201 Addresses scanned: - 202 202 ··· 206 206 207 207 * Renesas ISL69239 208 208 209 - Prefix: 'raa_dmpvr2_3rail' 209 + Prefix: 'isl69239' 210 210 211 211 Addresses scanned: - 212 212 ··· 216 216 217 217 * Renesas ISL69242 218 218 219 - Prefix: 'raa_dmpvr2_2rail' 219 + Prefix: 'isl69242' 220 220 221 221 Addresses scanned: - 222 222 ··· 226 226 227 227 * Renesas ISL69243 228 228 229 - Prefix: 'raa_dmpvr2_1rail' 229 + Prefix: 'isl69243' 230 230 231 231 Addresses scanned: - 232 232 ··· 236 236 237 237 * Renesas ISL69247 238 238 239 - Prefix: 'raa_dmpvr2_2rail' 239 + Prefix: 'isl69247' 240 240 241 241 Addresses scanned: - 242 242 ··· 246 246 247 247 * Renesas ISL69248 248 248 249 - Prefix: 'raa_dmpvr2_2rail' 249 + Prefix: 'isl69248' 250 250 251 251 Addresses scanned: - 252 252 ··· 256 256 257 257 * Renesas ISL69254 258 258 259 - Prefix: 'raa_dmpvr2_2rail' 259 + Prefix: 'isl69254' 260 260 261 261 Addresses scanned: - 262 262 ··· 266 266 267 267 * Renesas ISL69255 268 268 269 - Prefix: 'raa_dmpvr2_2rail' 269 + Prefix: 'isl69255' 270 270 271 271 Addresses scanned: - 272 272 ··· 276 276 277 277 * Renesas ISL69256 278 278 279 - Prefix: 'raa_dmpvr2_2rail' 279 + Prefix: 'isl69256' 280 280 281 281 Addresses scanned: - 282 282 ··· 286 286 287 287 * Renesas ISL69259 288 288 289 - Prefix: 'raa_dmpvr2_2rail' 289 + Prefix: 'isl69259' 290 290 291 291 Addresses scanned: - 292 292 ··· 296 296 297 297 * Renesas ISL69260 298 298 299 - Prefix: 'raa_dmpvr2_2rail' 299 + Prefix: 'isl69260' 300 300 301 301 Addresses scanned: - 302 302 ··· 306 306 307 307 * Renesas ISL69268 308 308 309 - Prefix: 'raa_dmpvr2_2rail' 309 + Prefix: 'isl69268' 310 310 311 311 Addresses scanned: - 312 312 ··· 316 316 317 317 * Renesas ISL69269 318 318 319 - Prefix: 'raa_dmpvr2_3rail' 319 + Prefix: 'isl69269' 320 320 321 321 Addresses scanned: - 322 322 ··· 326 326 327 327 * Renesas ISL69298 328 328 329 - Prefix: 'raa_dmpvr2_2rail' 329 + Prefix: 'isl69298' 330 330 331 331 Addresses scanned: - 332 332 ··· 336 336 337 337 * Renesas RAA228000 338 338 339 - Prefix: 'raa_dmpvr2_hv' 339 + Prefix: 'raa228000' 340 340 341 341 Addresses scanned: - 342 342 ··· 346 346 347 347 * Renesas RAA228004 348 348 349 - Prefix: 'raa_dmpvr2_hv' 349 + Prefix: 'raa228004' 350 350 351 351 Addresses scanned: - 352 352 ··· 356 356 357 357 * Renesas RAA228006 358 358 359 - Prefix: 'raa_dmpvr2_hv' 359 + Prefix: 'raa228006' 360 360 361 361 Addresses scanned: - 362 362 ··· 366 366 367 367 * Renesas RAA228228 368 368 369 - Prefix: 'raa_dmpvr2_2rail' 369 + Prefix: 'raa228228' 370 370 371 371 Addresses scanned: - 372 372 ··· 376 376 377 377 * Renesas RAA229001 378 378 379 - Prefix: 'raa_dmpvr2_2rail' 379 + Prefix: 'raa229001' 380 380 381 381 Addresses scanned: - 382 382 ··· 386 386 387 387 * Renesas RAA229004 388 388 389 - Prefix: 'raa_dmpvr2_2rail' 389 + Prefix: 'raa229004' 390 390 391 391 Addresses scanned: - 392 392
+1 -1
drivers/hwmon/Kconfig
··· 412 412 hard disk drives. 413 413 414 414 This driver can also be built as a module. If so, the module 415 - will be called satatemp. 415 + will be called drivetemp. 416 416 417 417 config SENSORS_DS620 418 418 tristate "Dallas Semiconductor DS620"
+6
drivers/hwmon/drivetemp.c
··· 264 264 return err; 265 265 switch (attr) { 266 266 case hwmon_temp_input: 267 + if (!temp_is_valid(buf[SCT_STATUS_TEMP])) 268 + return -ENODATA; 267 269 *val = temp_from_sct(buf[SCT_STATUS_TEMP]); 268 270 break; 269 271 case hwmon_temp_lowest: 272 + if (!temp_is_valid(buf[SCT_STATUS_TEMP_LOWEST])) 273 + return -ENODATA; 270 274 *val = temp_from_sct(buf[SCT_STATUS_TEMP_LOWEST]); 271 275 break; 272 276 case hwmon_temp_highest: 277 + if (!temp_is_valid(buf[SCT_STATUS_TEMP_HIGHEST])) 278 + return -ENODATA; 273 279 *val = temp_from_sct(buf[SCT_STATUS_TEMP_HIGHEST]); 274 280 break; 275 281 default:
+1 -1
drivers/hwmon/jc42.c
··· 506 506 } 507 507 data->config = config; 508 508 509 - hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, 509 + hwmon_dev = devm_hwmon_device_register_with_info(dev, "jc42", 510 510 data, &jc42_chip_info, 511 511 NULL); 512 512 return PTR_ERR_OR_ZERO(hwmon_dev);
+3 -3
drivers/hwmon/k10temp.c
··· 186 186 return temp; 187 187 } 188 188 189 - const char *k10temp_temp_label[] = { 189 + static const char *k10temp_temp_label[] = { 190 190 "Tctl", 191 191 "Tdie", 192 192 "Tccd1", ··· 199 199 "Tccd8", 200 200 }; 201 201 202 - const char *k10temp_in_label[] = { 202 + static const char *k10temp_in_label[] = { 203 203 "Vcore", 204 204 "Vsoc", 205 205 }; 206 206 207 - const char *k10temp_curr_label[] = { 207 + static const char *k10temp_curr_label[] = { 208 208 "Icore", 209 209 "Isoc", 210 210 };
+85 -7
drivers/hwmon/pmbus/isl68137.c
··· 21 21 #define ISL68137_VOUT_AVS 0x30 22 22 #define RAA_DMPVR2_READ_VMON 0xc8 23 23 24 - enum versions { 24 + enum chips { 25 25 isl68137, 26 + isl68220, 27 + isl68221, 28 + isl68222, 29 + isl68223, 30 + isl68224, 31 + isl68225, 32 + isl68226, 33 + isl68227, 34 + isl68229, 35 + isl68233, 36 + isl68239, 37 + isl69222, 38 + isl69223, 39 + isl69224, 40 + isl69225, 41 + isl69227, 42 + isl69228, 43 + isl69234, 44 + isl69236, 45 + isl69239, 46 + isl69242, 47 + isl69243, 48 + isl69247, 49 + isl69248, 50 + isl69254, 51 + isl69255, 52 + isl69256, 53 + isl69259, 54 + isl69260, 55 + isl69268, 56 + isl69269, 57 + isl69298, 58 + raa228000, 59 + raa228004, 60 + raa228006, 61 + raa228228, 62 + raa229001, 63 + raa229004, 64 + }; 65 + 66 + enum variants { 67 + raa_dmpvr1_2rail, 26 68 raa_dmpvr2_1rail, 27 69 raa_dmpvr2_2rail, 28 70 raa_dmpvr2_3rail, ··· 228 186 memcpy(info, &raa_dmpvr_info, sizeof(*info)); 229 187 230 188 switch (id->driver_data) { 231 - case isl68137: 189 + case raa_dmpvr1_2rail: 232 190 info->pages = 2; 233 191 info->R[PSC_VOLTAGE_IN] = 3; 234 192 info->func[0] &= ~PMBUS_HAVE_VMON; ··· 266 224 } 267 225 268 226 static const struct i2c_device_id raa_dmpvr_id[] = { 269 - {"isl68137", isl68137}, 270 - {"raa_dmpvr2_1rail", raa_dmpvr2_1rail}, 271 - {"raa_dmpvr2_2rail", raa_dmpvr2_2rail}, 272 - {"raa_dmpvr2_3rail", raa_dmpvr2_3rail}, 273 - {"raa_dmpvr2_hv", raa_dmpvr2_hv}, 227 + {"isl68137", raa_dmpvr1_2rail}, 228 + {"isl68220", raa_dmpvr2_2rail}, 229 + {"isl68221", raa_dmpvr2_3rail}, 230 + {"isl68222", raa_dmpvr2_2rail}, 231 + {"isl68223", raa_dmpvr2_2rail}, 232 + {"isl68224", raa_dmpvr2_3rail}, 233 + {"isl68225", raa_dmpvr2_2rail}, 234 + {"isl68226", raa_dmpvr2_3rail}, 235 + {"isl68227", raa_dmpvr2_1rail}, 236 + {"isl68229", raa_dmpvr2_3rail}, 237 + {"isl68233", raa_dmpvr2_2rail}, 238 + {"isl68239", raa_dmpvr2_3rail}, 239 + 240 + {"isl69222", raa_dmpvr2_2rail}, 241 + {"isl69223", raa_dmpvr2_3rail}, 242 + {"isl69224", raa_dmpvr2_2rail}, 243 + {"isl69225", raa_dmpvr2_2rail}, 244 + {"isl69227", raa_dmpvr2_3rail}, 245 + {"isl69228", raa_dmpvr2_3rail}, 246 + {"isl69234", raa_dmpvr2_2rail}, 247 + {"isl69236", raa_dmpvr2_2rail}, 248 + {"isl69239", raa_dmpvr2_3rail}, 249 + {"isl69242", raa_dmpvr2_2rail}, 250 + {"isl69243", raa_dmpvr2_1rail}, 251 + {"isl69247", raa_dmpvr2_2rail}, 252 + {"isl69248", raa_dmpvr2_2rail}, 253 + {"isl69254", raa_dmpvr2_2rail}, 254 + {"isl69255", raa_dmpvr2_2rail}, 255 + {"isl69256", raa_dmpvr2_2rail}, 256 + {"isl69259", raa_dmpvr2_2rail}, 257 + {"isl69260", raa_dmpvr2_2rail}, 258 + {"isl69268", raa_dmpvr2_2rail}, 259 + {"isl69269", raa_dmpvr2_3rail}, 260 + {"isl69298", raa_dmpvr2_2rail}, 261 + 262 + {"raa228000", raa_dmpvr2_hv}, 263 + {"raa228004", raa_dmpvr2_hv}, 264 + {"raa228006", raa_dmpvr2_hv}, 265 + {"raa228228", raa_dmpvr2_2rail}, 266 + {"raa229001", raa_dmpvr2_2rail}, 267 + {"raa229004", raa_dmpvr2_2rail}, 274 268 {} 275 269 }; 276 270