From: Antheas Kapenekakis <lkml@antheas.dev>
To: linux-hwmon@vger.kernel.org
Cc: linux-doc@vger.kernel.org, linux-pm@vger.kernel.org,
Guenter Roeck <linux@roeck-us.net>,
Jean Delvare <jdelvare@suse.com>,
Jonathan Corbet <corbet@lwn.net>,
Joaquin Ignacio Aramendia <samsagax@gmail.com>,
Derek J Clark <derekjohn.clark@gmail.com>,
Kevin Greenberg <kdgreenberg234@protonmail.com>,
Joshua Tam <csinaction@pm.me>,
Parth Menon <parthasarathymenon@gmail.com>,
Eileen <eileen@one-netbook.com>,
Antheas Kapenekakis <lkml@antheas.dev>
Subject: [PATCH 10/10] hwmon: (oxp-sensors) Adhere to sysfs-class-hwmon and enable pwm on 2
Date: Thu, 26 Dec 2024 12:27:40 +0100 [thread overview]
Message-ID: <20241226112740.340804-11-lkml@antheas.dev> (raw)
In-Reply-To: <20241226112740.340804-1-lkml@antheas.dev>
Currently, the driver does not adhere to the sysfs-class-hwmon
specification: 0 is used for auto fan control and 1 is used for manual
control. However, it is expected that 0 sets the fan to full speed,
1 sets the fan to manual, and then 2 is used for automatic control.
Therefore, change the sysfs API to reflect this and enable pwm on 2.
As we are breaking the ABI for this driver, rename oxpec to oxp_ec,
reflecting the naming convention used by other drivers, to allow for
a smooth migration in current userspace programs.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 37 +++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 97bf51eba741..2ea9029ac287 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -927,7 +927,27 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_pwm_input:
return oxp_pwm_input_read(val);
case hwmon_pwm_enable:
- return oxp_pwm_read(val);
+ ret = oxp_pwm_read(val);
+ if (ret)
+ return ret;
+
+ /* Check for auto and return 2 */
+ if (!*val) {
+ *val = 2;
+ return 0;
+ }
+
+ /* Return 0 if at full fan speed, 1 otherwise */
+ ret = oxp_pwm_fan_speed(val);
+ if (ret)
+ return ret;
+
+ if (*val == 255)
+ *val = 0;
+ else
+ *val = 1;
+
+ return 0;
default:
break;
}
@@ -941,15 +961,24 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
static int oxp_platform_write(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long val)
{
+ int ret;
+
switch (type) {
case hwmon_pwm:
switch (attr) {
case hwmon_pwm_enable:
if (val == 1)
return oxp_pwm_enable();
- else if (val == 0)
+ else if (val == 2)
return oxp_pwm_disable();
- return -EINVAL;
+ else if (val != 0)
+ return -EINVAL;
+
+ /* Enable PWM and set to max speed */
+ ret = oxp_pwm_enable();
+ if (ret)
+ return ret;
+ return oxp_pwm_input_write(255);
case hwmon_pwm_input:
return oxp_pwm_input_write(val);
default:
@@ -1014,7 +1043,7 @@ static int oxp_platform_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device *hwdev;
- hwdev = devm_hwmon_device_register_with_info(dev, "oxpec", NULL,
+ hwdev = devm_hwmon_device_register_with_info(dev, "oxp_ec", NULL,
&oxp_ec_chip_info, NULL);
return PTR_ERR_OR_ZERO(hwdev);
--
2.47.1
next prev parent reply other threads:[~2024-12-26 11:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 01/10] hwmon: (oxp-sensors) Distinguish the X1 variants Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 02/10] hwmon: (oxp-sensors) Add all OneXFly variants Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 03/10] ABI: testing: sysfs-class-power: add BypassS0 charge_type Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer Antheas Kapenekakis
2025-01-07 17:15 ` Guenter Roeck
2025-01-07 17:19 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 05/10] hwmon: (oxp-sensors) Rename ec group to tt_toggle Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 06/10] hwmon: (oxp-sensors) Add turbo led support to X1 devices Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 07/10] hwmon: (oxp-sensors) Move pwm_enable read to its own function Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 08/10] hwmon: (oxp-sensors) Move pwm value read/write to separate functions Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 09/10] hwmon: (oxp-sensors) Move fan speed read to separate function Antheas Kapenekakis
2024-12-26 11:27 ` Antheas Kapenekakis [this message]
2024-12-26 21:08 ` [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Guenter Roeck
2024-12-26 21:16 ` Derek J. Clark
2024-12-26 21:59 ` Antheas Kapenekakis
2024-12-27 17:12 ` Guenter Roeck
2025-01-04 15:37 ` Antheas Kapenekakis
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=20241226112740.340804-11-lkml@antheas.dev \
--to=lkml@antheas.dev \
--cc=corbet@lwn.net \
--cc=csinaction@pm.me \
--cc=derekjohn.clark@gmail.com \
--cc=eileen@one-netbook.com \
--cc=jdelvare@suse.com \
--cc=kdgreenberg234@protonmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=parthasarathymenon@gmail.com \
--cc=samsagax@gmail.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.