* [PATCH 2/6] hwmon: sparx5: separate temperature reading from sensor dispatch
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
@ 2026-10-13 12:56 ` Robert Marko
2026-10-13 13:02 ` sashiko-bot
2026-10-13 12:56 ` [PATCH 3/6] hwmon: sparx5: add LAN969x fan monitoring support Robert Marko
` (5 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Robert Marko @ 2026-10-13 12:56 UTC (permalink / raw)
To: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel
Cc: luka.perkov, Robert Marko
Move temperature conversion into a helper and dispatch reads by sensor
type. Preserve the existing temperature calculation and error handling
in preparation for adding fan monitoring.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
drivers/hwmon/sparx5-temp.c | 54 +++++++++++++++++++++----------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
index aa91780737446..0fd5c147f8167 100644
--- a/drivers/hwmon/sparx5-temp.c
+++ b/drivers/hwmon/sparx5-temp.c
@@ -37,38 +37,46 @@ static void s5_temp_enable(struct s5_hwmon *hwmon)
writel(val, hwmon->base + TEMP_CFG);
}
+static int s5_read_temp(struct s5_hwmon *hwmon, long *temp)
+{
+ int value;
+ u32 stat;
+
+ stat = readl_relaxed(hwmon->base + TEMP_STAT);
+ if (!(stat & TEMP_STAT_VALID))
+ return -EAGAIN;
+ value = stat & TEMP_STAT_TEMP;
+ /*
+ * From register documentation:
+ * Temp(C) = TEMP_SENSOR_STAT.TEMP / 4096 * 352.2 - 109.4
+ */
+ value = DIV_ROUND_CLOSEST(value * 3522, 4096) - 1094;
+ /*
+ * Scale down by 10 from above and multiply by 1000 to
+ * have millidegrees as specified by the hwmon sysfs
+ * interface.
+ */
+ value *= 100;
+ *temp = value;
+
+ return 0;
+}
+
static int s5_read(struct device *dev, enum hwmon_sensor_types type,
- u32 attr, int channel, long *temp)
+ u32 attr, int channel, long *val)
{
struct s5_hwmon *hwmon = dev_get_drvdata(dev);
- int rc = 0, value;
- u32 stat;
- switch (attr) {
- case hwmon_temp_input:
- stat = readl_relaxed(hwmon->base + TEMP_STAT);
- if (!(stat & TEMP_STAT_VALID))
- return -EAGAIN;
- value = stat & TEMP_STAT_TEMP;
- /*
- * From register documentation:
- * Temp(C) = TEMP_SENSOR_STAT.TEMP / 4096 * 352.2 - 109.4
- */
- value = DIV_ROUND_CLOSEST(value * 3522, 4096) - 1094;
- /*
- * Scale down by 10 from above and multiply by 1000 to
- * have millidegrees as specified by the hwmon sysfs
- * interface.
- */
- value *= 100;
- *temp = value;
+ switch (type) {
+ case hwmon_temp:
+ if (attr == hwmon_temp_input)
+ return s5_read_temp(hwmon, val);
break;
default:
- rc = -EOPNOTSUPP;
break;
}
- return rc;
+ return -EOPNOTSUPP;
}
static umode_t s5_is_visible(const void *_data, enum hwmon_sensor_types type,
--
2.56.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 3/6] hwmon: sparx5: add LAN969x fan monitoring support
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
2026-10-13 12:56 ` [PATCH 2/6] hwmon: sparx5: separate temperature reading from sensor dispatch Robert Marko
@ 2026-10-13 12:56 ` Robert Marko
2026-10-13 13:02 ` sashiko-bot
2026-10-13 12:56 ` [PATCH 4/6] hwmon: sparx5: add LAN969x PWM support Robert Marko
` (4 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Robert Marko @ 2026-10-13 12:56 UTC (permalink / raw)
To: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel
Cc: luka.perkov, Robert Marko
LAN969x contains a tachometer input alongside its Sparx5-compatible
temperature sensor.
Use match data to map and initialize the additional fan controller
register region only for the LAN969x hardware-monitor compatible. Read
the optional pulses-per-revolution property from the fan child and expose
the measured speed through fan1_input.
Leave existing Sparx5 and LAN969x temperature-only device trees
unchanged.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
Documentation/hwmon/sparx5-temp.rst | 8 +++
drivers/hwmon/Kconfig | 7 +-
drivers/hwmon/sparx5-temp.c | 108 +++++++++++++++++++++++++---
3 files changed, 110 insertions(+), 13 deletions(-)
diff --git a/Documentation/hwmon/sparx5-temp.rst b/Documentation/hwmon/sparx5-temp.rst
index 0140809089542..1256d37e1c091 100644
--- a/Documentation/hwmon/sparx5-temp.rst
+++ b/Documentation/hwmon/sparx5-temp.rst
@@ -15,6 +15,9 @@ Supported chips:
Author: Lars Povlsen <lars.povlsen@microchip.com>
+The driver also supports the Microchip LAN969x temperature sensor and fan
+tachometer through the microchip,lan9691-hwmon compatible.
+
Description
-----------
@@ -30,4 +33,9 @@ The following attributes are supported.
======================= ========================================================
temp1_input Die temperature (in millidegree Celsius.)
+fan1_input Fan speed in RPM (LAN969x only).
======================= ========================================================
+
+The tachometer counts pulses over one-second intervals, independently of the
+PWM output. The fan child's pulses-per-revolution property specifies how many
+pulses represent one revolution; it defaults to two.
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 18c682e1a4756..01ac166380905 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -649,11 +649,12 @@ config SENSORS_I5K_AMB
will be called i5k_amb.
config SENSORS_SPARX5
- tristate "Sparx5 SoC temperature sensor"
+ tristate "Sparx5 and LAN969x SoC hardware monitoring"
depends on ARCH_SPARX5 || ARCH_LAN969X || COMPILE_TEST
help
- If you say yes here you get support for temperature monitoring
- with the Microchip Sparx5 SoC.
+ If you say yes here you get support for temperature monitoring on
+ Microchip Sparx5 and LAN969x SoCs, as well as fan monitoring on
+ LAN969x SoCs.
This driver can also be built as a module. If so, the module
will be called sparx5-temp.
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
index 0fd5c147f8167..922c3c33a049a 100644
--- a/drivers/hwmon/sparx5-temp.c
+++ b/drivers/hwmon/sparx5-temp.c
@@ -9,8 +9,11 @@
#include <linux/hwmon.h>
#include <linux/init.h>
#include <linux/io.h>
+#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#define TEMP_CTRL 0
#define TEMP_CFG 4
@@ -20,9 +23,26 @@
#define TEMP_STAT_VALID BIT(12)
#define TEMP_STAT_TEMP GENMASK(11, 0)
+#define FAN_CFG 0
+#define FAN_CFG_GATE_ENA BIT(2)
+#define FAN_CFG_STAT_MODE BIT(0)
+#define FAN_PWM_FREQ 4
+#define FAN_PWM_FREQ_CYCLES GENMASK(27, 16)
+#define FAN_CNT 8
+#define FAN_CNT_DATA GENMASK(15, 0)
+
+#define FAN_TACH_INTERVAL_HZ 100000
+
+struct s5_match_data {
+ bool has_fan;
+};
+
struct s5_hwmon {
void __iomem *base;
+ void __iomem *fan;
struct clk *clk;
+ unsigned long clk_rate;
+ u32 pulses_per_revolution;
};
static void s5_temp_enable(struct s5_hwmon *hwmon)
@@ -37,6 +57,24 @@ static void s5_temp_enable(struct s5_hwmon *hwmon)
writel(val, hwmon->base + TEMP_CFG);
}
+static void s5_fan_enable(struct s5_hwmon *hwmon)
+{
+ u32 cycles, val;
+
+ cycles = DIV_ROUND_CLOSEST(hwmon->clk_rate, FAN_TACH_INTERVAL_HZ);
+ cycles = clamp_val(cycles, 1, FIELD_MAX(FAN_PWM_FREQ_CYCLES));
+
+ val = readl(hwmon->fan + FAN_PWM_FREQ);
+ val &= ~FAN_PWM_FREQ_CYCLES;
+ val |= FIELD_PREP(FAN_PWM_FREQ_CYCLES, cycles);
+ writel(val, hwmon->fan + FAN_PWM_FREQ);
+
+ /* Count all tachometer pulses over one-second intervals. */
+ val = readl(hwmon->fan + FAN_CFG);
+ val &= ~(FAN_CFG_STAT_MODE | FAN_CFG_GATE_ENA);
+ writel(val, hwmon->fan + FAN_CFG);
+}
+
static int s5_read_temp(struct s5_hwmon *hwmon, long *temp)
{
int value;
@@ -62,6 +100,17 @@ static int s5_read_temp(struct s5_hwmon *hwmon, long *temp)
return 0;
}
+static int s5_read_fan(struct s5_hwmon *hwmon, long *val)
+{
+ u32 count;
+
+ count = readl_relaxed(hwmon->fan + FAN_CNT);
+ count = FIELD_GET(FAN_CNT_DATA, count);
+ *val = count * 60 / hwmon->pulses_per_revolution;
+
+ return 0;
+}
+
static int s5_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
@@ -72,6 +121,10 @@ static int s5_read(struct device *dev, enum hwmon_sensor_types type,
if (attr == hwmon_temp_input)
return s5_read_temp(hwmon, val);
break;
+ case hwmon_fan:
+ if (attr == hwmon_fan_input && hwmon->fan)
+ return s5_read_fan(hwmon, val);
+ break;
default:
break;
}
@@ -82,12 +135,15 @@ static int s5_read(struct device *dev, enum hwmon_sensor_types type,
static umode_t s5_is_visible(const void *_data, enum hwmon_sensor_types type,
u32 attr, int channel)
{
- if (type != hwmon_temp)
- return 0;
+ const struct s5_hwmon *hwmon = _data;
- switch (attr) {
- case hwmon_temp_input:
- return 0444;
+ switch (type) {
+ case hwmon_temp:
+ return attr == hwmon_temp_input ? 0444 : 0;
+ case hwmon_fan:
+ if (hwmon->fan && attr == hwmon_fan_input)
+ return 0444;
+ return 0;
default:
return 0;
}
@@ -96,6 +152,7 @@ static umode_t s5_is_visible(const void *_data, enum hwmon_sensor_types type,
static const struct hwmon_channel_info * const s5_info[] = {
HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
+ HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT),
NULL
};
@@ -111,10 +168,15 @@ static const struct hwmon_chip_info s5_chip_info = {
static int s5_temp_probe(struct platform_device *pdev)
{
+ const struct s5_match_data *match_data;
+ struct device *dev = &pdev->dev;
struct device *hwmon_dev;
struct s5_hwmon *hwmon;
+ struct device_node *fan_np __free(device_node) = NULL;
- hwmon = devm_kzalloc(&pdev->dev, sizeof(*hwmon), GFP_KERNEL);
+ match_data = device_get_match_data(dev);
+
+ hwmon = devm_kzalloc(dev, sizeof(*hwmon), GFP_KERNEL);
if (!hwmon)
return -ENOMEM;
@@ -122,14 +184,32 @@ static int s5_temp_probe(struct platform_device *pdev)
if (IS_ERR(hwmon->base))
return PTR_ERR(hwmon->base);
- hwmon->clk = devm_clk_get_enabled(&pdev->dev, NULL);
+ if (match_data && match_data->has_fan) {
+ hwmon->fan = devm_platform_ioremap_resource_byname(pdev, "fan");
+ if (IS_ERR(hwmon->fan))
+ return PTR_ERR(hwmon->fan);
+
+ hwmon->pulses_per_revolution = 2;
+ fan_np = of_get_available_child_by_name(dev->of_node, "fan");
+ if (fan_np)
+ of_property_read_u32(fan_np, "pulses-per-revolution",
+ &hwmon->pulses_per_revolution);
+ if (!hwmon->pulses_per_revolution ||
+ hwmon->pulses_per_revolution > 4)
+ return dev_err_probe(dev, -EINVAL,
+ "invalid pulses-per-revolution\n");
+ }
+
+ hwmon->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(hwmon->clk))
return PTR_ERR(hwmon->clk);
+ hwmon->clk_rate = clk_get_rate(hwmon->clk);
s5_temp_enable(hwmon);
+ if (hwmon->fan)
+ s5_fan_enable(hwmon);
- hwmon_dev = devm_hwmon_device_register_with_info(&pdev->dev,
- "s5_temp",
+ hwmon_dev = devm_hwmon_device_register_with_info(dev, "s5_temp",
hwmon,
&s5_chip_info,
NULL);
@@ -137,7 +217,15 @@ static int s5_temp_probe(struct platform_device *pdev)
return PTR_ERR_OR_ZERO(hwmon_dev);
}
+static const struct s5_match_data lan969x_match_data = {
+ .has_fan = true,
+};
+
static const struct of_device_id s5_temp_match[] = {
+ {
+ .compatible = "microchip,lan9691-hwmon",
+ .data = &lan969x_match_data,
+ },
{ .compatible = "microchip,sparx5-temp" },
{},
};
@@ -154,5 +242,5 @@ static struct platform_driver s5_temp_driver = {
module_platform_driver(s5_temp_driver);
MODULE_AUTHOR("Lars Povlsen <lars.povlsen@microchip.com>");
-MODULE_DESCRIPTION("Sparx5 SoC temperature sensor driver");
+MODULE_DESCRIPTION("Sparx5 SoC hardware monitoring driver");
MODULE_LICENSE("GPL");
--
2.56.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 4/6] hwmon: sparx5: add LAN969x PWM support
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
2026-10-13 12:56 ` [PATCH 2/6] hwmon: sparx5: separate temperature reading from sensor dispatch Robert Marko
2026-10-13 12:56 ` [PATCH 3/6] hwmon: sparx5: add LAN969x fan monitoring support Robert Marko
@ 2026-10-13 12:56 ` Robert Marko
2026-10-13 13:10 ` sashiko-bot
2026-10-13 12:56 ` [PATCH 5/6] hwmon: sparx5: register LAN969x fan as a cooling device Robert Marko
` (3 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Robert Marko @ 2026-10-13 12:56 UTC (permalink / raw)
To: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel
Cc: luka.perkov, Robert Marko
The LAN969x fan controller provides an 8-bit PWM output with a
programmable frequency and polarity.
Expose pwm1 and pwm1_freq, and serialize fan controller register access.
Parse the fan child node's standard PWM specifier and use its period and
polarity flags to configure the hardware.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
Documentation/hwmon/sparx5-temp.rst | 9 ++
drivers/hwmon/Kconfig | 2 +-
drivers/hwmon/sparx5-temp.c | 183 ++++++++++++++++++++++++++--
3 files changed, 184 insertions(+), 10 deletions(-)
diff --git a/Documentation/hwmon/sparx5-temp.rst b/Documentation/hwmon/sparx5-temp.rst
index 1256d37e1c091..a1f8218e68794 100644
--- a/Documentation/hwmon/sparx5-temp.rst
+++ b/Documentation/hwmon/sparx5-temp.rst
@@ -34,8 +34,17 @@ The following attributes are supported.
======================= ========================================================
temp1_input Die temperature (in millidegree Celsius.)
fan1_input Fan speed in RPM (LAN969x only).
+pwm1 PWM duty cycle, from 0 to 255 (LAN969x only).
+pwm1_freq PWM frequency in Hz (LAN969x only).
======================= ========================================================
The tachometer counts pulses over one-second intervals, independently of the
PWM output. The fan child's pulses-per-revolution property specifies how many
pulses represent one revolution; it defaults to two.
+
+On LAN969x, the fan child's pwms property selects the initial PWM period and
+polarity. The output is dedicated to this fan and is not available to external
+PWM consumers. The pwm1 value describes the logical duty cycle independently
+of the output polarity. Frequency requests are rounded to the nearest
+hardware divider value; requests outside the divider range are rejected.
+pwm1_freq reports the resulting frequency.
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 01ac166380905..e0cd6195d5b45 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -653,7 +653,7 @@ config SENSORS_SPARX5
depends on ARCH_SPARX5 || ARCH_LAN969X || COMPILE_TEST
help
If you say yes here you get support for temperature monitoring on
- Microchip Sparx5 and LAN969x SoCs, as well as fan monitoring on
+ Microchip Sparx5 and LAN969x SoCs, as well as the fan controller on
LAN969x SoCs.
This driver can also be built as a module. If so, the module
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
index 922c3c33a049a..5130140e1b579 100644
--- a/drivers/hwmon/sparx5-temp.c
+++ b/drivers/hwmon/sparx5-temp.c
@@ -11,10 +11,13 @@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/mutex.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
+#include <dt-bindings/pwm/pwm.h>
+
#define TEMP_CTRL 0
#define TEMP_CFG 4
#define TEMP_CFG_CYCLES GENMASK(24, 15)
@@ -24,14 +27,18 @@
#define TEMP_STAT_TEMP GENMASK(11, 0)
#define FAN_CFG 0
+#define FAN_CFG_DUTY_CYCLE GENMASK(23, 16)
+#define FAN_CFG_INV_POL BIT(3)
#define FAN_CFG_GATE_ENA BIT(2)
#define FAN_CFG_STAT_MODE BIT(0)
#define FAN_PWM_FREQ 4
#define FAN_PWM_FREQ_CYCLES GENMASK(27, 16)
+#define FAN_PWM_FREQ_DIV GENMASK(15, 0)
#define FAN_CNT 8
#define FAN_CNT_DATA GENMASK(15, 0)
#define FAN_TACH_INTERVAL_HZ 100000
+#define FAN_PWM_FREQ_SCALE 256
struct s5_match_data {
bool has_fan;
@@ -41,8 +48,11 @@ struct s5_hwmon {
void __iomem *base;
void __iomem *fan;
struct clk *clk;
+ struct mutex lock; /* protects fan controller state and registers */
unsigned long clk_rate;
u32 pulses_per_revolution;
+ u32 pwm_frequency;
+ bool pwm_inverted;
};
static void s5_temp_enable(struct s5_hwmon *hwmon)
@@ -71,7 +81,9 @@ static void s5_fan_enable(struct s5_hwmon *hwmon)
/* Count all tachometer pulses over one-second intervals. */
val = readl(hwmon->fan + FAN_CFG);
- val &= ~(FAN_CFG_STAT_MODE | FAN_CFG_GATE_ENA);
+ val &= ~(FAN_CFG_STAT_MODE | FAN_CFG_GATE_ENA | FAN_CFG_INV_POL);
+ if (hwmon->pwm_inverted)
+ val |= FAN_CFG_INV_POL;
writel(val, hwmon->fan + FAN_CFG);
}
@@ -111,6 +123,34 @@ static int s5_read_fan(struct s5_hwmon *hwmon, long *val)
return 0;
}
+static int s5_read_pwm(struct s5_hwmon *hwmon, long *val)
+{
+ u32 data;
+
+ mutex_lock(&hwmon->lock);
+ data = readl_relaxed(hwmon->fan + FAN_CFG);
+ mutex_unlock(&hwmon->lock);
+ *val = FIELD_GET(FAN_CFG_DUTY_CYCLE, data);
+
+ return 0;
+}
+
+static int s5_read_pwm_freq(struct s5_hwmon *hwmon, long *val)
+{
+ unsigned long rate;
+ u32 divider;
+
+ divider = readl_relaxed(hwmon->fan + FAN_PWM_FREQ);
+ divider = FIELD_GET(FAN_PWM_FREQ_DIV, divider);
+ if (!divider)
+ return -ENODATA;
+
+ rate = DIV_ROUND_CLOSEST(hwmon->clk_rate, FAN_PWM_FREQ_SCALE);
+ *val = DIV_ROUND_CLOSEST(rate, divider);
+
+ return 0;
+}
+
static int s5_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
@@ -125,6 +165,18 @@ static int s5_read(struct device *dev, enum hwmon_sensor_types type,
if (attr == hwmon_fan_input && hwmon->fan)
return s5_read_fan(hwmon, val);
break;
+ case hwmon_pwm:
+ if (!hwmon->fan)
+ break;
+ switch (attr) {
+ case hwmon_pwm_input:
+ return s5_read_pwm(hwmon, val);
+ case hwmon_pwm_freq:
+ return s5_read_pwm_freq(hwmon, val);
+ default:
+ break;
+ }
+ break;
default:
break;
}
@@ -132,6 +184,69 @@ static int s5_read(struct device *dev, enum hwmon_sensor_types type,
return -EOPNOTSUPP;
}
+static int s5_write_pwm(struct s5_hwmon *hwmon, long val)
+{
+ u32 data;
+
+ if (val < 0 || val > 255)
+ return -EINVAL;
+
+ mutex_lock(&hwmon->lock);
+
+ data = readl_relaxed(hwmon->fan + FAN_CFG);
+ data &= ~FAN_CFG_DUTY_CYCLE;
+ data |= FIELD_PREP(FAN_CFG_DUTY_CYCLE, val);
+ writel_relaxed(data, hwmon->fan + FAN_CFG);
+
+ mutex_unlock(&hwmon->lock);
+
+ return 0;
+}
+
+static int s5_write_pwm_freq(struct s5_hwmon *hwmon, long val)
+{
+ unsigned long rate, divider;
+ u32 data;
+
+ if (val <= 0)
+ return -EINVAL;
+
+ rate = DIV_ROUND_CLOSEST(hwmon->clk_rate, FAN_PWM_FREQ_SCALE);
+ if (val < DIV_ROUND_CLOSEST(rate, FIELD_MAX(FAN_PWM_FREQ_DIV)) ||
+ val > rate)
+ return -ERANGE;
+
+ divider = DIV_ROUND_CLOSEST(rate, val);
+ divider = min_t(unsigned long, divider, FIELD_MAX(FAN_PWM_FREQ_DIV));
+
+ mutex_lock(&hwmon->lock);
+ data = readl_relaxed(hwmon->fan + FAN_PWM_FREQ);
+ data &= ~FAN_PWM_FREQ_DIV;
+ data |= FIELD_PREP(FAN_PWM_FREQ_DIV, divider);
+ writel_relaxed(data, hwmon->fan + FAN_PWM_FREQ);
+ mutex_unlock(&hwmon->lock);
+
+ return 0;
+}
+
+static int s5_write(struct device *dev, enum hwmon_sensor_types type,
+ u32 attr, int channel, long val)
+{
+ struct s5_hwmon *hwmon = dev_get_drvdata(dev);
+
+ if (type != hwmon_pwm || !hwmon->fan)
+ return -EOPNOTSUPP;
+
+ switch (attr) {
+ case hwmon_pwm_input:
+ return s5_write_pwm(hwmon, val);
+ case hwmon_pwm_freq:
+ return s5_write_pwm_freq(hwmon, val);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
static umode_t s5_is_visible(const void *_data, enum hwmon_sensor_types type,
u32 attr, int channel)
{
@@ -144,6 +259,12 @@ static umode_t s5_is_visible(const void *_data, enum hwmon_sensor_types type,
if (hwmon->fan && attr == hwmon_fan_input)
return 0444;
return 0;
+ case hwmon_pwm:
+ if (!hwmon->fan)
+ return 0;
+ if (attr == hwmon_pwm_input || attr == hwmon_pwm_freq)
+ return 0644;
+ return 0;
default:
return 0;
}
@@ -153,12 +274,14 @@ static const struct hwmon_channel_info * const s5_info[] = {
HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT),
+ HWMON_CHANNEL_INFO(pwm, HWMON_PWM_INPUT | HWMON_PWM_FREQ),
NULL
};
static const struct hwmon_ops s5_hwmon_ops = {
.is_visible = s5_is_visible,
.read = s5_read,
+ .write = s5_write,
};
static const struct hwmon_chip_info s5_chip_info = {
@@ -166,6 +289,40 @@ static const struct hwmon_chip_info s5_chip_info = {
.info = s5_info,
};
+static int s5_get_fan_data(struct device *dev, struct device_node *fan_np,
+ struct s5_hwmon *hwmon)
+{
+ struct of_phandle_args args;
+ int ret;
+
+ ret = of_parse_phandle_with_args(fan_np, "pwms", "#pwm-cells", 0,
+ &args);
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to parse fan PWM\n");
+
+ if (args.np != dev->of_node || args.args_count != 2 || !args.args[0] ||
+ args.args[1] & ~PWM_POLARITY_INVERTED) {
+ of_node_put(args.np);
+ return dev_err_probe(dev, -EINVAL, "invalid fan PWM specifier\n");
+ }
+
+ hwmon->pwm_frequency = DIV_ROUND_CLOSEST(NSEC_PER_SEC, args.args[0]);
+ hwmon->pwm_inverted = args.args[1] & PWM_POLARITY_INVERTED;
+ of_node_put(args.np);
+
+ if (!hwmon->pwm_frequency)
+ return dev_err_probe(dev, -EINVAL, "fan PWM period is too long\n");
+
+ of_property_read_u32(fan_np, "pulses-per-revolution",
+ &hwmon->pulses_per_revolution);
+ if (!hwmon->pulses_per_revolution ||
+ hwmon->pulses_per_revolution > 4)
+ return dev_err_probe(dev, -EINVAL,
+ "invalid pulses-per-revolution\n");
+
+ return 0;
+}
+
static int s5_temp_probe(struct platform_device *pdev)
{
const struct s5_match_data *match_data;
@@ -173,12 +330,14 @@ static int s5_temp_probe(struct platform_device *pdev)
struct device *hwmon_dev;
struct s5_hwmon *hwmon;
struct device_node *fan_np __free(device_node) = NULL;
+ int ret;
match_data = device_get_match_data(dev);
hwmon = devm_kzalloc(dev, sizeof(*hwmon), GFP_KERNEL);
if (!hwmon)
return -ENOMEM;
+ mutex_init(&hwmon->lock);
hwmon->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(hwmon->base))
@@ -191,13 +350,11 @@ static int s5_temp_probe(struct platform_device *pdev)
hwmon->pulses_per_revolution = 2;
fan_np = of_get_available_child_by_name(dev->of_node, "fan");
- if (fan_np)
- of_property_read_u32(fan_np, "pulses-per-revolution",
- &hwmon->pulses_per_revolution);
- if (!hwmon->pulses_per_revolution ||
- hwmon->pulses_per_revolution > 4)
- return dev_err_probe(dev, -EINVAL,
- "invalid pulses-per-revolution\n");
+ if (fan_np) {
+ ret = s5_get_fan_data(dev, fan_np, hwmon);
+ if (ret)
+ return ret;
+ }
}
hwmon->clk = devm_clk_get_enabled(dev, NULL);
@@ -206,9 +363,17 @@ static int s5_temp_probe(struct platform_device *pdev)
hwmon->clk_rate = clk_get_rate(hwmon->clk);
s5_temp_enable(hwmon);
- if (hwmon->fan)
+ if (hwmon->fan) {
s5_fan_enable(hwmon);
+ if (hwmon->pwm_frequency) {
+ ret = s5_write_pwm_freq(hwmon, hwmon->pwm_frequency);
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "invalid fan PWM period\n");
+ }
+ }
+
hwmon_dev = devm_hwmon_device_register_with_info(dev, "s5_temp",
hwmon,
&s5_chip_info,
--
2.56.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 4/6] hwmon: sparx5: add LAN969x PWM support
2026-10-13 12:56 ` [PATCH 4/6] hwmon: sparx5: add LAN969x PWM support Robert Marko
@ 2026-10-13 13:10 ` sashiko-bot
0 siblings, 0 replies; 16+ messages in thread
From: sashiko-bot @ 2026-10-13 13:10 UTC (permalink / raw)
To: Robert Marko, linux-hwmon, devicetree; +Cc: robh, conor+dt
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] hwmon: redundant custom lock violates subsystem locking guidelines
--
commit 28a1c23dcff1b1ead30305d4b8a45894536ca4ec
Author: Robert Marko <robert.marko@sartura.hr>
hwmon: sparx5: add LAN969x PWM support
This commit adds PWM support for the LAN969x fan controller, exposing pwm1
and pwm1_freq attributes. It implements a custom mutex to serialize fan
controller register access and parses standard PWM specifier properties from
the device tree to configure the hardware.
> diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
> index 922c3c33a049a..5130140e1b579 100644
> --- a/drivers/hwmon/sparx5-temp.c
> +++ b/drivers/hwmon/sparx5-temp.c
> @@ -41,8 +48,11 @@ struct s5_hwmon {
> void __iomem *base;
> void __iomem *fan;
> struct clk *clk;
> + struct mutex lock; /* protects fan controller state and registers */
[Severity: Low]
Is this custom mutex necessary?
The hwmon subsystem core already serializes sysfs operations for attributes
registered with the info parameter of devm_hwmon_device_register_with_info()
via its own internal locking in hwmon_attr_show() and hwmon_attr_store().
If follow-up patches in the series introduce a thermal cooling device that
requires serialization against sysfs, the hwmon architectural guidelines
explicitly mandate using the hwmon_lock() and hwmon_unlock() API instead of
a private mutex.
Could this private lock be replaced with the hwmon core locking to avoid
violating the subsystem's API contract?
[ ... ]
> +static int s5_write_pwm_freq(struct s5_hwmon *hwmon, long val)
> +{
> + unsigned long rate, divider;
> + u32 data;
> +
> + if (val <= 0)
> + return -EINVAL;
> +
> + rate = DIV_ROUND_CLOSEST(hwmon->clk_rate, FAN_PWM_FREQ_SCALE);
> + if (val < DIV_ROUND_CLOSEST(rate, FIELD_MAX(FAN_PWM_FREQ_DIV)) ||
> + val > rate)
> + return -ERANGE;
> +
> + divider = DIV_ROUND_CLOSEST(rate, val);
> + divider = min_t(unsigned long, divider, FIELD_MAX(FAN_PWM_FREQ_DIV));
> +
> + mutex_lock(&hwmon->lock);
[Severity: Low]
Since s5_write_pwm_freq() is invoked via sysfs for an info-registered
attribute, the execution is already serialized by the hwmon core. There is
also no concurrency during probe() for this driver.
Does taking hwmon->lock here add redundant locking complexity that can be
safely removed?
> + data = readl_relaxed(hwmon->fan + FAN_PWM_FREQ);
> + data &= ~FAN_PWM_FREQ_DIV;
> + data |= FIELD_PREP(FAN_PWM_FREQ_DIV, divider);
> + writel_relaxed(data, hwmon->fan + FAN_PWM_FREQ);
> + mutex_unlock(&hwmon->lock);
> +
> + return 0;
> +}
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261013125735.1542349-1-robert.marko@sartura.hr?part=4
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 5/6] hwmon: sparx5: register LAN969x fan as a cooling device
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
` (2 preceding siblings ...)
2026-10-13 12:56 ` [PATCH 4/6] hwmon: sparx5: add LAN969x PWM support Robert Marko
@ 2026-10-13 12:56 ` Robert Marko
2026-10-13 13:12 ` sashiko-bot
2026-10-13 12:56 ` [PATCH 6/6] arm64: dts: microchip: lan969x: add fan controller Robert Marko
` (2 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Robert Marko @ 2026-10-13 12:56 UTC (permalink / raw)
To: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel
Cc: luka.perkov, Robert Marko
Allow the LAN969x hardware fan controller to be used by thermal-zone
cooling maps when cooling-levels are provided on the fan child node.
Translate cooling states to PWM duty-cycle values and keep the cooling
state synchronized with direct pwm1 writes. Register the cooling device
against the fan child so thermal references resolve to the correct node.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
Documentation/hwmon/sparx5-temp.rst | 14 +++
drivers/hwmon/sparx5-temp.c | 144 ++++++++++++++++++++++++++--
2 files changed, 150 insertions(+), 8 deletions(-)
diff --git a/Documentation/hwmon/sparx5-temp.rst b/Documentation/hwmon/sparx5-temp.rst
index a1f8218e68794..28f91537fc376 100644
--- a/Documentation/hwmon/sparx5-temp.rst
+++ b/Documentation/hwmon/sparx5-temp.rst
@@ -48,3 +48,17 @@ PWM consumers. The pwm1 value describes the logical duty cycle independently
of the output polarity. Frequency requests are rounded to the nearest
hardware divider value; requests outside the divider range are rejected.
pwm1_freq reports the resulting frequency.
+
+Thermal cooling
+---------------
+
+With device-tree thermal support enabled, the LAN969x fan can also act as a
+thermal cooling device. The fan child's cooling-levels property maps cooling
+states to PWM values from 0 to 255, in ascending order. When cooling levels
+are provided, the driver initially selects the highest level.
+
+Manual pwm1 writes remain available and update the reported cooling state
+to the highest state whose PWM value does not exceed the requested value,
+or state zero if the value is below the first level. Subsequent thermal
+cooling requests can override manual PWM settings. Each cooling request
+programs the exact PWM value associated with the requested state.
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
index 5130140e1b579..3eabcc7946098 100644
--- a/drivers/hwmon/sparx5-temp.c
+++ b/drivers/hwmon/sparx5-temp.c
@@ -15,6 +15,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
+#include <linux/thermal.h>
#include <dt-bindings/pwm/pwm.h>
@@ -53,6 +54,9 @@ struct s5_hwmon {
u32 pulses_per_revolution;
u32 pwm_frequency;
bool pwm_inverted;
+ u32 *cooling_levels;
+ unsigned long cooling_state;
+ unsigned long max_cooling_state;
};
static void s5_temp_enable(struct s5_hwmon *hwmon)
@@ -123,6 +127,20 @@ static int s5_read_fan(struct s5_hwmon *hwmon, long *val)
return 0;
}
+static void s5_update_cooling_state(struct s5_hwmon *hwmon, u32 pwm)
+{
+ unsigned long state;
+
+ if (!hwmon->cooling_levels)
+ return;
+
+ for (state = 0; state < hwmon->max_cooling_state; state++)
+ if (pwm < hwmon->cooling_levels[state + 1])
+ break;
+
+ hwmon->cooling_state = state;
+}
+
static int s5_read_pwm(struct s5_hwmon *hwmon, long *val)
{
u32 data;
@@ -184,19 +202,25 @@ static int s5_read(struct device *dev, enum hwmon_sensor_types type,
return -EOPNOTSUPP;
}
-static int s5_write_pwm(struct s5_hwmon *hwmon, long val)
+/* Caller must hold hwmon->lock. */
+static void s5_set_pwm(struct s5_hwmon *hwmon, u32 pwm)
{
u32 data;
+ data = readl_relaxed(hwmon->fan + FAN_CFG);
+ data &= ~FAN_CFG_DUTY_CYCLE;
+ data |= FIELD_PREP(FAN_CFG_DUTY_CYCLE, pwm);
+ writel_relaxed(data, hwmon->fan + FAN_CFG);
+}
+
+static int s5_write_pwm(struct s5_hwmon *hwmon, long val)
+{
if (val < 0 || val > 255)
return -EINVAL;
mutex_lock(&hwmon->lock);
-
- data = readl_relaxed(hwmon->fan + FAN_CFG);
- data &= ~FAN_CFG_DUTY_CYCLE;
- data |= FIELD_PREP(FAN_CFG_DUTY_CYCLE, val);
- writel_relaxed(data, hwmon->fan + FAN_CFG);
+ s5_set_pwm(hwmon, val);
+ s5_update_cooling_state(hwmon, val);
mutex_unlock(&hwmon->lock);
@@ -289,6 +313,90 @@ static const struct hwmon_chip_info s5_chip_info = {
.info = s5_info,
};
+static int s5_cooling_get_max_state(struct thermal_cooling_device *cdev,
+ unsigned long *state)
+{
+ struct s5_hwmon *hwmon = cdev->devdata;
+
+ *state = hwmon->max_cooling_state;
+
+ return 0;
+}
+
+static int s5_cooling_get_cur_state(struct thermal_cooling_device *cdev,
+ unsigned long *state)
+{
+ struct s5_hwmon *hwmon = cdev->devdata;
+
+ mutex_lock(&hwmon->lock);
+ *state = hwmon->cooling_state;
+ mutex_unlock(&hwmon->lock);
+
+ return 0;
+}
+
+static int s5_cooling_set_cur_state(struct thermal_cooling_device *cdev,
+ unsigned long state)
+{
+ struct s5_hwmon *hwmon = cdev->devdata;
+
+ if (state > hwmon->max_cooling_state)
+ return -EINVAL;
+
+ mutex_lock(&hwmon->lock);
+ s5_set_pwm(hwmon, hwmon->cooling_levels[state]);
+ hwmon->cooling_state = state;
+
+ mutex_unlock(&hwmon->lock);
+
+ return 0;
+}
+
+static const struct thermal_cooling_device_ops s5_cooling_ops = {
+ .get_max_state = s5_cooling_get_max_state,
+ .get_cur_state = s5_cooling_get_cur_state,
+ .set_cur_state = s5_cooling_set_cur_state,
+};
+
+static int s5_get_cooling_data(struct device *dev, struct device_node *fan_np,
+ struct s5_hwmon *hwmon)
+{
+ u32 *levels;
+ int count, i, ret;
+
+ if (!of_property_present(fan_np, "cooling-levels"))
+ return 0;
+
+ count = of_property_count_u32_elems(fan_np, "cooling-levels");
+ if (count <= 0)
+ return dev_err_probe(dev, count ? : -EINVAL,
+ "invalid cooling-levels property\n");
+
+ levels = devm_kcalloc(dev, count, sizeof(*levels), GFP_KERNEL);
+ if (!levels)
+ return -ENOMEM;
+ hwmon->cooling_levels = levels;
+
+ ret = of_property_read_u32_array(fan_np, "cooling-levels",
+ hwmon->cooling_levels, count);
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "failed to read cooling-levels\n");
+
+ for (i = 0; i < count; i++) {
+ if (hwmon->cooling_levels[i] > 255)
+ return dev_err_probe(dev, -EINVAL,
+ "cooling level %d exceeds 255\n", i);
+ if (i && hwmon->cooling_levels[i] < hwmon->cooling_levels[i - 1])
+ return dev_err_probe(dev, -EINVAL,
+ "cooling levels must be ascending\n");
+ }
+
+ hwmon->max_cooling_state = count - 1;
+
+ return 0;
+}
+
static int s5_get_fan_data(struct device *dev, struct device_node *fan_np,
struct s5_hwmon *hwmon)
{
@@ -320,16 +428,18 @@ static int s5_get_fan_data(struct device *dev, struct device_node *fan_np,
return dev_err_probe(dev, -EINVAL,
"invalid pulses-per-revolution\n");
- return 0;
+ return s5_get_cooling_data(dev, fan_np, hwmon);
}
static int s5_temp_probe(struct platform_device *pdev)
{
const struct s5_match_data *match_data;
+ struct thermal_cooling_device *cdev;
struct device *dev = &pdev->dev;
struct device *hwmon_dev;
struct s5_hwmon *hwmon;
struct device_node *fan_np __free(device_node) = NULL;
+ u32 initial_pwm;
int ret;
match_data = device_get_match_data(dev);
@@ -372,14 +482,32 @@ static int s5_temp_probe(struct platform_device *pdev)
return dev_err_probe(dev, ret,
"invalid fan PWM period\n");
}
+
+ if (hwmon->cooling_levels) {
+ initial_pwm = hwmon->cooling_levels[hwmon->max_cooling_state];
+ ret = s5_write_pwm(hwmon, initial_pwm);
+ if (ret)
+ return ret;
+ }
}
hwmon_dev = devm_hwmon_device_register_with_info(dev, "s5_temp",
hwmon,
&s5_chip_info,
NULL);
+ if (IS_ERR(hwmon_dev))
+ return PTR_ERR(hwmon_dev);
+
+ if (IS_ENABLED(CONFIG_THERMAL_OF) && hwmon->cooling_levels) {
+ cdev = devm_thermal_of_child_cooling_device_register(dev, fan_np,
+ "lan969x-fan", hwmon,
+ &s5_cooling_ops);
+ if (IS_ERR(cdev))
+ return dev_err_probe(dev, PTR_ERR(cdev),
+ "failed to register cooling device\n");
+ }
- return PTR_ERR_OR_ZERO(hwmon_dev);
+ return 0;
}
static const struct s5_match_data lan969x_match_data = {
--
2.56.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 6/6] arm64: dts: microchip: lan969x: add fan controller
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
` (3 preceding siblings ...)
2026-10-13 12:56 ` [PATCH 5/6] hwmon: sparx5: register LAN969x fan as a cooling device Robert Marko
@ 2026-10-13 12:56 ` Robert Marko
2026-10-13 13:03 ` sashiko-bot
2026-10-13 13:03 ` [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x " sashiko-bot
2026-10-13 16:30 ` Conor Dooley
6 siblings, 1 reply; 16+ messages in thread
From: Robert Marko @ 2026-10-13 12:56 UTC (permalink / raw)
To: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel
Cc: luka.perkov, Robert Marko
LAN969x provides a PWM fan output and tachometer input in the DEVCPU_GCB
target. Add the fan controller register region to the hardware-monitor
node and use the combined LAN969x hwmon compatible. Declare two PWM cells
for the period and standard polarity flags.
Board-specific fan configuration and pin routing remain in the individual
board device trees.
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
arch/arm64/boot/dts/microchip/lan9691.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/microchip/lan9691.dtsi b/arch/arm64/boot/dts/microchip/lan9691.dtsi
index 52c22dd1a15d5..cf98b35912245 100644
--- a/arch/arm64/boot/dts/microchip/lan9691.dtsi
+++ b/arch/arm64/boot/dts/microchip/lan9691.dtsi
@@ -523,9 +523,11 @@ sgpio_out: gpio@1 {
};
tmon: hwmon@e2020100 {
- compatible = "microchip,lan9691-temp", "microchip,sparx5-temp";
- reg = <0xe2020100 0xc>;
+ compatible = "microchip,lan9691-hwmon", "microchip,sparx5-temp";
+ reg = <0xe2020100 0xc>, <0xe2010348 0xc>;
+ reg-names = "temp", "fan";
clocks = <&fx100_clk>;
+ #pwm-cells = <2>;
#thermal-sensor-cells = <0>;
};
--
2.56.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
` (4 preceding siblings ...)
2026-10-13 12:56 ` [PATCH 6/6] arm64: dts: microchip: lan969x: add fan controller Robert Marko
@ 2026-10-13 13:03 ` sashiko-bot
2026-10-13 16:30 ` Conor Dooley
6 siblings, 0 replies; 16+ messages in thread
From: sashiko-bot @ 2026-10-13 13:03 UTC (permalink / raw)
To: Robert Marko, linux-hwmon
> LAN969x integrates a PWM fan controller with a tachometer input in
> addition to the Sparx5-compatible temperature sensor. Add a LAN969x
> hardware-monitor compatible and describe the second register region.
>
> Describe the fan as a child node using a two-cell PWM specifier for the
> period and standard polarity flags. The child also carries the optional
> tachometer pulses-per-revolution and thermal cooling properties.
>
> Keep the existing microchip,lan9691-temp compatible for device tree ABI
> compatibility.
>
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Sashiko has reviewed this patch and found no issues. It looks great!
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261013125735.1542349-1-robert.marko@sartura.hr?part=1
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller
2026-10-13 12:56 [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller Robert Marko
` (5 preceding siblings ...)
2026-10-13 13:03 ` [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x " sashiko-bot
@ 2026-10-13 16:30 ` Conor Dooley
2026-10-13 16:38 ` Conor Dooley
2026-10-13 17:08 ` Robert Marko
6 siblings, 2 replies; 16+ messages in thread
From: Conor Dooley @ 2026-10-13 16:30 UTC (permalink / raw)
To: Robert Marko
Cc: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel,
luka.perkov
[-- Attachment #1: Type: text/plain, Size: 4598 bytes --]
On Tue, Oct 13, 2026 at 02:56:25PM +0200, Robert Marko wrote:
> LAN969x integrates a PWM fan controller with a tachometer input in
> addition to the Sparx5-compatible temperature sensor. Add a LAN969x
> hardware-monitor compatible and describe the second register region.
>
> Describe the fan as a child node using a two-cell PWM specifier for the
> period and standard polarity flags. The child also carries the optional
> tachometer pulses-per-revolution and thermal cooling properties.
>
> Keep the existing microchip,lan9691-temp compatible for device tree ABI
> compatibility.
>
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> ---
> .../bindings/hwmon/microchip,sparx5-temp.yaml | 90 ++++++++++++++++++-
> 1 file changed, 87 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> index 611fcadb1e771..e91c2a3ccd3c9 100644
> --- a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> +++ b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> @@ -4,13 +4,15 @@
> $id: http://devicetree.org/schemas/hwmon/microchip,sparx5-temp.yaml#
> $schema: http://devicetree.org/meta-schemas/core.yaml#
>
> -title: Microchip Sparx5 Temperature Monitor
> +title: Microchip Sparx5 Hardware Monitor
>
> maintainers:
> - Lars Povlsen <lars.povlsen@microchip.com>
>
> description: |
> - Microchip Sparx5 embedded temperature monitor
> + Microchip Sparx5 temperature monitor with a fan controller on LAN969x.
> + The fan child's pwms property references this node to specify the
> + PWM period and polarity.
>
> properties:
> compatible:
> @@ -18,11 +20,19 @@ properties:
> - const: microchip,sparx5-temp
> - items:
> - enum:
> + - microchip,lan9691-hwmon
> - microchip,lan9691-temp
> - const: microchip,sparx5-temp
>
> reg:
> - maxItems: 1
> + minItems: 1
> + maxItems: 2
> +
> + reg-names:
> + minItems: 1
> + items:
> + - const: temp
> + - const: fan
>
> clocks:
> items:
> @@ -31,11 +41,67 @@ properties:
> '#thermal-sensor-cells':
> const: 0
>
> + '#pwm-cells':
> + const: 2
> + description: |
> + Number of cells in a PWM specifier.
> + - cell 0: PWM period in nanoseconds
> + - cell 1: PWM polarity: 0 or PWM_POLARITY_INVERTED
> +
> + fan:
> + $ref: fan-common.yaml#
> + unevaluatedProperties: false
> +
> + properties:
> + cooling-levels:
> + description:
> + PWM duty-cycle values corresponding to thermal cooling states.
> + items:
> + maximum: 255
> +
> + pulses-per-revolution:
> + minimum: 1
> + maximum: 4
> + default: 2
> +
> + required:
> + - pwms
> +
> + dependencies:
> + '#cooling-cells':
> + - cooling-levels
> + cooling-levels:
> + - '#cooling-cells'
> +
> required:
> - compatible
> - reg
> - clocks
>
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: microchip,lan9691-hwmon
> + then:
> + properties:
> + reg:
> + minItems: 2
> + reg-names:
> + minItems: 2
> + required:
> + - '#pwm-cells'
> + - reg-names
> + else:
> + properties:
> + '#pwm-cells': false
> + fan: false
> + reg:
> + maxItems: 1
> + reg-names:
> + maxItems: 1
> +
> additionalProperties: false
>
> examples:
> @@ -46,3 +112,21 @@ examples:
> #thermal-sensor-cells = <0>;
> clocks = <&sys_clk>;
> };
> +
> + - |
> + #include <dt-bindings/pwm/pwm.h>
> +
> + hwmon: hwmon@e2020100 {
> + compatible = "microchip,lan9691-hwmon", "microchip,sparx5-temp";
> + reg = <0xe2020100 0xc>, <0xe2010348 0xc>;
Are these actually the same device? These are somewhat disparate
register regions - and the second is at a very odd offset.
Thanks,
Conor.
> + reg-names = "temp", "fan";
> + #pwm-cells = <2>;
> + #thermal-sensor-cells = <0>;
> + clocks = <&sys_clk>;
> +
> + fan {
> + pwms = <&hwmon 40000 PWM_POLARITY_INVERTED>;
> + cooling-levels = <0 128 192 255>;
> + #cooling-cells = <2>;
> + };
> + };
> --
> 2.56.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller
2026-10-13 16:30 ` Conor Dooley
@ 2026-10-13 16:38 ` Conor Dooley
2026-10-13 17:08 ` Robert Marko
1 sibling, 0 replies; 16+ messages in thread
From: Conor Dooley @ 2026-10-13 16:38 UTC (permalink / raw)
To: Robert Marko
Cc: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel,
luka.perkov
[-- Attachment #1: Type: text/plain, Size: 5061 bytes --]
On Tue, Oct 13, 2026 at 05:30:29PM +0100, Conor Dooley wrote:
> On Tue, Oct 13, 2026 at 02:56:25PM +0200, Robert Marko wrote:
> > LAN969x integrates a PWM fan controller with a tachometer input in
> > addition to the Sparx5-compatible temperature sensor. Add a LAN969x
> > hardware-monitor compatible and describe the second register region.
> >
> > Describe the fan as a child node using a two-cell PWM specifier for the
> > period and standard polarity flags. The child also carries the optional
> > tachometer pulses-per-revolution and thermal cooling properties.
> >
> > Keep the existing microchip,lan9691-temp compatible for device tree ABI
> > compatibility.
> >
> > Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> > ---
> > .../bindings/hwmon/microchip,sparx5-temp.yaml | 90 ++++++++++++++++++-
> > 1 file changed, 87 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > index 611fcadb1e771..e91c2a3ccd3c9 100644
> > --- a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > +++ b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > @@ -4,13 +4,15 @@
> > $id: http://devicetree.org/schemas/hwmon/microchip,sparx5-temp.yaml#
> > $schema: http://devicetree.org/meta-schemas/core.yaml#
> >
> > -title: Microchip Sparx5 Temperature Monitor
> > +title: Microchip Sparx5 Hardware Monitor
> >
> > maintainers:
> > - Lars Povlsen <lars.povlsen@microchip.com>
> >
> > description: |
> > - Microchip Sparx5 embedded temperature monitor
> > + Microchip Sparx5 temperature monitor with a fan controller on LAN969x.
> > + The fan child's pwms property references this node to specify the
> > + PWM period and polarity.
> >
> > properties:
> > compatible:
> > @@ -18,11 +20,19 @@ properties:
> > - const: microchip,sparx5-temp
> > - items:
> > - enum:
> > + - microchip,lan9691-hwmon
> > - microchip,lan9691-temp
> > - const: microchip,sparx5-temp
> >
> > reg:
> > - maxItems: 1
> > + minItems: 1
> > + maxItems: 2
> > +
> > + reg-names:
> > + minItems: 1
> > + items:
> > + - const: temp
> > + - const: fan
> >
> > clocks:
> > items:
> > @@ -31,11 +41,67 @@ properties:
> > '#thermal-sensor-cells':
> > const: 0
> >
> > + '#pwm-cells':
> > + const: 2
> > + description: |
> > + Number of cells in a PWM specifier.
> > + - cell 0: PWM period in nanoseconds
> > + - cell 1: PWM polarity: 0 or PWM_POLARITY_INVERTED
> > +
> > + fan:
> > + $ref: fan-common.yaml#
> > + unevaluatedProperties: false
> > +
> > + properties:
> > + cooling-levels:
> > + description:
> > + PWM duty-cycle values corresponding to thermal cooling states.
> > + items:
> > + maximum: 255
> > +
> > + pulses-per-revolution:
> > + minimum: 1
> > + maximum: 4
> > + default: 2
> > +
> > + required:
> > + - pwms
> > +
> > + dependencies:
> > + '#cooling-cells':
> > + - cooling-levels
> > + cooling-levels:
> > + - '#cooling-cells'
> > +
> > required:
> > - compatible
> > - reg
> > - clocks
> >
> > +allOf:
> > + - if:
> > + properties:
> > + compatible:
> > + contains:
> > + const: microchip,lan9691-hwmon
> > + then:
> > + properties:
> > + reg:
> > + minItems: 2
> > + reg-names:
> > + minItems: 2
> > + required:
> > + - '#pwm-cells'
> > + - reg-names
> > + else:
> > + properties:
> > + '#pwm-cells': false
> > + fan: false
> > + reg:
> > + maxItems: 1
> > + reg-names:
> > + maxItems: 1
> > +
> > additionalProperties: false
> >
> > examples:
> > @@ -46,3 +112,21 @@ examples:
> > #thermal-sensor-cells = <0>;
> > clocks = <&sys_clk>;
> > };
> > +
> > + - |
> > + #include <dt-bindings/pwm/pwm.h>
> > +
> > + hwmon: hwmon@e2020100 {
> > + compatible = "microchip,lan9691-hwmon", "microchip,sparx5-temp";
> > + reg = <0xe2020100 0xc>, <0xe2010348 0xc>;
>
> Are these actually the same device? These are somewhat disparate
> register regions - and the second is at a very odd offset.
>
Hmm, doubly suspect since there's already a lan9691-temp compatible...
> Thanks,
> Conor.
>
> > + reg-names = "temp", "fan";
> > + #pwm-cells = <2>;
> > + #thermal-sensor-cells = <0>;
> > + clocks = <&sys_clk>;
> > +
> > + fan {
> > + pwms = <&hwmon 40000 PWM_POLARITY_INVERTED>;
> > + cooling-levels = <0 128 192 255>;
> > + #cooling-cells = <2>;
> > + };
> > + };
> > --
> > 2.56.0
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller
2026-10-13 16:30 ` Conor Dooley
2026-10-13 16:38 ` Conor Dooley
@ 2026-10-13 17:08 ` Robert Marko
2026-10-13 17:31 ` Conor Dooley
1 sibling, 1 reply; 16+ messages in thread
From: Robert Marko @ 2026-10-13 17:08 UTC (permalink / raw)
To: Conor Dooley
Cc: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel,
luka.perkov
On Tue, Oct 13, 2026 at 6:30 PM Conor Dooley <conor@kernel.org> wrote:
>
> On Tue, Oct 13, 2026 at 02:56:25PM +0200, Robert Marko wrote:
> > LAN969x integrates a PWM fan controller with a tachometer input in
> > addition to the Sparx5-compatible temperature sensor. Add a LAN969x
> > hardware-monitor compatible and describe the second register region.
> >
> > Describe the fan as a child node using a two-cell PWM specifier for the
> > period and standard polarity flags. The child also carries the optional
> > tachometer pulses-per-revolution and thermal cooling properties.
> >
> > Keep the existing microchip,lan9691-temp compatible for device tree ABI
> > compatibility.
> >
> > Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> > ---
> > .../bindings/hwmon/microchip,sparx5-temp.yaml | 90 ++++++++++++++++++-
> > 1 file changed, 87 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > index 611fcadb1e771..e91c2a3ccd3c9 100644
> > --- a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > +++ b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > @@ -4,13 +4,15 @@
> > $id: http://devicetree.org/schemas/hwmon/microchip,sparx5-temp.yaml#
> > $schema: http://devicetree.org/meta-schemas/core.yaml#
> >
> > -title: Microchip Sparx5 Temperature Monitor
> > +title: Microchip Sparx5 Hardware Monitor
> >
> > maintainers:
> > - Lars Povlsen <lars.povlsen@microchip.com>
> >
> > description: |
> > - Microchip Sparx5 embedded temperature monitor
> > + Microchip Sparx5 temperature monitor with a fan controller on LAN969x.
> > + The fan child's pwms property references this node to specify the
> > + PWM period and polarity.
> >
> > properties:
> > compatible:
> > @@ -18,11 +20,19 @@ properties:
> > - const: microchip,sparx5-temp
> > - items:
> > - enum:
> > + - microchip,lan9691-hwmon
> > - microchip,lan9691-temp
> > - const: microchip,sparx5-temp
> >
> > reg:
> > - maxItems: 1
> > + minItems: 1
> > + maxItems: 2
> > +
> > + reg-names:
> > + minItems: 1
> > + items:
> > + - const: temp
> > + - const: fan
> >
> > clocks:
> > items:
> > @@ -31,11 +41,67 @@ properties:
> > '#thermal-sensor-cells':
> > const: 0
> >
> > + '#pwm-cells':
> > + const: 2
> > + description: |
> > + Number of cells in a PWM specifier.
> > + - cell 0: PWM period in nanoseconds
> > + - cell 1: PWM polarity: 0 or PWM_POLARITY_INVERTED
> > +
> > + fan:
> > + $ref: fan-common.yaml#
> > + unevaluatedProperties: false
> > +
> > + properties:
> > + cooling-levels:
> > + description:
> > + PWM duty-cycle values corresponding to thermal cooling states.
> > + items:
> > + maximum: 255
> > +
> > + pulses-per-revolution:
> > + minimum: 1
> > + maximum: 4
> > + default: 2
> > +
> > + required:
> > + - pwms
> > +
> > + dependencies:
> > + '#cooling-cells':
> > + - cooling-levels
> > + cooling-levels:
> > + - '#cooling-cells'
> > +
> > required:
> > - compatible
> > - reg
> > - clocks
> >
> > +allOf:
> > + - if:
> > + properties:
> > + compatible:
> > + contains:
> > + const: microchip,lan9691-hwmon
> > + then:
> > + properties:
> > + reg:
> > + minItems: 2
> > + reg-names:
> > + minItems: 2
> > + required:
> > + - '#pwm-cells'
> > + - reg-names
> > + else:
> > + properties:
> > + '#pwm-cells': false
> > + fan: false
> > + reg:
> > + maxItems: 1
> > + reg-names:
> > + maxItems: 1
> > +
> > additionalProperties: false
> >
> > examples:
> > @@ -46,3 +112,21 @@ examples:
> > #thermal-sensor-cells = <0>;
> > clocks = <&sys_clk>;
> > };
> > +
> > + - |
> > + #include <dt-bindings/pwm/pwm.h>
> > +
> > + hwmon: hwmon@e2020100 {
> > + compatible = "microchip,lan9691-hwmon", "microchip,sparx5-temp";
> > + reg = <0xe2020100 0xc>, <0xe2010348 0xc>;
>
> Are these actually the same device? These are somewhat disparate
> register regions - and the second is at a very odd offset.
Not really, they can be separately configured and have their own register space.
I did not see a point in separate drivers, but we could model these as
separate DT
nodes with their individual bindings if that is more appropriate.
Regards,
Robert
>
> Thanks,
> Conor.
>
> > + reg-names = "temp", "fan";
> > + #pwm-cells = <2>;
> > + #thermal-sensor-cells = <0>;
> > + clocks = <&sys_clk>;
> > +
> > + fan {
> > + pwms = <&hwmon 40000 PWM_POLARITY_INVERTED>;
> > + cooling-levels = <0 128 192 255>;
> > + #cooling-cells = <2>;
> > + };
> > + };
> > --
> > 2.56.0
> >
--
Robert Marko
Staff Embedded Linux Engineer
Sartura d.d.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: robert.marko@sartura.hr
Web: www.sartura.hr
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/6] dt-bindings: hwmon: sparx5: add LAN969x fan controller
2026-10-13 17:08 ` Robert Marko
@ 2026-10-13 17:31 ` Conor Dooley
0 siblings, 0 replies; 16+ messages in thread
From: Conor Dooley @ 2026-10-13 17:31 UTC (permalink / raw)
To: Robert Marko
Cc: linux, robh, krzk+dt, conor+dt, Steen.Hegelund, daniel.machon,
UNGLinuxDriver, nicolas.ferre, claudiu.beznea, lars.povlsen,
linux-hwmon, devicetree, linux-arm-kernel, linux-kernel,
luka.perkov
[-- Attachment #1: Type: text/plain, Size: 5198 bytes --]
On Tue, Oct 13, 2026 at 07:08:34PM +0200, Robert Marko wrote:
> On Tue, Oct 13, 2026 at 6:30 PM Conor Dooley <conor@kernel.org> wrote:
> >
> > On Tue, Oct 13, 2026 at 02:56:25PM +0200, Robert Marko wrote:
> > > LAN969x integrates a PWM fan controller with a tachometer input in
> > > addition to the Sparx5-compatible temperature sensor. Add a LAN969x
> > > hardware-monitor compatible and describe the second register region.
> > >
> > > Describe the fan as a child node using a two-cell PWM specifier for the
> > > period and standard polarity flags. The child also carries the optional
> > > tachometer pulses-per-revolution and thermal cooling properties.
> > >
> > > Keep the existing microchip,lan9691-temp compatible for device tree ABI
> > > compatibility.
> > >
> > > Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> > > ---
> > > .../bindings/hwmon/microchip,sparx5-temp.yaml | 90 ++++++++++++++++++-
> > > 1 file changed, 87 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > > index 611fcadb1e771..e91c2a3ccd3c9 100644
> > > --- a/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > > +++ b/Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
> > > @@ -4,13 +4,15 @@
> > > $id: http://devicetree.org/schemas/hwmon/microchip,sparx5-temp.yaml#
> > > $schema: http://devicetree.org/meta-schemas/core.yaml#
> > >
> > > -title: Microchip Sparx5 Temperature Monitor
> > > +title: Microchip Sparx5 Hardware Monitor
> > >
> > > maintainers:
> > > - Lars Povlsen <lars.povlsen@microchip.com>
> > >
> > > description: |
> > > - Microchip Sparx5 embedded temperature monitor
> > > + Microchip Sparx5 temperature monitor with a fan controller on LAN969x.
> > > + The fan child's pwms property references this node to specify the
> > > + PWM period and polarity.
> > >
> > > properties:
> > > compatible:
> > > @@ -18,11 +20,19 @@ properties:
> > > - const: microchip,sparx5-temp
> > > - items:
> > > - enum:
> > > + - microchip,lan9691-hwmon
> > > - microchip,lan9691-temp
> > > - const: microchip,sparx5-temp
> > >
> > > reg:
> > > - maxItems: 1
> > > + minItems: 1
> > > + maxItems: 2
> > > +
> > > + reg-names:
> > > + minItems: 1
> > > + items:
> > > + - const: temp
> > > + - const: fan
> > >
> > > clocks:
> > > items:
> > > @@ -31,11 +41,67 @@ properties:
> > > '#thermal-sensor-cells':
> > > const: 0
> > >
> > > + '#pwm-cells':
> > > + const: 2
> > > + description: |
> > > + Number of cells in a PWM specifier.
> > > + - cell 0: PWM period in nanoseconds
> > > + - cell 1: PWM polarity: 0 or PWM_POLARITY_INVERTED
> > > +
> > > + fan:
> > > + $ref: fan-common.yaml#
> > > + unevaluatedProperties: false
> > > +
> > > + properties:
> > > + cooling-levels:
> > > + description:
> > > + PWM duty-cycle values corresponding to thermal cooling states.
> > > + items:
> > > + maximum: 255
> > > +
> > > + pulses-per-revolution:
> > > + minimum: 1
> > > + maximum: 4
> > > + default: 2
> > > +
> > > + required:
> > > + - pwms
> > > +
> > > + dependencies:
> > > + '#cooling-cells':
> > > + - cooling-levels
> > > + cooling-levels:
> > > + - '#cooling-cells'
> > > +
> > > required:
> > > - compatible
> > > - reg
> > > - clocks
> > >
> > > +allOf:
> > > + - if:
> > > + properties:
> > > + compatible:
> > > + contains:
> > > + const: microchip,lan9691-hwmon
> > > + then:
> > > + properties:
> > > + reg:
> > > + minItems: 2
> > > + reg-names:
> > > + minItems: 2
> > > + required:
> > > + - '#pwm-cells'
> > > + - reg-names
> > > + else:
> > > + properties:
> > > + '#pwm-cells': false
> > > + fan: false
> > > + reg:
> > > + maxItems: 1
> > > + reg-names:
> > > + maxItems: 1
> > > +
> > > additionalProperties: false
> > >
> > > examples:
> > > @@ -46,3 +112,21 @@ examples:
> > > #thermal-sensor-cells = <0>;
> > > clocks = <&sys_clk>;
> > > };
> > > +
> > > + - |
> > > + #include <dt-bindings/pwm/pwm.h>
> > > +
> > > + hwmon: hwmon@e2020100 {
> > > + compatible = "microchip,lan9691-hwmon", "microchip,sparx5-temp";
> > > + reg = <0xe2020100 0xc>, <0xe2010348 0xc>;
> >
> > Are these actually the same device? These are somewhat disparate
> > register regions - and the second is at a very odd offset.
>
> Not really, they can be separately configured and have their own register space.
>
> I did not see a point in separate drivers, but we could model these as
> separate DT
> nodes with their individual bindings if that is more appropriate.
Doing that seems more appropriate to me.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread