Miroirs/nct6687d
1
0
Fork 0
mirror of https://github.com/Fred78290/nct6687d synced 2024-11-16 07:48:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #80 from SergeyMy/main

Browse source 
backport kernel-6.6-rc7
This commit is contained in:
Frederic BOLTZ 2023-10-30 09:47:58 +01:00 committed by GitHub
commit 6761c42cfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
nct6687.c
View file

@ -84,11 +84,12 @@ static const char *const nct6687_chip_names[] = {
#define SIO_REG_ENABLE 0x30 /* Logical device enable */
#define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
#define SIO_NCT6683D_ID 0xc732
#define SIO_NCT6686_ID 0xd440
#define SIO_NCT6686D_ID 0xd441
#define SIO_NCT6687_ID 0xd451 // 0xd592
#define SIO_NCT6687D_ID 0xd592
#define SIO_NCT6681_ID 0xb270 /* for later */
#define SIO_NCT6683_ID 0xc730
#define SIO_NCT6686_ID 0xd440
#define SIO_NCT6687D_ID 0xd450 /* NCT6687 ???*/
#define SIO_NCT6687_ID 0xd590
#define SIO_ID_MASK 0xFFF0
static inline void superio_outb(int ioreg, int reg, int val)
{
@ -1100,20 +1101,26 @@ static int __init nct6687_find(int sioaddr, struct nct6687_sio_data *sio_data)
pr_debug("found chip ID: 0x%04x\n", val);
if (val == SIO_NCT6683D_ID) {
sio_data->kind = nct6683;
} else if (val == SIO_NCT6686_ID || val == SIO_NCT6686D_ID) {
sio_data->kind = nct6686;
} else if (val == SIO_NCT6687_ID || val == SIO_NCT6687D_ID || force)
{
sio_data->kind = nct6687;
}
else
{
if (val != 0xffff)
pr_debug("unsupported chip ID: 0x%04x\n", val);
goto fail;
}
switch (val & SIO_ID_MASK) {
case SIO_NCT6683_ID:
sio_data->kind = nct6683;
break;
case SIO_NCT6686_ID:
sio_data->kind = nct6686;
break;
case SIO_NCT6687D_ID:
case SIO_NCT6687_ID:
sio_data->kind = nct6687;
break;
default:
if (force){
sio_data->kind = nct6687;
break;
}
if (val != 0xffff)
pr_debug("unsupported chip ID: 0x%04x\n", val);
goto fail;
}
/* We have a known chip, find the HWM I/O address */
superio_select(sioaddr, NCT6687_LD_HWM);