[PATCH 0/2] power: supply: leds: add triggers for non battery type

[PATCH 0/2] power: supply: leds: add triggers for non battery type

[Steffen Dirkwinkel]

We want to use the power supply leds to show a different led color based
on ups charging / non-charging state. For this we add support for led
triggers for non "battery" supplies and a "not-charging" trigger.

This is roughly how it would be used with a device tree power ups supply
to have a violet led on power failure and green on power ok:

ups { 
      compatible = "gpio-charger";
      charger-type = "ups"; 
      charge-status-gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
};

leds {
        compatible = "gpio-leds";
        pwr-red {
                gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "ups-not-charging";
        };
        
        pwr-green {
                gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "ups-charging";
        };

        pwr-blue {
                gpios = <&gpio 34 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "ups-not-charging";
     };
};

Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
---
Steffen Dirkwinkel (2):
      power: supply: leds: create triggers based on properties, not type
      power: supply: leds: add a not-charging trigger

 drivers/power/supply/power_supply_leds.c | 93 +++++++++++++++++---------------
 include/linux/power_supply.h             |  4 +-
 2 files changed, 52 insertions(+), 45 deletions(-)
---
base-commit: ab9de95c9cf952332ab79453b4b5d1bfca8e514f
change-id: 20260625-std-power-supply-triggers-0f4504fcbe37

Best regards,
--  
Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

[PATCH 1/2] power: supply: leds: create triggers based on properties, not type

[Steffen Dirkwinkel]

From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

Currently only battery power supplies get triggers for other properties
and other supplies only get the online trigger.

This changes it to provide the triggers for any power supply depending
on what properties are available. Batteries will still get the same
triggers if the properties are there, but now other power supplies can
get the triggers too.

Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
---
 drivers/power/supply/power_supply_leds.c | 88 ++++++++++++++++----------------
 include/linux/power_supply.h             |  3 +-
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
index 1548aaba3362..538cc0440e53 100644
--- a/drivers/power/supply/power_supply_leds.c
+++ b/drivers/power/supply/power_supply_leds.c
@@ -17,8 +17,6 @@
 
 #include "power_supply.h"
 
-/* Battery specific LEDs triggers. */
-
 struct power_supply_led_trigger {
 	struct led_trigger trig;
 	struct power_supply *psy;
@@ -89,7 +87,7 @@ static void power_supply_unregister_led_trigger(struct led_trigger *trig)
 	kfree(psy_trig);
 }
 
-static void power_supply_update_bat_leds(struct power_supply *psy)
+static void power_supply_update_status_leds(struct power_supply *psy)
 {
 	union power_supply_propval status;
 	unsigned int intensity_green[3] = { 0, 255, 0 };
@@ -102,7 +100,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 
 	switch (status.intval) {
 	case POWER_SUPPLY_STATUS_FULL:
-		led_trigger_event(psy->trig, LED_FULL);
+		led_trigger_event(psy->charging_or_full_trig, LED_FULL);
 		led_trigger_event(psy->charging_trig, LED_OFF);
 		led_trigger_event(psy->full_trig, LED_FULL);
 		/* Going from blink to LED on requires a LED_OFF event to stop blink */
@@ -114,7 +112,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 				     LED_FULL);
 		break;
 	case POWER_SUPPLY_STATUS_CHARGING:
-		led_trigger_event(psy->trig, LED_FULL);
+		led_trigger_event(psy->charging_or_full_trig, LED_FULL);
 		led_trigger_event(psy->charging_trig, LED_FULL);
 		led_trigger_event(psy->full_trig, LED_OFF);
 		led_trigger_blink(psy->charging_blink_full_solid_trig, 0, 0);
@@ -124,7 +122,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 				     LED_FULL);
 		break;
 	default:
-		led_trigger_event(psy->trig, LED_OFF);
+		led_trigger_event(psy->charging_or_full_trig, LED_OFF);
 		led_trigger_event(psy->charging_trig, LED_OFF);
 		led_trigger_event(psy->full_trig, LED_OFF);
 		led_trigger_event(psy->charging_blink_full_solid_trig,
@@ -135,21 +133,15 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 	}
 }
 
