linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] hwmon: gsc-hwmon: add fan sensor
@ 2020-08-27 20:04 Tim Harvey
  0 siblings, 0 replies; 2+ messages in thread
From: Tim Harvey @ 2020-08-27 20:04 UTC (permalink / raw)
  To: Jean Delvare, Guenter Roeck
  Cc: Robert Jones, linux-hwmon, linux-kernel, Tim Harvey

Add a fan sensor to report RPM's from a fan tach input.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
--
v2:
 - avoid unnecessary line split and fix opening brace location
---
 drivers/hwmon/gsc-hwmon.c               | 32 +++++++++++++++++++++++++++++---
 include/linux/platform_data/gsc_hwmon.h |  1 +
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/drivers/hwmon/gsc-hwmon.c b/drivers/hwmon/gsc-hwmon.c
index c6d4567..1fe3741 100644
--- a/drivers/hwmon/gsc-hwmon.c
+++ b/drivers/hwmon/gsc-hwmon.c
@@ -17,6 +17,7 @@
 
 #define GSC_HWMON_MAX_TEMP_CH	16
 #define GSC_HWMON_MAX_IN_CH	16
+#define GSC_HWMON_MAX_FAN_CH	16
 
 #define GSC_HWMON_RESOLUTION	12
 #define GSC_HWMON_VREF		2500
@@ -27,11 +28,14 @@ struct gsc_hwmon_data {
 	struct regmap *regmap;
 	const struct gsc_hwmon_channel *temp_ch[GSC_HWMON_MAX_TEMP_CH];
 	const struct gsc_hwmon_channel *in_ch[GSC_HWMON_MAX_IN_CH];
+	const struct gsc_hwmon_channel *fan_ch[GSC_HWMON_MAX_FAN_CH];
 	u32 temp_config[GSC_HWMON_MAX_TEMP_CH + 1];
 	u32 in_config[GSC_HWMON_MAX_IN_CH + 1];
+	u32 fan_config[GSC_HWMON_MAX_FAN_CH + 1];
 	struct hwmon_channel_info temp_info;
 	struct hwmon_channel_info in_info;
-	const struct hwmon_channel_info *info[3];
+	struct hwmon_channel_info fan_info;
+	const struct hwmon_channel_info *info[4];
 	struct hwmon_chip_info chip;
 };
 
@@ -155,6 +159,9 @@ gsc_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
 	case hwmon_temp:
 		ch = hwmon->temp_ch[channel];
 		break;
+	case hwmon_fan:
+		ch = hwmon->fan_ch[channel];
+		break;
 	default:
 		return -EOPNOTSUPP;
 	}
@@ -187,6 +194,9 @@ gsc_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
 		/* adjust by uV offset */
 		tmp += ch->mvoffset;
 		break;
+	case mode_fan:
+		tmp *= 30; /* convert to revolutions per minute */
+		break;
 	case mode_voltage_24bit:
 	case mode_voltage_16bit:
 		/* no adjustment needed */
@@ -211,6 +221,9 @@ gsc_hwmon_read_string(struct device *dev, enum hwmon_sensor_types type,
 	case hwmon_temp:
 		*buf = hwmon->temp_ch[channel]->name;
 		break;
+	case hwmon_fan:
+		*buf = hwmon->fan_ch[channel]->name;
+		break;
 	default:
 		return -ENOTSUPP;
 	}
@@ -304,7 +317,7 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
 	struct gsc_hwmon_platform_data *pdata = dev_get_platdata(dev);
 	struct gsc_hwmon_data *hwmon;
 	const struct attribute_group **groups;
