ich777/nct6687d
1
0
Fork 0
mirror of https://github.com/Fred78290/nct6687d.git synced 2025-07-23 07:03:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

backport kernel-6.6-rc7

Browse Source 
Signed-off-by: SergeyMy <virtual@ufasp.ru>
This commit is contained in:
SergeyMy
2023-10-27 20:07:49 +05:00
parent cdfe855342
commit be4509e2db
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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