-static void power_supply_remove_bat_triggers(struct power_supply *psy)
-{
-	power_supply_unregister_led_trigger(psy->trig);
-	power_supply_unregister_led_trigger(psy->charging_trig);
-	power_supply_unregister_led_trigger(psy->full_trig);
-	power_supply_unregister_led_trigger(psy->charging_blink_full_solid_trig);
-	power_supply_unregister_led_trigger(psy->charging_orange_full_green_trig);
-}
-
-static int power_supply_create_bat_triggers(struct power_supply *psy)
+static int power_supply_create_status_triggers(struct power_supply *psy)
 {
 	int err = 0;
 
+	if (!power_supply_has_property(psy, POWER_SUPPLY_PROP_STATUS))
+		return 0;
+
 	power_supply_register_led_trigger(psy, "%s-charging-or-full",
-					  &psy->trig, &err);
+					  &psy->charging_or_full_trig, &err);
 	power_supply_register_led_trigger(psy, "%s-charging",
 					  &psy->charging_trig, &err);
 	power_supply_register_led_trigger(psy, "%s-full",
@@ -158,15 +150,11 @@ static int power_supply_create_bat_triggers(struct power_supply *psy)
 					  &psy->charging_blink_full_solid_trig, &err);
 	power_supply_register_led_trigger(psy, "%s-charging-orange-full-green",
 					  &psy->charging_orange_full_green_trig, &err);
-	if (err)
-		power_supply_remove_bat_triggers(psy);
 
 	return err;
 }
 
-/* Generated power specific LEDs triggers. */
-
-static void power_supply_update_gen_leds(struct power_supply *psy)
+static void power_supply_update_online_leds(struct power_supply *psy)
 {
 	union power_supply_propval online;
 
@@ -175,43 +163,53 @@ static void power_supply_update_gen_leds(struct power_supply *psy)
 
 	dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval);
 
-	if (online.intval)
-		led_trigger_event(psy->trig, LED_FULL);
-	else
-		led_trigger_event(psy->trig, LED_OFF);
+	led_trigger_event(psy->online_trig, online.intval ? LED_FULL : LED_OFF);
 }
 
-static int power_supply_create_gen_triggers(struct power_supply *psy)
+static int power_supply_create_online_trigger(struct power_supply *psy)
 {
-	return power_supply_register_led_trigger(psy, "%s-online", &psy->trig, NULL);
-}
+	int err = 0;
 
-static void power_supply_remove_gen_triggers(struct power_supply *psy)
-{
-	power_supply_unregister_led_trigger(psy->trig);
-}
+	if (!power_supply_has_property(psy, POWER_SUPPLY_PROP_ONLINE))
+		return 0;
 
