linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Eddie James <eajames@linux.ibm.com>
Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org,
	jdelvare@suse.com, bjwyman@gmail.com
Subject: Re: [PATCH 2/3] hwmon: (pmbus/ibm-cffps) Add the VMON property for version 2
Date: Sat, 4 Jan 2020 08:28:10 -0800	[thread overview]
Message-ID: <20200104162810.GA30243@roeck-us.net> (raw)
In-Reply-To: <1576788607-13567-3-git-send-email-eajames@linux.ibm.com>

On Thu, Dec 19, 2019 at 02:50:06PM -0600, Eddie James wrote:
> Version 2 of the PSU supports reading an auxiliary voltage. Use the
> pmbus VMON property and associated virtual register to read it.
> 
> Signed-off-by: Eddie James <eajames@linux.ibm.com>

I assume you are ok with v1 reading (or trying to read) this voltage.

Applied to hwmon-next.

> ---
>  drivers/hwmon/pmbus/ibm-cffps.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
> index a564be9..b37faf1 100644
> --- a/drivers/hwmon/pmbus/ibm-cffps.c
> +++ b/drivers/hwmon/pmbus/ibm-cffps.c
> @@ -28,6 +28,7 @@
>  #define CFFPS1_FW_NUM_BYTES			4
>  #define CFFPS2_FW_NUM_WORDS			3
>  #define CFFPS_SYS_CONFIG_CMD			0xDA
> +#define CFFPS_12VCS_VOUT_CMD			0xDE
>  
>  #define CFFPS_INPUT_HISTORY_CMD			0xD6
>  #define CFFPS_INPUT_HISTORY_SIZE		100
> @@ -350,6 +351,9 @@ static int ibm_cffps_read_word_data(struct i2c_client *client, int page,
>  		if (mfr & CFFPS_MFR_PS_KILL)
>  			rc |= PB_STATUS_OFF;
>  		break;
> +	case PMBUS_VIRT_READ_VMON:
> +		rc = pmbus_read_word_data(client, page, CFFPS_12VCS_VOUT_CMD);
> +		break;
>  	default:
>  		rc = -ENODATA;
>  		break;
> @@ -453,7 +457,7 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
>  			PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
>  			PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
>  			PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
> -			PMBUS_HAVE_STATUS_FAN12,
> +			PMBUS_HAVE_STATUS_FAN12 | PMBUS_HAVE_VMON,
>  		.func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
>  			PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
>  			PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT,

  reply	other threads:[~2020-01-04 16:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-19 20:50 [PATCH 0/3] hwmon: (pmbus/ibm-cffps) New debugfs entries, VMON, and LED fix Eddie James
2019-12-19 20:50 ` [PATCH 1/3] hwmon: (pmbus/ibm-cffps) Add new manufacturer debugfs entries Eddie James
2020-01-04 16:26   ` Guenter Roeck
2020-01-06 15:32     ` Eddie James
2019-12-19 20:50 ` [PATCH 2/3] hwmon: (pmbus/ibm-cffps) Add the VMON property for version 2 Eddie James
2020-01-04 16:28   ` Guenter Roeck [this message]
2020-01-04 16:29     ` Guenter Roeck
2019-12-19 20:50 ` [PATCH 3/3] hwmon: (pmbus/ibm-cffps) Fix the LED behavior when turned off Eddie James
2020-01-04 16:30   ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200104162810.GA30243@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=bjwyman@gmail.com \
    --cc=eajames@linux.ibm.com \
    --cc=jdelvare@suse.com \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).