-	int i, i_in, i_temp;
+	int i, i_in, i_temp, i_fan;
 
 	if (!pdata) {
 		pdata = gsc_hwmon_get_devtree_pdata(dev);
@@ -324,7 +337,7 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
 	if (IS_ERR(hwmon->regmap))
 		return PTR_ERR(hwmon->regmap);
 
-	for (i = 0, i_in = 0, i_temp = 0; i < hwmon->pdata->nchannels; i++) {
+	for (i = 0, i_in = 0, i_temp = 0, i_fan = 0; i < hwmon->pdata->nchannels; i++) {
 		const struct gsc_hwmon_channel *ch = &pdata->channels[i];
 
 		switch (ch->mode) {
@@ -338,6 +351,16 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
 						     HWMON_T_LABEL;
 			i_temp++;
 			break;
+		case mode_fan:
+			if (i_fan == GSC_HWMON_MAX_FAN_CH) {
+				dev_err(gsc->dev, "too many fan channels\n");
+				return -EINVAL;
+			}
+			hwmon->fan_ch[i_fan] = ch;
+			hwmon->fan_config[i_fan] = HWMON_F_INPUT |
+						   HWMON_F_LABEL;
+			i_fan++;
+			break;
 		case mode_voltage_24bit:
 		case mode_voltage_16bit:
 		case mode_voltage_raw:
@@ -361,10 +384,13 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
 	hwmon->chip.info = hwmon->info;
 	hwmon->info[0] = &hwmon->temp_info;
 	hwmon->info[1] = &hwmon->in_info;
+	hwmon->info[2] = &hwmon->fan_info;
 	hwmon->temp_info.type = hwmon_temp;
 	hwmon->temp_info.config = hwmon->temp_config;
 	hwmon->in_info.type = hwmon_in;
 	hwmon->in_info.config = hwmon->in_config;
+	hwmon->fan_info.type = hwmon_fan;
+	hwmon->fan_info.config = hwmon->fan_config;
 
 	groups = pdata->fan_base ? gsc_hwmon_groups : NULL;
 	hwmon_dev = devm_hwmon_device_register_with_info(dev,
diff --git a/include/linux/platform_data/gsc_hwmon.h b/include/linux/platform_data/gsc_hwmon.h
index 37a8f554d..281f499 100644
--- a/include/linux/platform_data/gsc_hwmon.h
+++ b/include/linux/platform_data/gsc_hwmon.h
@@ -7,6 +7,7 @@ enum gsc_hwmon_mode {
 	mode_voltage_24bit,
 	mode_voltage_raw,
 	mode_voltage_16bit,
+	mode_fan,
 	mode_max,
 };
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH v2] hwmon: gsc-hwmon: add fan sensor
@ 2020-08-30 15:11 Guenter Roeck
  0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2020-08-30 15:11 UTC (permalink / raw)
  To: Tim Harvey; +Cc: Jean Delvare, Robert Jones, linux-hwmon, linux-kernel

On Thu, Aug 27, 2020 at 01:04:54PM -0700, Tim Harvey wrote:
> Add a fan sensor to report RPM's from a fan tach input.
> 
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>

Applied.

Thanks,
Guenter

> --

Note there is a '-' missing here, causing the version history to be added
to the commit log. I dropped that.

> v2:
>  - avoid unnecessary line split and fix opening brace location
> ---
>  drivers/hwmon/gsc-hwmon.c               | 32 +++++++++++++++++++++++++++++---
>  include/linux/platform_data/gsc_hwmon.h |  1 +
>  2 files changed, 30 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hwmon/gsc-hwmon.c b/drivers/hwmon/gsc-hwmon.c
> index c6d4567..1fe3741 100644
> --- a/drivers/hwmon/gsc-hwmon.c
> +++ b/drivers/hwmon/gsc-hwmon.c
> @@ -17,6 +17,7 @@
>  
>  #define GSC_HWMON_MAX_TEMP_CH	16
>  #define GSC_HWMON_MAX_IN_CH	16
> +#define GSC_HWMON_MAX_FAN_CH	16
>  
>  #define GSC_HWMON_RESOLUTION	12
>  #define GSC_HWMON_VREF		2500
> @@ -27,11 +28,14 @@ struct gsc_hwmon_data {
>  	struct regmap *regmap;
>  	const struct gsc_hwmon_channel *temp_ch[GSC_HWMON_MAX_TEMP_CH];
>  	const struct gsc_hwmon_channel *in_ch[GSC_HWMON_MAX_IN_CH];
> +	const struct gsc_hwmon_channel *fan_ch[GSC_HWMON_MAX_FAN_CH];
>  	u32 temp_config[GSC_HWMON_MAX_TEMP_CH + 1];
>  	u32 in_config[GSC_HWMON_MAX_IN_CH + 1];
> +	u32 fan_config[GSC_HWMON_MAX_FAN_CH + 1];
>  	struct hwmon_channel_info temp_info;
>  	struct hwmon_channel_info in_info;
> -	const struct hwmon_channel_info *info[3];
> +	struct hwmon_channel_info fan_info;
> +	const struct hwmon_channel_info *info[4];
>  	struct hwmon_chip_info chip;
>  };
>  
> @@ -155,6 +159,9 @@ gsc_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
>  	case hwmon_temp:
>  		ch = hwmon->temp_ch[channel];
>  		break;
> +	case hwmon_fan:
> +		ch = hwmon->fan_ch[channel];
> +		break;
>  	default:
>  		return -EOPNOTSUPP;
>  	}
> @@ -187,6 +194,9 @@ gsc_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
>  		/* adjust by uV offset */
>  		tmp += ch->mvoffset;
>  		break;
> +	case mode_fan:
> +		tmp *= 30; /* convert to revolutions per minute */
> +		break;
>  	case mode_voltage_24bit:
>  	case mode_voltage_16bit:
>  		/* no adjustment needed */
> @@ -211,6 +221,9 @@ gsc_hwmon_read_string(struct device *dev, enum hwmon_sensor_types type,
>  	case hwmon_temp:
>  		*buf = hwmon->temp_ch[channel]->name;
>  		break;
> +	case hwmon_fan:
> +		*buf = hwmon->fan_ch[channel]->name;
> +		break;
>  	default:
>  		return -ENOTSUPP;
>  	}
> @@ -304,7 +317,7 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
>  	struct gsc_hwmon_platform_data *pdata = dev_get_platdata(dev);
>  	struct gsc_hwmon_data *hwmon;
>  	const struct attribute_group **groups;
> -	int i, i_in, i_temp;
> +	int i, i_in, i_temp, i_fan;
>  
>  	if (!pdata) {
>  		pdata = gsc_hwmon_get_devtree_pdata(dev);
> @@ -324,7 +337,7 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
>  	if (IS_ERR(hwmon->regmap))
>  		return PTR_ERR(hwmon->regmap);
>  
> -	for (i = 0, i_in = 0, i_temp = 0; i < hwmon->pdata->nchannels; i++) {
> +	for (i = 0, i_in = 0, i_temp = 0, i_fan = 0; i < hwmon->pdata->nchannels; i++) {
>  		const struct gsc_hwmon_channel *ch = &pdata->channels[i];
>  
>  		switch (ch->mode) {
> @@ -338,6 +351,16 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
>  						     HWMON_T_LABEL;
>  			i_temp++;
>  			break;
> +		case mode_fan:
> +			if (i_fan == GSC_HWMON_MAX_FAN_CH) {
> +				dev_err(gsc->dev, "too many fan channels\n");
> +				return -EINVAL;
> +			}
> +			hwmon->fan_ch[i_fan] = ch;
> +			hwmon->fan_config[i_fan] = HWMON_F_INPUT |
> +						   HWMON_F_LABEL;
> +			i_fan++;
> +			break;
>  		case mode_voltage_24bit:
>  		case mode_voltage_16bit:
>  		case mode_voltage_raw:
> @@ -361,10 +384,13 @@ static int gsc_hwmon_probe(struct platform_device *pdev)
>  	hwmon->chip.info = hwmon->info;
>  	hwmon->info[0] = &hwmon->temp_info;
>  	hwmon->info[1] = &hwmon->in_info;
> +	hwmon->info[2] = &hwmon->fan_info;
>  	hwmon->temp_info.type = hwmon_temp;
>  	hwmon->temp_info.config = hwmon->temp_config;
>  	hwmon->in_info.type = hwmon_in;
>  	hwmon->in_info.config = hwmon->in_config;
> +	hwmon->fan_info.type = hwmon_fan;
> +	hwmon->fan_info.config = hwmon->fan_config;
>  
>  	groups = pdata->fan_base ? gsc_hwmon_groups : NULL;
>  	hwmon_dev = devm_hwmon_device_register_with_info(dev,
> diff --git a/include/linux/platform_data/gsc_hwmon.h b/include/linux/platform_data/gsc_hwmon.h
> index 37a8f554d..281f499 100644
> --- a/include/linux/platform_data/gsc_hwmon.h
> +++ b/include/linux/platform_data/gsc_hwmon.h
> @@ -7,6 +7,7 @@ enum gsc_hwmon_mode {
>  	mode_voltage_24bit,
>  	mode_voltage_raw,
>  	mode_voltage_16bit,
> +	mode_fan,
>  	mode_max,
>  };
>  
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-30 15:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-27 20:04 [PATCH v2] hwmon: gsc-hwmon: add fan sensor Tim Harvey
2020-08-30 15:11 Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).