-/* Choice what triggers to create&update. */
+	power_supply_register_led_trigger(psy, "%s-online", &psy->online_trig,
+					  &err);
+
+	return err;
+}
 
 void power_supply_update_leds(struct power_supply *psy)
 {
-	if (psy->desc->type == POWER_SUPPLY_TYPE_BATTERY)
-		power_supply_update_bat_leds(psy);
-	else
-		power_supply_update_gen_leds(psy);
+	power_supply_update_online_leds(psy);
+	power_supply_update_status_leds(psy);
 }
 
 int power_supply_create_triggers(struct power_supply *psy)
 {
-	if (psy->desc->type == POWER_SUPPLY_TYPE_BATTERY)
-		return power_supply_create_bat_triggers(psy);
-	return power_supply_create_gen_triggers(psy);
+	int err;
+
+	err = power_supply_create_online_trigger(psy);
+	if (err)
+		goto err_remove;
+
+	err = power_supply_create_status_triggers(psy);
+	if (err)
+		goto err_remove;
+
+	return 0;
+
+err_remove:
+	power_supply_remove_triggers(psy);
+	return err;
 }
 
 void power_supply_remove_triggers(struct power_supply *psy)
 {
-	if (psy->desc->type == POWER_SUPPLY_TYPE_BATTERY)
-		power_supply_remove_bat_triggers(psy);
-	else
-		power_supply_remove_gen_triggers(psy);
+	power_supply_unregister_led_trigger(psy->online_trig);
+	power_supply_unregister_led_trigger(psy->charging_or_full_trig);
+	power_supply_unregister_led_trigger(psy->charging_trig);
+	power_supply_unregister_led_trigger(psy->full_trig);
+	power_supply_unregister_led_trigger(psy->charging_blink_full_solid_trig);
+	power_supply_unregister_led_trigger(psy->charging_orange_full_green_trig);
 }
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 7a5e4c3242a0..68b65682b14d 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -346,7 +346,8 @@ struct power_supply {
 #endif
 
 #ifdef CONFIG_LEDS_TRIGGERS
-	struct led_trigger *trig;
+	struct led_trigger *charging_or_full_trig;
+	struct led_trigger *online_trig;
 	struct led_trigger *charging_trig;
 	struct led_trigger *full_trig;
 	struct led_trigger *charging_blink_full_solid_trig;

-- 
2.54.0

[PATCH 2/2] power: supply: leds: add a not-charging trigger

[Steffen Dirkwinkel]

From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

We intend to use this with a gpio-charger ups device that reports
charging or not-charging based on a gpio to set a "power failure" led.

Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
---
 drivers/power/supply/power_supply_leds.c | 7 +++++++
 include/linux/power_supply.h             | 1 +
 2 files changed, 8 insertions(+)

diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
index 538cc0440e53..c82a3628765c 100644
--- a/drivers/power/supply/power_supply_leds.c
+++ b/drivers/power/supply/power_supply_leds.c
@@ -131,6 +131,10 @@ static void power_supply_update_status_leds(struct power_supply *psy)
 			LED_OFF);
 		break;
 	}
+
+	led_trigger_event(psy->not_charging_trig,
+			  status.intval == POWER_SUPPLY_STATUS_NOT_CHARGING ?
+			  LED_FULL : LED_OFF);
 }
 
 static int power_supply_create_status_triggers(struct power_supply *psy)
@@ -150,6 +154,8 @@ static int power_supply_create_status_triggers(struct power_supply *psy)
 					  &psy->charging_blink_full_solid_trig, &err);
 	power_supply_register_led_trigger(psy, "%s-charging-orange-full-green",
 					  &psy->charging_orange_full_green_trig, &err);
+	power_supply_register_led_trigger(psy, "%s-not-charging",
+					  &psy->not_charging_trig, &err);
 
 	return err;
 }
@@ -209,6 +215,7 @@ void power_supply_remove_triggers(struct power_supply *psy)
 	power_supply_unregister_led_trigger(psy->online_trig);
 	power_supply_unregister_led_trigger(psy->charging_or_full_trig);
 	power_supply_unregister_led_trigger(psy->charging_trig);
+	power_supply_unregister_led_trigger(psy->not_charging_trig);
 	power_supply_unregister_led_trigger(psy->full_trig);
 	power_supply_unregister_led_trigger(psy->charging_blink_full_solid_trig);
 	power_supply_unregister_led_trigger(psy->charging_orange_full_green_trig);
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 68b65682b14d..9052610e3910 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -349,6 +349,7 @@ struct power_supply {
 	struct led_trigger *charging_or_full_trig;
 	struct led_trigger *online_trig;
 	struct led_trigger *charging_trig;
+	struct led_trigger *not_charging_trig;
 	struct led_trigger *full_trig;
 	struct led_trigger *charging_blink_full_solid_trig;
 	struct led_trigger *charging_orange_full_green_trig;

-- 
2.54.0

Re: [PATCH 2/2] power: supply: leds: add a not-charging trigger

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 2997 bytes --]

Hi,

