Commit 3ab52160 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Guenter Roeck
Browse files

hwmon: (ibmpowernv) introduce a legacy_compatibles array 



Today, the type of a PowerNV sensor system is determined with the
"compatible" property for legacy Firmwares and with the "sensor-type"
for newer ones. The same array of strings is used for both to do the
matching and this raises some issue to introduce new sensor types.

Let's introduce two different arrays (legacy and current) to make
things easier for new sensor types.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Tested-by: default avatarShilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 677252a1

drivers/hwmon/ibmpowernv.c

+18 −8
Original line number Diff line number Diff line
@@ -55,17 +55,27 @@ enum sensors { 


#define INVALID_INDEX (-1U)



/*

 * 'compatible' string properties for sensor types as defined in old

 * PowerNV firmware (skiboot). These are ordered as 'enum sensors'.

 */

static const char * const legacy_compatibles[] = {

	"ibm,opal-sensor-cooling-fan",

	"ibm,opal-sensor-amb-temp",

	"ibm,opal-sensor-power-supply",

	"ibm,opal-sensor-power"

};



static struct sensor_group {

	const char *name;

	const char *compatible;

	const char *name; /* matches property 'sensor-type' */

	struct attribute_group group;

	u32 attr_count;

	u32 hwmon_index;

} sensor_groups[] = {

	{"fan", "ibm,opal-sensor-cooling-fan"},

	{"temp", "ibm,opal-sensor-amb-temp"},

	{"in", "ibm,opal-sensor-power-supply"},

	{"power", "ibm,opal-sensor-power"}

	{ "fan"   },

	{ "temp"  },

	{ "in"    },

	{ "power" }

};



struct sensor_data {
@@ -239,8 +249,8 @@ static int get_sensor_type(struct device_node *np) 
	enum sensors type;

	const char *str;



	for (type = 0; type < MAX_SENSOR_TYPE; type++) {

		if (of_device_is_compatible(np, sensor_groups[type].compatible))

	for (type = 0; type < ARRAY_SIZE(legacy_compatibles); type++) {

		if (of_device_is_compatible(np, legacy_compatibles[type]))

			return type;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE