raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2026-01-05 02:37:41 +00:00
Code Issues Projects Releases Wiki Activity

platform/x86: oxpec: Adhere to sysfs-class-hwmon and enable pwm on 2

Browse Source 
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.

Closes: https://lore.kernel.org/linux-hwmon/20241027174836.8588-1-derekjohn.clark@gmail.com/
Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>
Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
Link: https://lore.kernel.org/r/20250425111821.88746-12-lkml@antheas.dev
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Antheas Kapenekakis
2025-04-25 13:18:16 +02:00
committed by Ilpo Järvinen
parent 665fab3381
commit 36a65fa84a
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/platform/x86/oxpec.c
View File

@@ -732,7 +732,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;
}
@@ -746,15 +766,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:
@@ -819,7 +848,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);