hwmon: (mlxreg-fan) Extend support for multiply PWM
cover hwmon: (mlxreg-fan) Extend support for multiply PWM
Patch set contains:
Patch #1: Change for PWM connectivity logic validation Patch #2:Adding different names for cooling devices.
Vadim Pasternak (2):
hwmon: (mlxreg-fan) Modify PWM connectivity validation
hwmon: (mlxreg-fan) Support distinctive names per different cooling
devices
drivers/hwmon/mlxreg-fan.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 hwmon: (mlxreg-fan) Modify PWM connectivity validation
Validate PWM connectivity only for additional PWM - "pwm1" is connected on all systems, while "pwm2" - "pwm4" are optional. Validate connectivity only for optional attributes by reading of related "pwm{n}" registers - in case "pwm{n}" is not connected, register value is supposed to be 0xff.
--- drivers/hwmon/mlxreg-fan.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/hwmon/mlxreg-fan.c +8 -3
@@ -488,9 +488,14 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,return -EINVAL ; } - err =mlxreg_pwm_connect_verify (fan, data); -if (err) -return err; +/* Validate if more then one PWM is connected. */ +if (pwm_num) { + err =mlxreg_pwm_connect_verify (fan, data); +if (err <0 ) +return err; +else if (!err) +continue ; + } fan->pwm[pwm_num].reg = data->reg; fan->pwm[pwm_num].connected = true;
Signature · 1 line
2.20.1
Re: [PATCH hwmon-next 1/2] hwmon: (mlxreg-fan) Modify PWM connectivity validation
Quoted 7 lines · Vadim Pasternak
Validate PWM connectivity only for additional PWM - "pwm1" is connected on all systems, while "pwm2" - "pwm4" are optional. Validate connectivity only for optional attributes by reading of related "pwm{n}" registers - in case "pwm{n}" is not connected, register value is supposed to be
0xff.Signed-off-by Vadim Pasternak <[email protected]>
Applied.
Thanks,
Guenter
Quoted 26 lines
--- drivers/hwmon/mlxreg-fan.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/hwmon/mlxreg-fan.c +8
-3@@ -488,9 +488,14 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,return -EINVAL ; } - err =mlxreg_pwm_connect_verify (fan, data); -if (err) -return err; +/* Validate if more then one PWM is connected. */ +if (pwm_num) { + err =mlxreg_pwm_connect_verify (fan, data); +if (err <0 ) +return err; +else if (!err) +continue ; + } fan->pwm[pwm_num].reg = data->reg; fan->pwm[pwm_num].connected = true;
PATCH 2/2 hwmon: (mlxreg-fan) Support distinctive names per different cooling devices
In reply to Vadim PasternakProvide different names for cooling devices registration to allow binding each cooling devices to relevant thermal zone. Thus, specific cooling device can be associated with related thermal sensor by setting thermal cooling device type for example to "mlxreg_fan2" and passing this type to thermal_zone_bind_cooling_device() through 'cdev->type'.
--- drivers/hwmon/mlxreg-fan.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/hwmon/mlxreg-fan.c +9 -2
@@ -263,6 +263,13 @@ mlxreg_fan_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr,return 0 ; } +static char *mlxreg_fan_name[] = { +"mlxreg_fan" , +"mlxreg_fan1" , +"mlxreg_fan2" , +"mlxreg_fan3" , +}; +static const struct hwmon_channel_info *mlxreg_fan_hwmon_info[] = { HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT | HWMON_F_FAULT,
@@ -565,8 +572,8 @@ static int mlxreg_fan_cooling_config(struct device *dev, struct mlxreg_fan *fan)if (!pwm->connected)continue ; pwm->fan = fan; - pwm->cdev =devm_thermal_of_cooling_device_register (dev,NULL ,"mlxreg_fan" , pwm, - &mlxreg_fan_cooling_ops); + pwm->cdev =devm_thermal_of_cooling_device_register (dev,NULL , mlxreg_fan_name[i], + pwm, &mlxreg_fan_cooling_ops);if (IS_ERR (pwm->cdev)) {dev_err (dev,"Failed to register cooling device\n" );return PTR_ERR (pwm->cdev);
Signature · 1 line
2.20.1
Re: [PATCH hwmon-next 2/2] hwmon: (mlxreg-fan) Support distinctive names per different cooling devices
Quoted 7 lines · Vadim Pasternak
Provide different names for cooling devices registration to allow binding each cooling devices to relevant thermal zone. Thus, specific cooling device can be associated with related thermal sensor by setting thermal cooling device type for example to "
mlxreg_fan2" and passing this type tothermal_zone_bind_cooling_device()through 'cdev->type'.Signed-off-by Vadim Pasternak <[email protected]>
Applied.
Thanks,
Guenter
Quoted 33 lines
--- drivers/hwmon/mlxreg-fan.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/hwmon/mlxreg-fan.c +9
-2@@ -263,6 +263,13 @@ mlxreg_fan_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr,return 0 ; } +static char *mlxreg_fan_name[] = { +"mlxreg_fan" , +"mlxreg_fan1" , +"mlxreg_fan2" , +"mlxreg_fan3" , +}; +static const struct hwmon_channel_info *mlxreg_fan_hwmon_info[] = { HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT | HWMON_F_FAULT,@@ -565,8 +572,8 @@ static int mlxreg_fan_cooling_config(struct device *dev, struct mlxreg_fan *fan)if (!pwm->connected)continue ; pwm->fan = fan; - pwm->cdev =devm_thermal_of_cooling_device_register (dev,NULL ,"mlxreg_fan" , pwm, - &mlxreg_fan_cooling_ops); + pwm->cdev =devm_thermal_of_cooling_device_register (dev,NULL , mlxreg_fan_name[i], + pwm, &mlxreg_fan_cooling_ops);if (IS_ERR (pwm->cdev)) {dev_err (dev,"Failed to register cooling device\n" );return PTR_ERR (pwm->cdev);