hwmon: (nct6683) Support NCT6687D.
Subsystems (2)
PATCH 1/1 hwmon: (nct6683) Support NCT6687D.
This is found on many MSI motherboards.
Signed-off-by David Bartley <[email protected]>
--- Documentation/hwmon/nct6683.rst | 3 ++- drivers/hwmon/nct6683.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
Documentation/hwmon/nct6683.rst +2 -1
@@ -3,7 +3,7 @@ Kernel driver nct6683 Supported chips: - * Nuvoton NCT6683D + * Nuvoton NCT6683D/NCT6687D Prefix: 'nct6683'
@@ -61,4 +61,5 @@ Board Firmware version Intel DH87RL NCT6683D EC firmware version 1.0 build 04/03/13 Intel DH87MC NCT6683D EC firmware version 1.0 build 04/03/13 Intel DB85FL NCT6683D EC firmware version 1.0 build 04/03/13 +MSI B550 N/A =============== ===============================================
drivers/hwmon/nct6683.c +7 -0
@@ -63,6 +63,7 @@ static const char * const nct6683_chip_names[] = {#define SIO_NCT6681_ID 0xb270/* for later */ #define SIO_NCT6683_ID 0xc730 +#define SIO_NCT6687_ID 0xd590#define SIO_ID_MASK 0xFFF0 static inline void
@@ -164,6 +165,7 @@ superio_exit(int ioreg)#define NCT6683_REG_CUSTOMER_ID 0x602#define NCT6683_CUSTOMER_ID_INTEL 0x805#define NCT6683_CUSTOMER_ID_MITAC 0xa0e +#define NCT6683_CUSTOMER_ID_MSI 0x201#define NCT6683_REG_BUILD_YEAR 0x604#define NCT6683_REG_BUILD_MONTH 0x605
@@ -1218,6 +1220,8 @@ static int nct6683_probe(struct platform_device *pdev)break ;case NCT6683_CUSTOMER_ID_MITAC :break ; +case NCT6683_CUSTOMER_ID_MSI : +break ;default :if (!force)return -ENODEV ;
@@ -1352,6 +1356,9 @@ static int __init nct6683_find(int sioaddr, struct nct6683_sio_data *sio_data)case SIO_NCT6683_ID : sio_data->kind = nct6683;break ; +case SIO_NCT6687_ID : + sio_data->kind = nct6683; +break ;default :if (val !=0xffff )pr_debug ("unsupported chip ID: 0x%04x\n" , val);
Signature · 1 line
2.27.0
Guenter Roeck
maintainerQuoted 22 lines · David Bartley
This is found on many MSI motherboards.
Signed-off-by David Bartley <[email protected]>--- Documentation/hwmon/nct6683.rst | 3 ++- drivers/hwmon/nct6683.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-)Documentation/hwmon/nct6683.rst +1
-1@@ -3,7 +3,7 @@ Kernel driver nct6683 Supported chips: - * Nuvoton NCT6683D + * Nuvoton NCT6683D/NCT6687D Prefix: 'nct6683'
Documentation/hwmon/nct6683.rst Board Firmware version · line 64
Quoted 4 lines
Documentation/hwmon/nct6683.rst +1
-0@@ -61,4 +61,5 @@ Board Firmware version Intel DH87RL NCT6683D EC firmware version 1.0 build 04/03/13 Intel DH87MC NCT6683D EC firmware version 1.0 build 04/03/13 Intel DB85FL NCT6683D EC firmware version 1.0 build 04/03/13 +MSI B550 N/A
NCT6687D
Quoted 31 lines
Documentation/hwmon/nct6683.rst +0
-0=============== ===============================================drivers/hwmon/nct6683.c +4
-0@@ -63,6 +63,7 @@ static const char * const nct6683_chip_names[] = {#define SIO_NCT6681_ID 0xb270/* for later */ #define SIO_NCT6683_ID 0xc730 +#define SIO_NCT6687_ID 0xd590#define SIO_ID_MASK 0xFFF0 static inline void@@ -164,6 +165,7 @@ superio_exit(int ioreg)#define NCT6683_REG_CUSTOMER_ID 0x602#define NCT6683_CUSTOMER_ID_INTEL 0x805#define NCT6683_CUSTOMER_ID_MITAC 0xa0e +#define NCT6683_CUSTOMER_ID_MSI 0x201#define NCT6683_REG_BUILD_YEAR 0x604#define NCT6683_REG_BUILD_MONTH 0x605@@ -1218,6 +1220,8 @@ static int nct6683_probe(struct platform_device *pdev)break ;case NCT6683_CUSTOMER_ID_MITAC :break ; +case NCT6683_CUSTOMER_ID_MSI : +break ;default :if (!force)return -ENODEV ;
drivers/hwmon/nct6683.c static int __init nct6683_find(int sioaddr, struct nct6683_sio_data *sio_data) · line 1361
Quoted 6 lines
drivers/hwmon/nct6683.c +3
-0@@ -1352,6 +1356,9 @@ static int __init nct6683_find(int sioaddr, struct nct6683_sio_data *sio_data)case SIO_NCT6683_ID : sio_data->kind = nct6683;break ; +case SIO_NCT6687_ID : + sio_data->kind = nct6683; +break ;
There should be a separate kind (in enum kinds). Also, the description in the header should be updated to indicate nct6687 and list the number of supported sensors. nct6683_device_names[] and nct6683_chip_names[] should also be updated.
Quoted 6 lines
drivers/hwmon/nct6683.c +0
-0default :if (val !=0xffff )pr_debug ("unsupported chip ID: 0x%04x\n" , val);Signature · 1 line
2.27.0