| Message ID | 20240324150107.976025-6-hpa@redhat.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | KTD2026 indicator LED for X86 Xiaomi Pad2 | expand |
On Sun, Mar 24, 2024 at 5:02 PM Kate Hsuan <hpa@redhat.com> wrote: > > Add a charging_red_full_green LED trigger and the trigger is based on > led_mc_trigger_event() which can set an RGB LED when the trigger is > triggered. The LED will show red when the battery status is charging. > The LED will show green when the battery status is full. > > Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/T/#t You can drop the 'T/#t' part. ... > + led_mc_trigger_event(psy->charging_red_full_green_trig, > + intensity_green, > + 3, ARRAY_SIZE() > + LED_FULL); ... > + led_mc_trigger_event(psy->charging_red_full_green_trig, > + intensity_red, > + 3, Ditto. > + LED_FULL); ... > + led_mc_trigger_event(psy->charging_red_full_green_trig, > + intensity_red, > + 3, Ditto. > + LED_OFF);
Hi Andy, On Mon, Mar 25, 2024 at 4:11 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Sun, Mar 24, 2024 at 5:02 PM Kate Hsuan <hpa@redhat.com> wrote: > > > > Add a charging_red_full_green LED trigger and the trigger is based on > > led_mc_trigger_event() which can set an RGB LED when the trigger is > > triggered. The LED will show red when the battery status is charging. > > The LED will show green when the battery status is full. > > > > Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/T/#t > > You can drop the 'T/#t' part. > > ... > > > + led_mc_trigger_event(psy->charging_red_full_green_trig, > > + intensity_green, > > + 3, > > ARRAY_SIZE() > > > + LED_FULL); > > ... > > > + led_mc_trigger_event(psy->charging_red_full_green_trig, > > + intensity_red, > > + 3, > > Ditto. > > > + LED_FULL); > > ... > > > + led_mc_trigger_event(psy->charging_red_full_green_trig, > > + intensity_red, > > + 3, > > Ditto. > > > + LED_OFF); > > -- > With Best Regards, > Andy Shevchenko > Thank you for reviewing it. I'll fix it in the v6 patch.
Hello Kate, On Sun, Mar 24, 2024 at 11:01:06PM +0800, Kate Hsuan wrote: > Add a charging_red_full_green LED trigger and the trigger is based on > led_mc_trigger_event() which can set an RGB LED when the trigger is > triggered. The LED will show red when the battery status is charging. > The LED will show green when the battery status is full. > > Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/T/#t > Signed-off-by: Kate Hsuan <hpa@redhat.com> > --- Have you considered using orange instead of red? Using orange as charging indicator seems to be more common nowadays and allows green = battery full orange = battery charging red = battery empty / battery dead / error Greetings, -- Sebastian > drivers/power/supply/power_supply_leds.c | 25 ++++++++++++++++++++++++ > include/linux/power_supply.h | 2 ++ > 2 files changed, 27 insertions(+) > > diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c > index c7db29d5fcb8..bd9c8fec5870 100644 > --- a/drivers/power/supply/power_supply_leds.c > +++ b/drivers/power/supply/power_supply_leds.c > @@ -22,6 +22,8 @@ > static void power_supply_update_bat_leds(struct power_supply *psy) > { > union power_supply_propval status; > + unsigned int intensity_green[3] = {255, 0, 0}; > + unsigned int intensity_red[3] = {0, 0, 255}; > > if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) > return; > @@ -36,12 +38,20 @@ static void power_supply_update_bat_leds(struct power_supply *psy) > /* Going from blink to LED on requires a LED_OFF event to stop blink */ > led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); > led_trigger_event(psy->charging_blink_full_solid_trig, LED_FULL); > + led_mc_trigger_event(psy->charging_red_full_green_trig, > + intensity_green, > + 3, > + LED_FULL); > break; > case POWER_SUPPLY_STATUS_CHARGING: > led_trigger_event(psy->charging_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); > + led_mc_trigger_event(psy->charging_red_full_green_trig, > + intensity_red, > + 3, > + LED_FULL); > break; > default: > led_trigger_event(psy->charging_full_trig, LED_OFF); > @@ -49,6 +59,10 @@ static void power_supply_update_bat_leds(struct power_supply *psy) > led_trigger_event(psy->full_trig, LED_OFF); > led_trigger_event(psy->charging_blink_full_solid_trig, > LED_OFF); > + led_mc_trigger_event(psy->charging_red_full_green_trig, > + intensity_red, > + 3, > + LED_OFF); > break; > } > } > @@ -74,6 +88,11 @@ static int power_supply_create_bat_triggers(struct power_supply *psy) > if (!psy->charging_blink_full_solid_trig_name) > goto charging_blink_full_solid_failed; > > + psy->charging_red_full_green_trig_name = kasprintf(GFP_KERNEL, > + "%s-charging-red-full-green", psy->desc->name); > + if (!psy->charging_red_full_green_trig_name) > + goto charging_red_full_green_failed; > + > led_trigger_register_simple(psy->charging_full_trig_name, > &psy->charging_full_trig); > led_trigger_register_simple(psy->charging_trig_name, > @@ -82,9 +101,13 @@ static int power_supply_create_bat_triggers(struct power_supply *psy) > &psy->full_trig); > led_trigger_register_simple(psy->charging_blink_full_solid_trig_name, > &psy->charging_blink_full_solid_trig); > + led_trigger_register_simple(psy->charging_red_full_green_trig_name, > + &psy->charging_red_full_green_trig); > > return 0; > > +charging_red_full_green_failed: > + kfree(psy->charging_blink_full_solid_trig_name); > charging_blink_full_solid_failed: > kfree(psy->full_trig_name); > full_failed: > @@ -101,10 +124,12 @@ static void power_supply_remove_bat_triggers(struct power_supply *psy) > led_trigger_unregister_simple(psy->charging_trig); > led_trigger_unregister_simple(psy->full_trig); > led_trigger_unregister_simple(psy->charging_blink_full_solid_trig); > + led_trigger_unregister_simple(psy->charging_red_full_green_trig); > kfree(psy->charging_blink_full_solid_trig_name); > kfree(psy->full_trig_name); > kfree(psy->charging_trig_name); > kfree(psy->charging_full_trig_name); > + kfree(psy->charging_red_full_green_trig_name); > } > > /* Generated power specific LEDs triggers. */ > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > index c0992a77feea..1d7c0b43070f 100644 > --- a/include/linux/power_supply.h > +++ b/include/linux/power_supply.h > @@ -318,6 +318,8 @@ struct power_supply { > char *online_trig_name; > struct led_trigger *charging_blink_full_solid_trig; > char *charging_blink_full_solid_trig_name; > + struct led_trigger *charging_red_full_green_trig; > + char *charging_red_full_green_trig_name; > #endif > }; > > -- > 2.44.0 > >
Hi On Sat, Mar 30, 2024 at 12:24 AM Sebastian Reichel <sre@kernel.org> wrote: > > Hello Kate, > > On Sun, Mar 24, 2024 at 11:01:06PM +0800, Kate Hsuan wrote: > > Add a charging_red_full_green LED trigger and the trigger is based on > > led_mc_trigger_event() which can set an RGB LED when the trigger is > > triggered. The LED will show red when the battery status is charging. > > The LED will show green when the battery status is full. > > > > Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/T/#t > > Signed-off-by: Kate Hsuan <hpa@redhat.com> > > --- > > Have you considered using orange instead of red? Using orange as > charging indicator seems to be more common nowadays and allows Sounds good. I'll change the color for them. Thank you > > green = battery full > orange = battery charging > red = battery empty / battery dead / error > > Greetings, > > -- Sebastian > > > drivers/power/supply/power_supply_leds.c | 25 ++++++++++++++++++++++++ > > include/linux/power_supply.h | 2 ++ > > 2 files changed, 27 insertions(+) > > > > diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c > > index c7db29d5fcb8..bd9c8fec5870 100644 > > --- a/drivers/power/supply/power_supply_leds.c > > +++ b/drivers/power/supply/power_supply_leds.c > > @@ -22,6 +22,8 @@ > > static void power_supply_update_bat_leds(struct power_supply *psy) > > { > > union power_supply_propval status; > > + unsigned int intensity_green[3] = {255, 0, 0}; > > + unsigned int intensity_red[3] = {0, 0, 255}; > > > > if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) > > return; > > @@ -36,12 +38,20 @@ static void power_supply_update_bat_leds(struct power_supply *psy) > > /* Going from blink to LED on requires a LED_OFF event to stop blink */ > > led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); > > led_trigger_event(psy->charging_blink_full_solid_trig, LED_FULL); > > + led_mc_trigger_event(psy->charging_red_full_green_trig, > > + intensity_green, > > + 3, > > + LED_FULL); > > break; > > case POWER_SUPPLY_STATUS_CHARGING: > > led_trigger_event(psy->charging_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); > > + led_mc_trigger_event(psy->charging_red_full_green_trig, > > + intensity_red, > > + 3, > > + LED_FULL); > > break; > > default: > > led_trigger_event(psy->charging_full_trig, LED_OFF); > > @@ -49,6 +59,10 @@ static void power_supply_update_bat_leds(struct power_supply *psy) > > led_trigger_event(psy->full_trig, LED_OFF); > > led_trigger_event(psy->charging_blink_full_solid_trig, > > LED_OFF); > > + led_mc_trigger_event(psy->charging_red_full_green_trig, > > + intensity_red, > > + 3, > > + LED_OFF); > > break; > > } > > } > > @@ -74,6 +88,11 @@ static int power_supply_create_bat_triggers(struct power_supply *psy) > > if (!psy->charging_blink_full_solid_trig_name) > > goto charging_blink_full_solid_failed; > > > > + psy->charging_red_full_green_trig_name = kasprintf(GFP_KERNEL, > > + "%s-charging-red-full-green", psy->desc->name); > > + if (!psy->charging_red_full_green_trig_name) > > + goto charging_red_full_green_failed; > > + > > led_trigger_register_simple(psy->charging_full_trig_name, > > &psy->charging_full_trig); > > led_trigger_register_simple(psy->charging_trig_name, > > @@ -82,9 +101,13 @@ static int power_supply_create_bat_triggers(struct power_supply *psy) > > &psy->full_trig); > > led_trigger_register_simple(psy->charging_blink_full_solid_trig_name, > > &psy->charging_blink_full_solid_trig); > > + led_trigger_register_simple(psy->charging_red_full_green_trig_name, > > + &psy->charging_red_full_green_trig); > > > > return 0; > > > > +charging_red_full_green_failed: > > + kfree(psy->charging_blink_full_solid_trig_name); > > charging_blink_full_solid_failed: > > kfree(psy->full_trig_name); > > full_failed: > > @@ -101,10 +124,12 @@ static void power_supply_remove_bat_triggers(struct power_supply *psy) > > led_trigger_unregister_simple(psy->charging_trig); > > led_trigger_unregister_simple(psy->full_trig); > > led_trigger_unregister_simple(psy->charging_blink_full_solid_trig); > > + led_trigger_unregister_simple(psy->charging_red_full_green_trig); > > kfree(psy->charging_blink_full_solid_trig_name); > > kfree(psy->full_trig_name); > > kfree(psy->charging_trig_name); > > kfree(psy->charging_full_trig_name); > > + kfree(psy->charging_red_full_green_trig_name); > > } > > > > /* Generated power specific LEDs triggers. */ > > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > > index c0992a77feea..1d7c0b43070f 100644 > > --- a/include/linux/power_supply.h > > +++ b/include/linux/power_supply.h > > @@ -318,6 +318,8 @@ struct power_supply { > > char *online_trig_name; > > struct led_trigger *charging_blink_full_solid_trig; > > char *charging_blink_full_solid_trig_name; > > + struct led_trigger *charging_red_full_green_trig; > > + char *charging_red_full_green_trig_name; > > #endif > > }; > > > > -- > > 2.44.0 > > > >
diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c index c7db29d5fcb8..bd9c8fec5870 100644 --- a/drivers/power/supply/power_supply_leds.c +++ b/drivers/power/supply/power_supply_leds.c @@ -22,6 +22,8 @@ static void power_supply_update_bat_leds(struct power_supply *psy) { union power_supply_propval status; + unsigned int intensity_green[3] = {255, 0, 0}; + unsigned int intensity_red[3] = {0, 0, 255}; if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) return; @@ -36,12 +38,20 @@ static void power_supply_update_bat_leds(struct power_supply *psy) /* Going from blink to LED on requires a LED_OFF event to stop blink */ led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); led_trigger_event(psy->charging_blink_full_solid_trig, LED_FULL); + led_mc_trigger_event(psy->charging_red_full_green_trig, + intensity_green, + 3, + LED_FULL); break; case POWER_SUPPLY_STATUS_CHARGING: led_trigger_event(psy->charging_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); + led_mc_trigger_event(psy->charging_red_full_green_trig, + intensity_red, + 3, + LED_FULL); break; default: led_trigger_event(psy->charging_full_trig, LED_OFF); @@ -49,6 +59,10 @@ static void power_supply_update_bat_leds(struct power_supply *psy) led_trigger_event(psy->full_trig, LED_OFF); led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); + led_mc_trigger_event(psy->charging_red_full_green_trig, + intensity_red, + 3, + LED_OFF); break; } } @@ -74,6 +88,11 @@ static int power_supply_create_bat_triggers(struct power_supply *psy) if (!psy->charging_blink_full_solid_trig_name) goto charging_blink_full_solid_failed; + psy->charging_red_full_green_trig_name = kasprintf(GFP_KERNEL, + "%s-charging-red-full-green", psy->desc->name); + if (!psy->charging_red_full_green_trig_name) + goto charging_red_full_green_failed; + led_trigger_register_simple(psy->charging_full_trig_name, &psy->charging_full_trig); led_trigger_register_simple(psy->charging_trig_name, @@ -82,9 +101,13 @@ static int power_supply_create_bat_triggers(struct power_supply *psy) &psy->full_trig); led_trigger_register_simple(psy->charging_blink_full_solid_trig_name, &psy->charging_blink_full_solid_trig); + led_trigger_register_simple(psy->charging_red_full_green_trig_name, + &psy->charging_red_full_green_trig); return 0; +charging_red_full_green_failed: + kfree(psy->charging_blink_full_solid_trig_name); charging_blink_full_solid_failed: kfree(psy->full_trig_name); full_failed: @@ -101,10 +124,12 @@ static void power_supply_remove_bat_triggers(struct power_supply *psy) led_trigger_unregister_simple(psy->charging_trig); led_trigger_unregister_simple(psy->full_trig); led_trigger_unregister_simple(psy->charging_blink_full_solid_trig); + led_trigger_unregister_simple(psy->charging_red_full_green_trig); kfree(psy->charging_blink_full_solid_trig_name); kfree(psy->full_trig_name); kfree(psy->charging_trig_name); kfree(psy->charging_full_trig_name); + kfree(psy->charging_red_full_green_trig_name); } /* Generated power specific LEDs triggers. */ diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c0992a77feea..1d7c0b43070f 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -318,6 +318,8 @@ struct power_supply { char *online_trig_name; struct led_trigger *charging_blink_full_solid_trig; char *charging_blink_full_solid_trig_name; + struct led_trigger *charging_red_full_green_trig; + char *charging_red_full_green_trig_name; #endif };
Add a charging_red_full_green LED trigger and the trigger is based on led_mc_trigger_event() which can set an RGB LED when the trigger is triggered. The LED will show red when the battery status is charging. The LED will show green when the battery status is full. Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/T/#t Signed-off-by: Kate Hsuan <hpa@redhat.com> --- drivers/power/supply/power_supply_leds.c | 25 ++++++++++++++++++++++++ include/linux/power_supply.h | 2 ++ 2 files changed, 27 insertions(+)