On Thu, Jun 25, 2026 at 07:07:35PM +0200, Steffen Dirkwinkel wrote:
> From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
> 
> We intend to use this with a gpio-charger ups device that reports
> charging or not-charging based on a gpio to set a "power failure" led.
> 
> Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
> ---
>  drivers/power/supply/power_supply_leds.c | 7 +++++++
>  include/linux/power_supply.h             | 1 +
>  2 files changed, 8 insertions(+)

POWER_SUPPLY_STATUS_NOT_CHARGING means, that a battery is neither
charged **nor discharged**. I think the NOT_CHARGING status has a
bad name, but it's ABI and cannot be changed easily. But I certainly
don't want it to spread further. Let's find a better name for this
trigger. Maybe idle?

Greetings,

-- Sebastian

> diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
> index 538cc0440e53..c82a3628765c 100644
> --- a/drivers/power/supply/power_supply_leds.c
> +++ b/drivers/power/supply/power_supply_leds.c
> @@ -131,6 +131,10 @@ static void power_supply_update_status_leds(struct power_supply *psy)
>  			LED_OFF);
>  		break;
>  	}
> +
> +	led_trigger_event(psy->not_charging_trig,
> +			  status.intval == POWER_SUPPLY_STATUS_NOT_CHARGING ?
> +			  LED_FULL : LED_OFF);
>  }
>  
>  static int power_supply_create_status_triggers(struct power_supply *psy)
> @@ -150,6 +154,8 @@ static int power_supply_create_status_triggers(struct power_supply *psy)
>  					  &psy->charging_blink_full_solid_trig, &err);
>  	power_supply_register_led_trigger(psy, "%s-charging-orange-full-green",
>  					  &psy->charging_orange_full_green_trig, &err);
> +	power_supply_register_led_trigger(psy, "%s-not-charging",
> +					  &psy->not_charging_trig, &err);
>  
>  	return err;
>  }
> @@ -209,6 +215,7 @@ void power_supply_remove_triggers(struct power_supply *psy)
>  	power_supply_unregister_led_trigger(psy->online_trig);
>  	power_supply_unregister_led_trigger(psy->charging_or_full_trig);
>  	power_supply_unregister_led_trigger(psy->charging_trig);
> +	power_supply_unregister_led_trigger(psy->not_charging_trig);
>  	power_supply_unregister_led_trigger(psy->full_trig);
>  	power_supply_unregister_led_trigger(psy->charging_blink_full_solid_trig);
>  	power_supply_unregister_led_trigger(psy->charging_orange_full_green_trig);
> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> index 68b65682b14d..9052610e3910 100644
> --- a/include/linux/power_supply.h
> +++ b/include/linux/power_supply.h
> @@ -349,6 +349,7 @@ struct power_supply {
>  	struct led_trigger *charging_or_full_trig;
>  	struct led_trigger *online_trig;
>  	struct led_trigger *charging_trig;
> +	struct led_trigger *not_charging_trig;
>  	struct led_trigger *full_trig;
>  	struct led_trigger *charging_blink_full_solid_trig;
>  	struct led_trigger *charging_orange_full_green_trig;
> 
> -- 
> 2.54.0
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] power: supply: leds: add a not-charging trigger

[Steffen Dirkwinkel]

Hi,

On Tue, 2026-07-21 at 00:23 +0200, Sebastian Reichel wrote:
> Hi,
> 
> On Thu, Jun 25, 2026 at 07:07:35PM +0200, Steffen Dirkwinkel wrote:
> > From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
> > 
> > We intend to use this with a gpio-charger ups device that reports
> > charging or not-charging based on a gpio to set a "power failure" led.
> > 
> > Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
> > ---
> >  drivers/power/supply/power_supply_leds.c | 7 +++++++
> >  include/linux/power_supply.h             | 1 +
> >  2 files changed, 8 insertions(+)
> 
> POWER_SUPPLY_STATUS_NOT_CHARGING means, that a battery is neither
> charged **nor discharged**. I think the NOT_CHARGING status has a
> bad name, but it's ABI and cannot be changed easily. But I certainly
> don't want it to spread further. Let's find a better name for this
> trigger. Maybe idle?

