This small series implements the optional regulator support for the
pwm-fan driver.
Changes in V3:
- simplify error case in probing code
- return regulator error code in pm callbacks
Changes in V2:
- address Guenter's comments:
- handle error case first
- drop ENOSYS handling
- implement more consistent bail out handling
- enable regulator before setup PWM
- make sure we disable regulator if probe fails
Stefan Wahren (2):
dt-bindings: hwmon: Add optional regulator support to pwm-fan
hwmon: pwm-fan: Add optional regulator support
.../devicetree/bindings/hwmon/pwm-fan.txt | 3 ++
drivers/hwmon/pwm-fan.c | 43 +++++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
--
2.7.4
This adds an optional regulator support (e.g. switchable supply) to the
pwm fan binding.
Signed-off-by: Stefan Wahren <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
Documentation/devicetree/bindings/hwmon/pwm-fan.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt
index c6d5332..49ca5d8 100644
--- a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt
+++ b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@ -6,6 +6,9 @@ Required properties:
- cooling-levels : PWM duty cycle values in a range from 0 to 255
which correspond to thermal cooling states
+Optional properties:
+- fan-supply : phandle to the regulator that provides power to the fan
+
Example:
fan0: pwm-fan {
compatible = "pwm-fan";
--
2.7.4
This adds optional regulator support to the pwm-fan driver. This is
necessary for pwm fans which are powered by a switchable supply.
Signed-off-by: Stefan Wahren <[email protected]>
---
drivers/hwmon/pwm-fan.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index 2c94482..167221c 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -23,6 +23,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pwm.h>
+#include <linux/regulator/consumer.h>
#include <linux/sysfs.h>
#include <linux/thermal.h>
@@ -31,6 +32,7 @@
struct pwm_fan_ctx {
struct mutex lock;
struct pwm_device *pwm;
+ struct regulator *reg_en;
unsigned int pwm_value;
unsigned int pwm_fan_state;
unsigned int pwm_fan_max_state;
@@ -231,6 +233,21 @@ static int pwm_fan_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ctx);
+ ctx->reg_en = devm_regulator_get_optional(&pdev->dev, "fan");
+ if (IS_ERR(ctx->reg_en)) {
+ if (PTR_ERR(ctx->reg_en) != -ENODEV)
+ return PTR_ERR(ctx->reg_en);
+
+ ctx->reg_en = NULL;
+ } else {
+ ret = regulator_enable(ctx->reg_en);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to enable fan supply: %d\n", ret);
+ return ret;
+ }
+ }
+
ctx->pwm_value = MAX_PWM;
/* Set duty cycle to maximum allowed and enable PWM output */
@@ -241,7 +258,7 @@ static int pwm_fan_probe(struct platform_device *pdev)
ret = pwm_apply_state(ctx->pwm, &state);
if (ret) {
dev_err(&pdev->dev, "Failed to configure PWM\n");
- return ret;
+ goto err_reg_disable;
}
hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, "pwmfan",
@@ -277,6 +294,10 @@ static int pwm_fan_probe(struct platform_device *pdev)
state.enabled = false;
pwm_apply_state(ctx->pwm, &state);
+err_reg_disable:
+ if (ctx->reg_en)
+ regulator_disable(ctx->reg_en);
+
return ret;
}
@@ -287,6 +308,10 @@ static int pwm_fan_remove(struct platform_device *pdev)
thermal_cooling_device_unregister(ctx->cdev);
if (ctx->pwm_value)
pwm_disable(ctx->pwm);
+
+ if (ctx->reg_en)
+ regulator_disable(ctx->reg_en);
+
return 0;
}
@@ -307,6 +332,14 @@ static int pwm_fan_suspend(struct device *dev)
pwm_disable(ctx->pwm);
}
+ if (ctx->reg_en) {
+ ret = regulator_disable(ctx->reg_en);
+ if (ret) {
+ dev_err(dev, "Failed to disable fan supply: %d\n", ret);
+ return ret;
+ }
+ }
+
return 0;
}
@@ -317,6 +350,14 @@ static int pwm_fan_resume(struct device *dev)
unsigned long duty;
int ret;
+ if (ctx->reg_en) {
+ ret = regulator_enable(ctx->reg_en);
+ if (ret) {
+ dev_err(dev, "Failed to enable fan supply: %d\n", ret);
+ return ret;
+ }
+ }
+
if (ctx->pwm_value == 0)
return 0;
--
2.7.4
On Fri, Feb 22, 2019 at 02:45:23PM +0100, Stefan Wahren wrote:
> This adds an optional regulator support (e.g. switchable supply) to the
> pwm fan binding.
>
> Signed-off-by: Stefan Wahren <[email protected]>
> Reviewed-by: Rob Herring <[email protected]>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Documentation/devicetree/bindings/hwmon/pwm-fan.txt | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt
> index c6d5332..49ca5d8 100644
> --- a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt
> +++ b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt
> @@ -6,6 +6,9 @@ Required properties:
> - cooling-levels : PWM duty cycle values in a range from 0 to 255
> which correspond to thermal cooling states
>
> +Optional properties:
> +- fan-supply : phandle to the regulator that provides power to the fan
> +
> Example:
> fan0: pwm-fan {
> compatible = "pwm-fan";
On Fri, Feb 22, 2019 at 02:45:24PM +0100, Stefan Wahren wrote:
> This adds optional regulator support to the pwm-fan driver. This is
> necessary for pwm fans which are powered by a switchable supply.
>
> Signed-off-by: Stefan Wahren <[email protected]>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> drivers/hwmon/pwm-fan.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 42 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
> index 2c94482..167221c 100644
> --- a/drivers/hwmon/pwm-fan.c
> +++ b/drivers/hwmon/pwm-fan.c
> @@ -23,6 +23,7 @@
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/pwm.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/sysfs.h>
> #include <linux/thermal.h>
>
> @@ -31,6 +32,7 @@
> struct pwm_fan_ctx {
> struct mutex lock;
> struct pwm_device *pwm;
> + struct regulator *reg_en;
> unsigned int pwm_value;
> unsigned int pwm_fan_state;
> unsigned int pwm_fan_max_state;
> @@ -231,6 +233,21 @@ static int pwm_fan_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, ctx);
>
> + ctx->reg_en = devm_regulator_get_optional(&pdev->dev, "fan");
> + if (IS_ERR(ctx->reg_en)) {
> + if (PTR_ERR(ctx->reg_en) != -ENODEV)
> + return PTR_ERR(ctx->reg_en);
> +
> + ctx->reg_en = NULL;
> + } else {
> + ret = regulator_enable(ctx->reg_en);
> + if (ret) {
> + dev_err(&pdev->dev,
> + "Failed to enable fan supply: %d\n", ret);
> + return ret;
> + }
> + }
> +
> ctx->pwm_value = MAX_PWM;
>
> /* Set duty cycle to maximum allowed and enable PWM output */
> @@ -241,7 +258,7 @@ static int pwm_fan_probe(struct platform_device *pdev)
> ret = pwm_apply_state(ctx->pwm, &state);
> if (ret) {
> dev_err(&pdev->dev, "Failed to configure PWM\n");
> - return ret;
> + goto err_reg_disable;
> }
>
> hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, "pwmfan",
> @@ -277,6 +294,10 @@ static int pwm_fan_probe(struct platform_device *pdev)
> state.enabled = false;
> pwm_apply_state(ctx->pwm, &state);
>
> +err_reg_disable:
> + if (ctx->reg_en)
> + regulator_disable(ctx->reg_en);
> +
> return ret;
> }
>
> @@ -287,6 +308,10 @@ static int pwm_fan_remove(struct platform_device *pdev)
> thermal_cooling_device_unregister(ctx->cdev);
> if (ctx->pwm_value)
> pwm_disable(ctx->pwm);
> +
> + if (ctx->reg_en)
> + regulator_disable(ctx->reg_en);
> +
> return 0;
> }
>
> @@ -307,6 +332,14 @@ static int pwm_fan_suspend(struct device *dev)
> pwm_disable(ctx->pwm);
> }
>
> + if (ctx->reg_en) {
> + ret = regulator_disable(ctx->reg_en);
> + if (ret) {
> + dev_err(dev, "Failed to disable fan supply: %d\n", ret);
> + return ret;
> + }
> + }
> +
> return 0;
> }
>
> @@ -317,6 +350,14 @@ static int pwm_fan_resume(struct device *dev)
> unsigned long duty;
> int ret;
>
> + if (ctx->reg_en) {
> + ret = regulator_enable(ctx->reg_en);
> + if (ret) {
> + dev_err(dev, "Failed to enable fan supply: %d\n", ret);
> + return ret;
> + }
> + }
> +
> if (ctx->pwm_value == 0)
> return 0;
>