96bfafbc7d
commit e4484643991e0f6b89060092563f0dbab9450cbb upstream.
When a battery's status changes from charging to full then
the charging-blink-full-solid trigger tries to change
the LED from blinking to solid/on.
As is documented in include/linux/leds.h to deactivate blinking /
to make the LED solid a LED_OFF must be send:
"""
* Deactivate blinking again when the brightness is set to LED_OFF
* via the brightness_set() callback.
"""
led_set_brighness() calls with a brightness value other then 0 / LED_OFF
merely change the brightness of the LED in its on state while it is
blinking.
So power_supply_update_bat_leds() must first send a LED_OFF event
before the LED_FULL to disable blinking.
Fixes: 6501f728c5
("power_supply: Add new LED trigger charging-blink-solid-full")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
171 lines
4.9 KiB
C
171 lines
4.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* LEDs triggers for power supply class
|
|
*
|
|
* Copyright © 2007 Anton Vorontsov <cbou@mail.ru>
|
|
* Copyright © 2004 Szabolcs Gyurko
|
|
* Copyright © 2003 Ian Molton <spyro@f2s.com>
|
|
*
|
|
* Modified: 2004, Oct Szabolcs Gyurko
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/power_supply.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "power_supply.h"
|
|
|
|
/* Battery specific LEDs triggers. */
|
|
|
|
static void power_supply_update_bat_leds(struct power_supply *psy)
|
|
{
|
|
union power_supply_propval status;
|
|
unsigned long delay_on = 0;
|
|
unsigned long delay_off = 0;
|
|
|
|
if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))
|
|
return;
|
|
|
|
dev_dbg(&psy->dev, "%s %d\n", __func__, status.intval);
|
|
|
|
switch (status.intval) {
|
|
case POWER_SUPPLY_STATUS_FULL:
|
|
led_trigger_event(psy->charging_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 */
|
|
led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF);
|
|
led_trigger_event(psy->charging_blink_full_solid_trig, 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,
|
|
&delay_on, &delay_off);
|
|
break;
|
|
default:
|
|
led_trigger_event(psy->charging_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,
|
|
LED_OFF);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static int power_supply_create_bat_triggers(struct power_supply *psy)
|
|
{
|
|
psy->charging_full_trig_name = kasprintf(GFP_KERNEL,
|
|
"%s-charging-or-full", psy->desc->name);
|
|
if (!psy->charging_full_trig_name)
|
|
goto charging_full_failed;
|
|
|
|
psy->charging_trig_name = kasprintf(GFP_KERNEL,
|
|
"%s-charging", psy->desc->name);
|
|
if (!psy->charging_trig_name)
|
|
goto charging_failed;
|
|
|
|
psy->full_trig_name = kasprintf(GFP_KERNEL, "%s-full", psy->desc->name);
|
|
if (!psy->full_trig_name)
|
|
goto full_failed;
|
|
|
|
psy->charging_blink_full_solid_trig_name = kasprintf(GFP_KERNEL,
|
|
"%s-charging-blink-full-solid", psy->desc->name);
|
|
if (!psy->charging_blink_full_solid_trig_name)
|
|
goto charging_blink_full_solid_failed;
|
|
|
|
led_trigger_register_simple(psy->charging_full_trig_name,
|
|
&psy->charging_full_trig);
|
|
led_trigger_register_simple(psy->charging_trig_name,
|
|
&psy->charging_trig);
|
|
led_trigger_register_simple(psy->full_trig_name,
|
|
&psy->full_trig);
|
|
led_trigger_register_simple(psy->charging_blink_full_solid_trig_name,
|
|
&psy->charging_blink_full_solid_trig);
|
|
|
|
return 0;
|
|
|
|
charging_blink_full_solid_failed:
|
|
kfree(psy->full_trig_name);
|
|
full_failed:
|
|
kfree(psy->charging_trig_name);
|
|
charging_failed:
|
|
kfree(psy->charging_full_trig_name);
|
|
charging_full_failed:
|
|
return -ENOMEM;
|
|
}
|
|
|
|
static void power_supply_remove_bat_triggers(struct power_supply *psy)
|
|
{
|
|
led_trigger_unregister_simple(psy->charging_full_trig);
|
|
led_trigger_unregister_simple(psy->charging_trig);
|
|
led_trigger_unregister_simple(psy->full_trig);
|
|
led_trigger_unregister_simple(psy->charging_blink_full_solid_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);
|
|
}
|
|
|
|
/* Generated power specific LEDs triggers. */
|
|
|
|
static void power_supply_update_gen_leds(struct power_supply *psy)
|
|
{
|
|
union power_supply_propval online;
|
|
|
|
if (power_supply_get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online))
|
|
return;
|
|
|
|
dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval);
|
|
|
|
if (online.intval)
|
|
led_trigger_event(psy->online_trig, LED_FULL);
|
|
else
|
|
led_trigger_event(psy->online_trig, LED_OFF);
|
|
}
|
|
|
|
static int power_supply_create_gen_triggers(struct power_supply *psy)
|
|
{
|
|
psy->online_trig_name = kasprintf(GFP_KERNEL, "%s-online",
|
|
psy->desc->name);
|
|
if (!psy->online_trig_name)
|
|
return -ENOMEM;
|
|
|
|
led_trigger_register_simple(psy->online_trig_name, &psy->online_trig);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void power_supply_remove_gen_triggers(struct power_supply *psy)
|
|
{
|
|
led_trigger_unregister_simple(psy->online_trig);
|
|
kfree(psy->online_trig_name);
|
|
}
|
|
|
|
/* Choice what triggers to create&update. */
|
|
|
|
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);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
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);
|
|
}
|