Hm, I guess I was also mislead by the name, as it's somewhat correct for my
usecase, our gpio connected ups is indicating "not-charging" via a gpio and I'm
using it as a gpio-charger charge-status-gpio.

I guess it would be more correct if I could map the gpio-charger charge status
to switch between charging and discharging instead of indicating not-charging.
If you agree I'd add that as an option via device tree binding there and add a
discharging trigger instead of the not charging one to the led triggers:

  charge-status-discharging:
      type: boolean
      description:
        Interpret a deasserted charge-status-gpio as "discharging" instead of
	"not charging".

Thanks,
Steffen

> 
> Greetings,
> 
> -- Sebastian
> 
> > diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
> > index 538cc0440e53..c82a3628765c 100644
> > --- a/drivers/power/supply/power_supply_leds.c
> > +++ b/drivers/power/supply/power_supply_leds.c
> > @@ -131,6 +131,10 @@ static void power_supply_update_status_leds(struct power_supply *psy)
> >  			LED_OFF);
> >  		break;
> >  	}
> > +
> > +	led_trigger_event(psy->not_charging_trig,
> > +			  status.intval == POWER_SUPPLY_STATUS_NOT_CHARGING ?
> > +			  LED_FULL : LED_OFF);
> >  }
> >  
> >  static int power_supply_create_status_triggers(struct power_supply *psy)
> > @@ -150,6 +154,8 @@ static int power_supply_create_status_triggers(struct power_supply *psy)
> >  					  &psy->charging_blink_full_solid_trig, &err);
> >  	power_supply_register_led_trigger(psy, "%s-charging-orange-full-green",
> >  					  &psy->charging_orange_full_green_trig, &err);
> > +	power_supply_register_led_trigger(psy, "%s-not-charging",
> > +					  &psy->not_charging_trig, &err);
> >  
> >  	return err;
> >  }
> > @@ -209,6 +215,7 @@ void power_supply_remove_triggers(struct power_supply *psy)
> >  	power_supply_unregister_led_trigger(psy->online_trig);
> >  	power_supply_unregister_led_trigger(psy->charging_or_full_trig);
> >  	power_supply_unregister_led_trigger(psy->charging_trig);
> > +	power_supply_unregister_led_trigger(psy->not_charging_trig);
> >  	power_supply_unregister_led_trigger(psy->full_trig);
> >  	power_supply_unregister_led_trigger(psy->charging_blink_full_solid_trig);
> >  	power_supply_unregister_led_trigger(psy->charging_orange_full_green_trig);
> > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> > index 68b65682b14d..9052610e3910 100644
> > --- a/include/linux/power_supply.h
> > +++ b/include/linux/power_supply.h
> > @@ -349,6 +349,7 @@ struct power_supply {
> >  	struct led_trigger *charging_or_full_trig;
> >  	struct led_trigger *online_trig;
> >  	struct led_trigger *charging_trig;
> > +	struct led_trigger *not_charging_trig;
> >  	struct led_trigger *full_trig;
> >  	struct led_trigger *charging_blink_full_solid_trig;
> >  	struct led_trigger *charging_orange_full_green_trig;
> > 
> > -- 
> > 2.54.0
> > 

Re: (subset) [PATCH 0/2] power: supply: leds: add triggers for non battery type

[Sebastian Reichel]

On Thu, 25 Jun 2026 19:07:33 +0200, Steffen Dirkwinkel wrote:
> We want to use the power supply leds to show a different led color based
> on ups charging / non-charging state. For this we add support for led
> triggers for non "battery" supplies and a "not-charging" trigger.
> 
> This is roughly how it would be used with a device tree power ups supply
> to have a violet led on power failure and green on power ok:
> 
> [...]

Applied, thanks!

[1/2] power: supply: leds: create triggers based on properties, not type
      commit: 439262f91f9832b42a978cda935ca3c955bdde1e

Best regards,
-- 
Sebastian Reichel <sebastian.reichel@collabora.com>