Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c7fd30d authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (nct6775) Expand scope of supported chips 



NCT6775, NCT6776, and NCT6779 have a number of variants with the same
chip ID but different chip labels. Add text "or compatible" to the
message displayed when the driver is loaded and rephrase the Kconfig
entry to reflect that it also supports compatible chips.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent c81cc5a4

Documentation/hwmon/nct6775

+4 −4
Original line number Diff line number Diff line
@@ -8,15 +8,15 @@ Kernel driver NCT6775 
=====================



Supported chips:

  * Nuvoton NCT6775F/W83667HG-I

  * Nuvoton NCT5572D/NCT6771F/NCT6772F/NCT6775F/W83677HG-I

    Prefix: 'nct6775'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT6776F

  * Nuvoton NCT5577D/NCT6776D/NCT6776F

    Prefix: 'nct6776'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT6779D

  * Nuvoton NCT5532D/NCT6779D

    Prefix: 'nct6779'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request
@@ -28,7 +28,7 @@ Description 
-----------



This driver implements support for the Nuvoton NCT6775F, NCT6776F, and NCT6779D

super I/O chips.

and compatible super I/O chips.



The chips support up to 25 temperature monitoring sources. Up to 6 of those are

direct temperature sensor inputs, the others are special sources such as PECI,

drivers/hwmon/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -908,14 +908,14 @@ config SENSORS_MCP3021 
	  will be called mcp3021.



config SENSORS_NCT6775

	tristate "Nuvoton NCT6775F, NCT6776F, NCT6779D"

	tristate "Nuvoton NCT6775F and compatibles"

	depends on !PPC

	select HWMON_VID

	help

	  If you say yes here you get support for the hardware monitoring

	  functionality of the Nuvoton NCT6775F, NCT6776F, and NCT6779D

	  Super-I/O chips. This driver replaces the w83627ehf driver for

	  NCT6775F and NCT6776F.

	  functionality of the Nuvoton NCT6775F, NCT6776F, NCT6779D

	  and compatible Super-I/O chips. This driver replaces the

	  w83627ehf driver for NCT6775F and NCT6776F.



	  This driver can also be built as a module.  If so, the module

	  will be called nct6775.

drivers/hwmon/nct6775.c

+8 −9
Original line number Diff line number Diff line
@@ -4072,16 +4072,17 @@ static struct platform_driver nct6775_driver = { 
	.remove		= nct6775_remove,

};



static const char *nct6775_sio_names[] __initconst = {

	"NCT6775F",

	"NCT6776D/F",

	"NCT6779D",

};



/* nct6775_find() looks for a '627 in the Super-I/O config space */

static int __init nct6775_find(int sioaddr, unsigned short *addr,

			       struct nct6775_sio_data *sio_data)

{

	static const char sio_name_NCT6775[] __initconst = "NCT6775F";

	static const char sio_name_NCT6776[] __initconst = "NCT6776F";

	static const char sio_name_NCT6779[] __initconst = "NCT6779D";



	u16 val;

	const char *sio_name;

	int err;



	err = superio_enter(sioaddr);
@@ -4096,15 +4097,12 @@ static int __init nct6775_find(int sioaddr, unsigned short *addr, 
	switch (val & SIO_ID_MASK) {

	case SIO_NCT6775_ID:

		sio_data->kind = nct6775;

		sio_name = sio_name_NCT6775;

		break;

	case SIO_NCT6776_ID:

		sio_data->kind = nct6776;

		sio_name = sio_name_NCT6776;

		break;

	case SIO_NCT6779_ID:

		sio_data->kind = nct6779;

		sio_name = sio_name_NCT6779;

		break;

	default:

		if (val != 0xffff)
@@ -4132,7 +4130,8 @@ static int __init nct6775_find(int sioaddr, unsigned short *addr, 
	}



	superio_exit(sioaddr);

	pr_info("Found %s chip at %#x\n", sio_name, *addr);

	pr_info("Found %s or compatible chip at %#x\n",

		nct6775_sio_names[sio_data->kind], *addr);

	sio_data->sioreg = sioaddr;



	return 0;