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

Commit 5da556e3 authored by Hans de Goede's avatar Hans de Goede Committed by Jean Delvare
Browse files

hwmon: (f71882fg) Add support for the F71869A 



The F71869A is almost the same as the F71869F/E, except that it has
the normal number of temp and pwm zones for a F71882FG derived chip,
rather then the limited number of the F71869F/E.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarMax Baldwin <archerseven@gmail.com>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 7958e3b4

Documentation/hwmon/f71882fg

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ Supported chips: 
    Prefix: 'f71869'

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Available from the Fintek website

  * Fintek F71869A

    Prefix: 'f71869a'

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Not public

  * Fintek F71882FG and F71883FG

    Prefix: 'f71882fg'

    Addresses scanned: none, address read from Super I/O config space

drivers/hwmon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ config SENSORS_F71882FG 
	    F71858FG

	    F71862FG

	    F71863FG

	    F71869F/E

	    F71869F/E/A

	    F71882FG

	    F71883FG

	    F71889FG/ED/A

drivers/hwmon/f71882fg.c

+15 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#define SIO_F71858_ID		0x0507  /* Chipset ID */

#define SIO_F71862_ID		0x0601	/* Chipset ID */

#define SIO_F71869_ID		0x0814	/* Chipset ID */

#define SIO_F71869A_ID		0x1007	/* Chipset ID */

#define SIO_F71882_ID		0x0541	/* Chipset ID */

#define SIO_F71889_ID		0x0723	/* Chipset ID */

#define SIO_F71889E_ID		0x0909	/* Chipset ID */
@@ -108,8 +109,8 @@ static unsigned short force_id; 
module_param(force_id, ushort, 0);

MODULE_PARM_DESC(force_id, "Override the detected device ID");



enum chips { f71808e, f71808a, f71858fg, f71862fg, f71869, f71882fg, f71889fg,

	     f71889ed, f71889a, f8000, f81865f };

enum chips { f71808e, f71808a, f71858fg, f71862fg, f71869, f71869a, f71882fg,

	     f71889fg, f71889ed, f71889a, f8000, f81865f };



static const char *f71882fg_names[] = {

	"f71808e",
@@ -117,6 +118,7 @@ static const char *f71882fg_names[] = { 
	"f71858fg",

	"f71862fg",

	"f71869", /* Both f71869f and f71869e, reg. compatible and same id */

	"f71869a",

	"f71882fg",

	"f71889fg", /* f81801u too, same id */

	"f71889ed",
@@ -131,6 +133,7 @@ static const char f71882fg_has_in[][F71882FG_MAX_INS] = { 
	[f71858fg]	= { 1, 1, 1, 0, 0, 0, 0, 0, 0 },

	[f71862fg]	= { 1, 1, 1, 1, 1, 1, 1, 1, 1 },

	[f71869]	= { 1, 1, 1, 1, 1, 1, 1, 1, 1 },

	[f71869a]	= { 1, 1, 1, 1, 1, 1, 1, 1, 1 },

	[f71882fg]	= { 1, 1, 1, 1, 1, 1, 1, 1, 1 },

	[f71889fg]	= { 1, 1, 1, 1, 1, 1, 1, 1, 1 },

	[f71889ed]	= { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
@@ -145,6 +148,7 @@ static const char f71882fg_has_in1_alarm[] = { 
	[f71858fg]	= 0,

	[f71862fg]	= 0,

	[f71869]	= 0,

	[f71869a]	= 0,

	[f71882fg]	= 1,

	[f71889fg]	= 1,

	[f71889ed]	= 1,
@@ -159,6 +163,7 @@ static const char f71882fg_fan_has_beep[] = { 
	[f71858fg]	= 0,

	[f71862fg]	= 1,

	[f71869]	= 1,

	[f71869a]	= 1,

	[f71882fg]	= 1,

	[f71889fg]	= 1,

	[f71889ed]	= 1,
@@ -173,6 +178,7 @@ static const char f71882fg_nr_fans[] = { 
	[f71858fg]	= 3,

	[f71862fg]	= 3,

	[f71869]	= 3,

	[f71869a]	= 3,

	[f71882fg]	= 4,

	[f71889fg]	= 3,

	[f71889ed]	= 3,
@@ -187,6 +193,7 @@ static const char f71882fg_temp_has_beep[] = { 
	[f71858fg]	= 0,

	[f71862fg]	= 1,

	[f71869]	= 1,

	[f71869a]	= 1,

	[f71882fg]	= 1,

	[f71889fg]	= 1,

	[f71889ed]	= 1,
@@ -201,6 +208,7 @@ static const char f71882fg_nr_temps[] = { 
	[f71858fg]	= 3,

	[f71862fg]	= 3,

	[f71869]	= 3,

	[f71869a]	= 3,

	[f71882fg]	= 3,

	[f71889fg]	= 3,

	[f71889ed]	= 3,
@@ -2243,6 +2251,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) 
		case f71808e:

		case f71808a:

		case f71869:

		case f71869a:

			/* These always have signed auto point temps */

			data->auto_point_temp_signed = 1;

			/* Fall through to select correct fan/pwm reg bank! */
@@ -2305,6 +2314,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) 
		case f71808e:

		case f71808a:

		case f71869:

		case f71869a:

		case f71889fg:

		case f71889ed:

		case f71889a:
@@ -2528,6 +2538,9 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, 
	case SIO_F71869_ID:

		sio_data->type = f71869;

		break;

	case SIO_F71869A_ID:

		sio_data->type = f71869a;

		break;

	case SIO_F71882_ID:

		sio_data->type = f71882fg;

		break;