From: Chanh Nguyen <chanh@os.amperecomputing.com>
To: Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Justin Ledford <justinledford@google.com>,
devicetree@vger.kernel.org, linux-hwmon@vger.kernel.org,
linux-kernel@vger.kernel.org,
OpenBMC Maillist <openbmc@lists.ozlabs.org>,
Open Source Submission <patches@amperecomputing.com>
Cc: Phong Vo <phong@os.amperecomputing.com>,
Thang Nguyen <thang@os.amperecomputing.com>,
Quan Nguyen <quan@os.amperecomputing.com>,
Chanh Nguyen <chanh@os.amperecomputing.com>
Subject: [PATCH 2/3] hwmon: (max31790): Support config PWM output becomes TACH
Date: Mon, 11 Mar 2024 18:13:46 +0700 [thread overview]
Message-ID: <20240311111347.23067-3-chanh@os.amperecomputing.com> (raw)
In-Reply-To: <20240311111347.23067-1-chanh@os.amperecomputing.com>
PWMOUT pins on MAX31790 can be configured as a tachometer input pin by
setting bit[0] in the Configuration Register. When the bit[0] of a channel
is set, the PWMOUT pin becomes the tach input pin for the channel plus six.
This commit allows the kernel to set those pins when necessary if the
pwmout-pin-as-tach-input DT property exists.
Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com>
---
drivers/hwmon/max31790.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c
index 3dc95196b229..33ca8d1721c0 100644
--- a/drivers/hwmon/max31790.c
+++ b/drivers/hwmon/max31790.c
@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/module.h>
+#include <linux/property.h>
#include <linux/slab.h>
/* MAX31790 registers */
@@ -506,9 +507,12 @@ static int max31790_probe(struct i2c_client *client)
{
struct i2c_adapter *adapter = client->adapter;
struct device *dev = &client->dev;
+ u8 pwmout_to_tach[NR_CHANNEL];
struct max31790_data *data;
struct device *hwmon_dev;
int err;
+ u8 tmp;
+ int i;
if (!i2c_check_functionality(adapter,
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))
@@ -528,6 +532,33 @@ static int max31790_probe(struct i2c_client *client)
if (err)
return err;
+ if (device_property_present(dev, "pwmout-pin-as-tach-input")) {
+ err = device_property_read_u8_array(dev, "pwmout-pin-as-tach-input",
+ pwmout_to_tach, NR_CHANNEL);
+ if (err) {
+ /* The pwmout-pin-as-tach-input is an array of six values */
+ dev_warn(dev, "The pwmout-pin-as-tach-input property exist but malform");
+ } else {
+ for (i = 0; i < NR_CHANNEL; i++) {
+ tmp = data->fan_config[i];
+ if (pwmout_to_tach[i])
+ data->fan_config[i] |= MAX31790_FAN_CFG_TACH_INPUT;
+ else
+ data->fan_config[i] &= ~(MAX31790_FAN_CFG_TACH_INPUT);
+
+ if (tmp != data->fan_config[i]) {
+ err = i2c_smbus_write_byte_data(client,
+ MAX31790_REG_FAN_CONFIG(i),
+ data->fan_config[i]);
+ if (err < 0)
+ dev_warn(dev,
+ "Fail to apply fan configuration at channel %d",
+ i);
+ }
+ }
+ }
+ }
+
hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
data,
&max31790_chip_info,
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Chanh Nguyen <chanh@os.amperecomputing.com>
To: Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Justin Ledford <justinledford@google.com>,
devicetree@vger.kernel.org, linux-hwmon@vger.kernel.org,
linux-kernel@vger.kernel.org,
OpenBMC Maillist <openbmc@lists.ozlabs.org>,
Open Source Submission <patches@amperecomputing.com>
Cc: Chanh Nguyen <chanh@os.amperecomputing.com>,
Thang Nguyen <thang@os.amperecomputing.com>,
Phong Vo <phong@os.amperecomputing.com>,
Quan Nguyen <quan@os.amperecomputing.com>
Subject: [PATCH 2/3] hwmon: (max31790): Support config PWM output becomes TACH
Date: Mon, 11 Mar 2024 18:13:46 +0700 [thread overview]
Message-ID: <20240311111347.23067-3-chanh@os.amperecomputing.com> (raw)
In-Reply-To: <20240311111347.23067-1-chanh@os.amperecomputing.com>
PWMOUT pins on MAX31790 can be configured as a tachometer input pin by
setting bit[0] in the Configuration Register. When the bit[0] of a channel
is set, the PWMOUT pin becomes the tach input pin for the channel plus six.
This commit allows the kernel to set those pins when necessary if the
pwmout-pin-as-tach-input DT property exists.
Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com>
---
drivers/hwmon/max31790.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c
index 3dc95196b229..33ca8d1721c0 100644
--- a/drivers/hwmon/max31790.c
+++ b/drivers/hwmon/max31790.c
@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/module.h>
+#include <linux/property.h>
#include <linux/slab.h>
/* MAX31790 registers */
@@ -506,9 +507,12 @@ static int max31790_probe(struct i2c_client *client)
{
struct i2c_adapter *adapter = client->adapter;
struct device *dev = &client->dev;
+ u8 pwmout_to_tach[NR_CHANNEL];
struct max31790_data *data;
struct device *hwmon_dev;
int err;
+ u8 tmp;
+ int i;
if (!i2c_check_functionality(adapter,
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))
@@ -528,6 +532,33 @@ static int max31790_probe(struct i2c_client *client)
if (err)
return err;
+ if (device_property_present(dev, "pwmout-pin-as-tach-input")) {
+ err = device_property_read_u8_array(dev, "pwmout-pin-as-tach-input",
+ pwmout_to_tach, NR_CHANNEL);
+ if (err) {
+ /* The pwmout-pin-as-tach-input is an array of six values */
+ dev_warn(dev, "The pwmout-pin-as-tach-input property exist but malform");
+ } else {
+ for (i = 0; i < NR_CHANNEL; i++) {
+ tmp = data->fan_config[i];
+ if (pwmout_to_tach[i])
+ data->fan_config[i] |= MAX31790_FAN_CFG_TACH_INPUT;
+ else
+ data->fan_config[i] &= ~(MAX31790_FAN_CFG_TACH_INPUT);
+
+ if (tmp != data->fan_config[i]) {
+ err = i2c_smbus_write_byte_data(client,
+ MAX31790_REG_FAN_CONFIG(i),
+ data->fan_config[i]);
+ if (err < 0)
+ dev_warn(dev,
+ "Fail to apply fan configuration at channel %d",
+ i);
+ }
+ }
+ }
+ }
+
hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
data,
&max31790_chip_info,
--
2.17.1
next prev parent reply other threads:[~2024-03-11 11:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 11:13 [PATCH 0/3] Update the max31790 driver Chanh Nguyen
2024-03-11 11:13 ` Chanh Nguyen
2024-03-11 11:13 ` [PATCH 1/3] dt-bindings: hwmon: Add maxim max31790 driver bindings Chanh Nguyen
2024-03-11 11:13 ` Chanh Nguyen
2024-03-11 16:55 ` Krzysztof Kozlowski
2024-03-18 9:51 ` Chanh Nguyen
2024-03-18 9:51 ` Chanh Nguyen
2024-03-18 10:00 ` Krzysztof Kozlowski
2024-03-22 9:53 ` Chanh Nguyen
2024-03-22 9:53 ` Chanh Nguyen
2024-03-25 8:32 ` Krzysztof Kozlowski
2024-03-26 10:26 ` Chanh Nguyen
2024-03-26 10:26 ` Chanh Nguyen
2024-03-11 11:13 ` Chanh Nguyen [this message]
2024-03-11 11:13 ` [PATCH 2/3] hwmon: (max31790): Support config PWM output becomes TACH Chanh Nguyen
2024-03-11 11:13 ` [PATCH 3/3] dt-bindings: hwmon: max31790: Add pwmout-pin-as-tach-input property Chanh Nguyen
2024-03-11 11:13 ` Chanh Nguyen
2024-03-11 16:56 ` Krzysztof Kozlowski
2024-03-18 9:48 ` Chanh Nguyen
2024-03-18 9:48 ` Chanh Nguyen
2024-03-18 10:02 ` Krzysztof Kozlowski
2024-03-18 16:50 ` Chanh Nguyen
2024-03-18 16:50 ` Chanh Nguyen
2024-03-11 17:34 ` Rob Herring
2024-03-11 17:34 ` Rob Herring
2024-03-11 17:52 ` Guenter Roeck
2024-03-11 17:52 ` Guenter Roeck
2024-03-18 9:54 ` Chanh Nguyen
2024-03-18 9:54 ` Chanh Nguyen
2024-03-18 9:53 ` Chanh Nguyen
2024-03-18 9:53 ` Chanh Nguyen
2024-03-26 10:33 ` Chanh Nguyen
2024-03-26 10:33 ` Chanh Nguyen
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=20240311111347.23067-3-chanh@os.amperecomputing.com \
--to=chanh@os.amperecomputing.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jdelvare@suse.com \
--cc=justinledford@google.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=openbmc@lists.ozlabs.org \
--cc=patches@amperecomputing.com \
--cc=phong@os.amperecomputing.com \
--cc=quan@os.amperecomputing.com \
--cc=robh+dt@kernel.org \
--cc=thang@os.amperecomputing.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.