Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Sender: Guenter Roeck <groeck7@gmail.com>
Date:   Tue, 26 Jul 2022 06:59:10 -0700
From:   Guenter Roeck <linux@roeck-us.net>
To:     Aleksa Savic <savicaleksa83@gmail.com>
Cc:     linux-hwmon@vger.kernel.org, Jack Doan <me@jackdoan.com>,
        Jean Delvare <jdelvare@suse.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] hwmon: (aquacomputer_d5next) Add support for reading the
 +12V voltage sensor on D5 Next
Message-ID: <20220726133225.GA3021073@roeck-us.net>
References: <20220726120203.33773-1-savicaleksa83@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220726120203.33773-1-savicaleksa83@gmail.com>
Precedence: bulk

On Tue, Jul 26, 2022 at 02:02:03PM +0200, Aleksa Savic wrote:
> Add support for reading the +12V voltage that the D5 Next pump receives.
> 
> Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/aquacomputer_d5next.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomputer_d5next.c
> index 997d72ea6182..738a1df8eae6 100644
> --- a/drivers/hwmon/aquacomputer_d5next.c
> +++ b/drivers/hwmon/aquacomputer_d5next.c
> @@ -71,6 +71,7 @@ static u8 secondary_ctrl_report[] = {
>  #define D5NEXT_PUMP_OFFSET		0x6c
>  #define D5NEXT_FAN_OFFSET		0x5f
>  #define D5NEXT_5V_VOLTAGE		0x39
> +#define D5NEXT_12V_VOLTAGE		0x37
>  #define D5NEXT_CTRL_REPORT_SIZE		0x329
>  static u8 d5next_sensor_fan_offsets[] = { D5NEXT_PUMP_OFFSET, D5NEXT_FAN_OFFSET };
>  
> @@ -114,7 +115,8 @@ static const char *const label_d5next_power[] = {
>  static const char *const label_d5next_voltages[] = {
>  	"Pump voltage",
>  	"Fan voltage",
> -	"+5V voltage"
> +	"+5V voltage",
> +	"+12V voltage"
>  };
>  
>  static const char *const label_d5next_current[] = {
> @@ -340,8 +342,8 @@ static umode_t aqc_is_visible(const void *data, enum hwmon_sensor_types type, u3
>  	case hwmon_in:
>  		switch (priv->kind) {
>  		case d5next:
> -			/* Special case to support voltage sensor */
> -			if (channel < priv->num_fans + 1)
> +			/* Special case to support +5V and +12V voltage sensors */
> +			if (channel < priv->num_fans + 2)
>  				return 0444;
>  			break;
>  		default:
> @@ -574,6 +576,7 @@ static int aqc_raw_event(struct hid_device *hdev, struct hid_report *report, u8
>  	switch (priv->kind) {
>  	case d5next:
>  		priv->voltage_input[2] = get_unaligned_be16(data + D5NEXT_5V_VOLTAGE) * 10;
> +		priv->voltage_input[3] = get_unaligned_be16(data + D5NEXT_12V_VOLTAGE) * 10;
>  		break;
>  	default:
>  		break;