KTD2026 indicator LED for X86 Xiaomi Pad2
Subsystems (5)
v5 cover KTD2026 indicator LED for X86 Xiaomi Pad2
This patch added the support for Xiaomi Pad2 indicator LED. This work included:
1. Added the KTD2026 swnode description to describe the LED controller.
2. Migrated the original driver to fwnode to support x86 platform.
3. Support for multi-color LED trigger event.
4. The LED will be red when charging and the LED will be green when the battery is full.
Moreover, the LED trigger is set to the new trigger, called "bq27520-0-charging-red-full-green" for Xiaomi Pad2 so the LED will be red when charging and the LED will be green when the battery is full.
The new LED API led_mc_trigger_event() can be found in the following URL.
https://lore.kernel.org/linux-leds/[email protected]/T/#t
--
Changes in v5:
1. Fix swnode LED color settings.
2. Improve the driver based on the comments.
3. Introduce a LED new API- led_mc_trigger_event() to make the LED color can be changed according to the trigger.
4. Introduced a new trigger "charging-red-full-green". The LED will be red when charging and the the LED will be green when the battery is full.
5. Set the default trigger to "bq27520-0-charging-red-full-green" for Xiaomi Pad2.
Changes in v4:
1. Fix double casting.
2. Since force casting a pointer value to int will trigger a compiler warning, the type of num_leds was changed to unsigned long.
Changes in v3:
1. Drop the patch "leds-ktd202x: Skip regulator settings for Xiaomi pad2"
Changes in v2:
1. Typo and style fixes.
2. The patch 0003 skips all the regulator setup for Xiaomi pad2 since KTD2026 on Xiaomi pad2 is already powered by BP25890RTWR. So, the sleep can be removed when removing the module.
Hans de Goede (2):
leds: core: Add led_mc_set_brightness() function
leds: trigger: Add led_mc_trigger_event() function
Kate Hsuan (4):
platform: x86-android-tablets: other: Add swnode for Xiaomi pad2
indicator LED
leds: rgb: leds-ktd202x: Get device properties through fwnode to
support ACPI
power: supply: power-supply-leds: Add charging_red_full_green trigger
for RGB LED
platform: x86-android-tablets: others: Set the LED trigger to
charging_red_full_green for Xiaomi pad2
drivers/leds/led-class-multicolor.c | 1 + drivers/leds/led-core.c | 31 +++++++ drivers/leds/led-triggers.c | 20 +++++ drivers/leds/rgb/Kconfig | 1 - drivers/leds/rgb/leds-ktd202x.c | 75 ++++++++++------- .../platform/x86/x86-android-tablets/other.c | 82 +++++++++++++++++++ .../x86/x86-android-tablets/shared-psy-info.h | 2 + drivers/power/supply/power_supply_leds.c | 25 ++++++ include/linux/leds.h | 26 ++++++ include/linux/power_supply.h | 2 + 10 files changed, 235 insertions(+), 30 deletions(-)
Signature · 1 line
2.44.0
PATCH v5 1/6 platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED
There is a KTD2026 LED controller to manage the indicator LED for Xiaomi pad2. The ACPI for it is not properly made so the kernel can't get a correct description of it.
This work add a description for this RGB LED controller and also set a trigger to indicate the chaging event (bq27520-0-charging). When it is charging, the indicator LED will be turn on.
--- .../platform/x86/x86-android-tablets/other.c | 82 +++++++++++++++++++ .../x86/x86-android-tablets/shared-psy-info.h | 2 + 2 files changed, 84 insertions(+)
drivers/platform/x86/x86-android-tablets/other.c +82 -0
@@ -13,6 +13,8 @@#include <linux/input.h> #include <linux/platform_device.h> +#include <dt-bindings/leds/common.h> +#include "shared-psy-info.h" #include "x86-android-tablets.h"
@@ -593,6 +595,83 @@ const struct x86_dev_info whitelabel_tm800a550l_info __initconst = { .gpiod_lookup_tables = whitelabel_tm800a550l_gpios, }; +/* +* The fwnode for ktd2026 on Xaomi pad2. It composed of a RGB LED node +* with three subnodes for each color (B/G/R). The RGB LED node is named +* "multi-led" to align with the name in the device tree. +*/ + +/* main fwnode for ktd2026 */ +static const struct software_node ktd2026_node = { + .name ="ktd2026" +}; + +static const struct property_entry ktd2026_rgb_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,0 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_RGB ), +PROPERTY_ENTRY_STRING ("function" ,"indicator" ), +PROPERTY_ENTRY_STRING ("linux,default-trigger" ,"bq27520-0-charging" ), + { } +}; + +static const struct software_node ktd2026_rgb_led_node = { + .name ="multi-led" , + .properties = ktd2026_rgb_led_props, + .parent = &ktd2026_node, +}; + +static const struct property_entry ktd2026_blue_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,0 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_BLUE ), + { } +}; + +static const struct software_node ktd2026_blue_led_node = { + .properties = ktd2026_blue_led_props, + .parent = &ktd2026_rgb_led_node, +}; + +static const struct property_entry ktd2026_green_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,1 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_GREEN ), + { } +}; + +static const struct software_node ktd2026_green_led_node = { + .properties = ktd2026_green_led_props, + .parent = &ktd2026_rgb_led_node, +}; + +static const struct property_entry ktd2026_red_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,2 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_RED ), + { } +}; + +static const struct software_node ktd2026_red_led_node = { + .properties = ktd2026_red_led_props, + .parent = &ktd2026_rgb_led_node, +}; + +static const struct software_node *ktd2026_node_group[] = { + &ktd2026_node, + &ktd2026_rgb_led_node, + &ktd2026_green_led_node, + &ktd2026_blue_led_node, + &ktd2026_red_led_node, +NULL +}; + +static int __init xiaomi_mipad2_init (void ) +{ +return software_node_register_node_group (ktd2026_node_group); +} + +static void xiaomi_mipad2_exit (void ) +{ +software_node_unregister_node_group (ktd2026_node_group); +} +/* * If the EFI bootloader is not Xiaomi's own signed Android loader, then the * Xiaomi Mi Pad 2 X86 tablet sets OSID in the DSDT to 1 (Windows), causing
@@ -616,6 +695,7 @@ static const struct x86_i2c_client_info xiaomi_mipad2_i2c_clients[] __initconst .type = "ktd2026", .addr = 0x30, .dev_name = "ktd2026", + .swnode = &ktd2026_node, }, .adapter_path = "\\_SB_.PCI0.I2C3", },
@@ -624,4 +704,6 @@ static const struct x86_i2c_client_info xiaomi_mipad2_i2c_clients[] __initconstconst struct x86_dev_info xiaomi_mipad2_info__initconst = { .i2c_client_info = xiaomi_mipad2_i2c_clients, .i2c_client_count =ARRAY_SIZE (xiaomi_mipad2_i2c_clients), + .init = xiaomi_mipad2_init, + .exit = xiaomi_mipad2_exit, };
drivers/platform/x86/x86-android-tablets/shared-psy-info.h +2 -0
@@ -29,4 +29,6 @@ extern const char * const bq24190_modules[];extern const struct platform_device_info int3496_pdevs[];extern struct gpiod_lookup_table int3496_reference_gpios; +extern const struct software_node ktd2026_leds_node; +#endif
Signature · 1 line
2.44.0
Re: [PATCH v5 1/6] platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED
Hi Kate,
Quoted 9 lines · Kate Hsuan
There is a KTD2026 LED controller to manage the indicator LED for Xiaomi pad2. The ACPI for it is not properly made so the kernel can't get a correct description of it.
This work add a description for this RGB LED controller and also set a trigger to indicate the chaging event (bq27520-0-charging). When it is charging, the indicator LED will be turn on.
Signed-off-by Kate Hsuan <[email protected]>
Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
I will also merge [PATCH v5 6/6] platform: x86-android-tablets:
others: Set the LED trigger to charging_red_full_green for Xiaomi pad2"
Once the new power_supply trigger patch this relies on has been accepted.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 128 lines
--- .../platform/x86/x86-android-tablets/other.c | 82 +++++++++++++++++++ .../x86/x86-android-tablets/shared-psy-info.h | 2 + 2 files changed, 84 insertions(+)drivers/platform/x86/x86-android-tablets/other.c +82
-0@@ -13,6 +13,8 @@#include <linux/input.h> #include <linux/platform_device.h> +#include <dt-bindings/leds/common.h> +#include "shared-psy-info.h" #include "x86-android-tablets.h" @@ -593,6 +595,83 @@ const struct x86_dev_info whitelabel_tm800a550l_info __initconst = { .gpiod_lookup_tables = whitelabel_tm800a550l_gpios, }; +/* +* The fwnode for ktd2026 on Xaomi pad2. It composed of a RGB LED node +* with three subnodes for each color (B/G/R). The RGB LED node is named +* "multi-led" to align with the name in the device tree. +*/ + +/* main fwnode for ktd2026 */ +static const struct software_node ktd2026_node = { + .name ="ktd2026" +}; + +static const struct property_entry ktd2026_rgb_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,0 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_RGB ), +PROPERTY_ENTRY_STRING ("function" ,"indicator" ), +PROPERTY_ENTRY_STRING ("linux,default-trigger" ,"bq27520-0-charging" ), + { } +}; + +static const struct software_node ktd2026_rgb_led_node = { + .name ="multi-led" , + .properties = ktd2026_rgb_led_props, + .parent = &ktd2026_node, +}; + +static const struct property_entry ktd2026_blue_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,0 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_BLUE ), + { } +}; + +static const struct software_node ktd2026_blue_led_node = { + .properties = ktd2026_blue_led_props, + .parent = &ktd2026_rgb_led_node, +}; + +static const struct property_entry ktd2026_green_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,1 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_GREEN ), + { } +}; + +static const struct software_node ktd2026_green_led_node = { + .properties = ktd2026_green_led_props, + .parent = &ktd2026_rgb_led_node, +}; + +static const struct property_entry ktd2026_red_led_props[] = { +PROPERTY_ENTRY_U32 ("reg" ,2 ), +PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_RED ), + { } +}; + +static const struct software_node ktd2026_red_led_node = { + .properties = ktd2026_red_led_props, + .parent = &ktd2026_rgb_led_node, +}; + +static const struct software_node *ktd2026_node_group[] = { + &ktd2026_node, + &ktd2026_rgb_led_node, + &ktd2026_green_led_node, + &ktd2026_blue_led_node, + &ktd2026_red_led_node, +NULL +}; + +static int __init xiaomi_mipad2_init (void ) +{ +return software_node_register_node_group (ktd2026_node_group); +} + +static void xiaomi_mipad2_exit (void ) +{ +software_node_unregister_node_group (ktd2026_node_group); +} +/* * If the EFI bootloader is not Xiaomi's own signed Android loader, then the * Xiaomi Mi Pad 2 X86 tablet sets OSID in the DSDT to 1 (Windows), causing @@ -616,6 +695,7 @@ static const struct x86_i2c_client_info xiaomi_mipad2_i2c_clients[] __initconst .type = "ktd2026", .addr = 0x30, .dev_name = "ktd2026", + .swnode = &ktd2026_node, }, .adapter_path = "\\_SB_.PCI0.I2C3", },@@ -624,4 +704,6 @@ static const struct x86_i2c_client_info xiaomi_mipad2_i2c_clients[] __initconstconst struct x86_dev_info xiaomi_mipad2_info__initconst = { .i2c_client_info = xiaomi_mipad2_i2c_clients, .i2c_client_count =ARRAY_SIZE (xiaomi_mipad2_i2c_clients), + .init = xiaomi_mipad2_init, + .exit = xiaomi_mipad2_exit, };drivers/platform/x86/x86-android-tablets/shared-psy-info.h +2
-0@@ -29,4 +29,6 @@ extern const char * const bq24190_modules[];extern const struct platform_device_info int3496_pdevs[];extern struct gpiod_lookup_table int3496_reference_gpios; +extern const struct software_node ktd2026_leds_node; +#endif
Re: [PATCH v5 1/6] platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED
Quoted 18 lines · Hans de Goede
Quoted 9 lines · Kate Hsuan
There is a KTD2026 LED controller to manage the indicator LED for Xiaomi pad2. The ACPI for it is not properly made so the kernel can't get a correct description of it.
This work add a description for this RGB LED controller and also set a trigger to indicate the chaging event (bq27520-0-charging). When it is charging, the indicator LED will be turn on.
Signed-off-by Kate Hsuan <[email protected]>Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hansI will also merge [PATCH v5 6/6] platform: x86-android-tablets:
others: Set the LED trigger tocharging_red_full_greenfor Xiaomi pad2"
Quoted 7 lines
Once the new
power_supplytrigger patch this relies on has been accepted.Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
I believe I have commented on the "RESEND" version.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v5 1/6] platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED
Hi Hans,
Quoted 23 lines · Andy Shevchenko
Quoted 21 lines · Hans de Goede
Quoted 9 lines · Kate Hsuan
There is a KTD2026 LED controller to manage the indicator LED for Xiaomi pad2. The ACPI for it is not properly made so the kernel can't get a correct description of it.
This work add a description for this RGB LED controller and also set a trigger to indicate the chaging event (bq27520-0-charging). When it is charging, the indicator LED will be turn on.
Signed-off-by Kate Hsuan <[email protected]>Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hansI will also merge [PATCH v5 6/6] platform: x86-android-tablets:
others: Set the LED trigger tocharging_red_full_greenfor Xiaomi pad2"Once the new
power_supplytrigger patch this relies on has been accepted.
Quoted 7 lines
Quoted 4 lines
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
I believe I have commented on the "RESEND" version.
Thank you for your reviewing.
Please review the RESEND patch and I'll fix them according to Andy's comments.
Quoted 5 lines
--
With Best Regards,
Andy Shevchenko
Signature · 2 lines
BR, Kate
Re: [PATCH v5 1/6] platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED
Hi,
Quoted 33 lines · Kate Hsuan
Hi Hans,
Quoted 29 lines · Andy Shevchenko
Quoted 18 lines · Hans de Goede
Quoted 9 lines · Kate Hsuan
There is a KTD2026 LED controller to manage the indicator LED for Xiaomi pad2. The ACPI for it is not properly made so the kernel can't get a correct description of it.
This work add a description for this RGB LED controller and also set a trigger to indicate the chaging event (bq27520-0-charging). When it is charging, the indicator LED will be turn on.
Signed-off-by Kate Hsuan <[email protected]>Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hansI will also merge [PATCH v5 6/6] platform: x86-android-tablets:
others: Set the LED trigger tocharging_red_full_greenfor Xiaomi pad2"Quoted 7 lines
Once the new
power_supplytrigger patch this relies on has been accepted.Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
I believe I have commented on the "RESEND" version.
Right, sorry. Since there were just a few trivial comments I've fixed them up in my review-hans branch now, thank you for the review.
Quoted 2 lines
Thank you for your reviewing.
Please review the RESEND patch and I'll fix them according to Andy's comments.
No need to do a new version I've squashed fixed for Andy's remarks + Andy's commit msg remarks into the version in my review-hans branch.
Note I'm going offline for a long weekend and I won't be replying to emails until next week Tuesday.
Regards,
Hans
PATCH v5 2/6 leds: rgb: leds-ktd202x: Get device properties through fwnode to support ACPI
In reply to Kate HsuanThis LED controller also installed on a Xiaomi pad2 and it is a x86 platform. The original driver is based on device tree and can't be used for this ACPI based system. This patch migrated the driver to use fwnode to access the properties. Moreover, the fwnode API supports device tree so this work won't effect the original implementations.
--- drivers/leds/rgb/Kconfig | 1 - drivers/leds/rgb/leds-ktd202x.c | 75 ++++++++++++++++++++------------- 2 files changed, 46 insertions(+), 30 deletions(-)
drivers/leds/rgb/Kconfig +0 -1
@@ -17,7 +17,6 @@ config LEDS_GROUP_MULTICOLOR config LEDS_KTD202X tristate "LED support for KTD202x Chips" depends on I2C - depends on OF select REGMAP_I2C help This option enables support for the Kinetic KTD2026/KTD2027
drivers/leds/rgb/leds-ktd202x.c +46 -29
183 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH v5 3/6 leds: core: Add led_mc_set_brightness() function
In reply to Kate HsuanFrom: Hans de Goede <[email protected]>
Add a new led_mc_set_brightness() function for in kernel color/brightness changing of multi-color LEDs.
led-class-multicolor can be build as a module and led_mc_set_brightness() will have builtin callers, so put led_mc_set_brightness() inside led-core instead, just like how led_set_brightness() is part of the core and not of the led-class object.
This also adds a new LED_MULTI_COLOR led_classdev flag to allow led_mc_set_brightness() to verify that it is operating on a multi-color LED classdev, avoiding casting the passed in LED classdev to a multi-color LED classdev, when it actually is not a multi-color LED.
--- drivers/leds/led-class-multicolor.c | 1 + drivers/leds/led-core.c | 31 +++++++++++++++++++++++++++++ include/linux/leds.h | 20 +++++++++++++++++++ 3 files changed, 52 insertions(+)
drivers/leds/led-class-multicolor.c +1 -0
@@ -134,6 +134,7 @@ int led_classdev_multicolor_register_ext(struct device *parent,return -EINVAL ; led_cdev = &mcled_cdev->led_cdev; + led_cdev->flags |=LED_MULTI_COLOR ; mcled_cdev->led_cdev.groups = led_multicolor_groups;return led_classdev_register_ext (parent, led_cdev, init_data);
drivers/leds/led-core.c +31 -0
@@ -8,6 +8,7 @@*/ #include <linux/kernel.h> +#include <linux/led-class-multicolor.h> #include <linux/leds.h> #include <linux/list.h> #include <linux/module.h>
@@ -362,6 +363,36 @@ int led_set_brightness_sync(struct led_classdev *led_cdev, unsigned int value) }EXPORT_SYMBOL_GPL (led_set_brightness_sync); +/* +* This is a led-core function because just like led_set_brightness() +* it is used in kernel by e.g. triggers. +*/ +void led_mc_set_brightness (struct led_classdev *led_cdev, +unsigned int *intensity_value,unsigned int num_colors, +unsigned int brightness) +{ +struct led_classdev_mc *mcled_cdev; +unsigned int i; + +if (!(led_cdev->flags &LED_MULTI_COLOR )) { +dev_err_once (led_cdev->dev,"%s: error not a multi-color LED\n" , __func__); +return ; + } + + mcled_cdev =lcdev_to_mccdev (led_cdev); +if (num_colors != mcled_cdev->num_colors) { +dev_err_once (led_cdev->dev,"%s: error num_colors mismatch %d != %d\n" , + __func__, num_colors, mcled_cdev->num_colors); +return ; + } + +for (i =0 ; i < mcled_cdev->num_colors; i++) + mcled_cdev->subled_info[i].intensity = intensity_value[i]; + +led_set_brightness (led_cdev, brightness); +} +EXPORT_SYMBOL_GPL (led_mc_set_brightness); +int led_update_brightness (struct led_classdev *led_cdev) {int ret;
include/linux/leds.h +20 -0
@@ -115,6 +115,7 @@ struct led_classdev {#define LED_BRIGHT_HW_CHANGED BIT(21)#define LED_RETAIN_AT_SHUTDOWN BIT(22)#define LED_INIT_DEFAULT_TRIGGER BIT(23) +#define LED_MULTI_COLOR BIT(24)/* set_brightness_work / blink_timer flags, atomic, private. */ unsigned long work_flags;
@@ -392,6 +393,25 @@ void led_set_brightness(struct led_classdev *led_cdev, unsigned int brightness);*/ int led_set_brightness_sync (struct led_classdev *led_cdev,unsigned int value); +/** +* led_mc_set_brightness - set mc LED color intensity values and brightness +* @led_cdev: the LED to set +* @intensity_value: array of per color intensity values to set +* @num_colors: amount of entries in intensity_value array +* @brightness: the brightness to set the LED to +* +* Set a multi-color LED's per color intensity values and brightness. +* If necessary, this cancels the software blink timer. This function is +* guaranteed not to sleep. +* +* Calling this function on a non multi-color led_classdev or with the wrong +* num_colors value is an error. In this case an error will be logged once +* and the call will do nothing. +*/ +void led_mc_set_brightness (struct led_classdev *led_cdev, +unsigned int *intensity_value,unsigned int num_colors, +unsigned int brightness); +/** * led_update_brightness - update LED brightness * @led_cdev: the LED to query
Signature · 1 line
2.44.0
PATCH v5 4/6 leds: trigger: Add led_mc_trigger_event() function
In reply to Kate HsuanFrom: Hans de Goede <[email protected]>
Add a new led_mc_trigger_event() function for triggers which want to change the color of a multi-color LED based on their trigger conditions.
--- drivers/leds/led-triggers.c | 20 ++++++++++++++++++++ include/linux/leds.h | 6 ++++++ 2 files changed, 26 insertions(+)
drivers/leds/led-triggers.c +20 -0
@@ -380,6 +380,26 @@ void led_trigger_event(struct led_trigger *trig, }EXPORT_SYMBOL_GPL (led_trigger_event); +void led_mc_trigger_event (struct led_trigger *trig, +unsigned int *intensity_value,unsigned int num_colors, +enum led_brightness brightness) +{ +struct led_classdev *led_cdev; + +if (!trig) +return ; + +rcu_read_lock (); +list_for_each_entry_rcu (led_cdev, &trig->led_cdevs, trig_list) { +if (!(led_cdev->flags &LED_MULTI_COLOR )) +continue ; + +led_mc_set_brightness (led_cdev, intensity_value, num_colors, brightness); + } +rcu_read_unlock (); +} +EXPORT_SYMBOL_GPL (led_mc_trigger_event); + static void led_trigger_blink_setup(struct led_trigger *trig, unsigned long delay_on, unsigned long delay_off,
include/linux/leds.h +6 -0
@@ -526,6 +526,9 @@ void led_trigger_register_simple(const char *name, struct led_trigger **trigger);void led_trigger_unregister_simple (struct led_trigger *trigger);void led_trigger_event (struct led_trigger *trigger,enum led_brightness event); +void led_mc_trigger_event (struct led_trigger *trig, +unsigned int *intensity_value,unsigned int num_colors, +enum led_brightness brightness);void led_trigger_blink (struct led_trigger *trigger,unsigned long delay_on,unsigned long delay_off); void led_trigger_blink_oneshot(struct led_trigger *trigger,
@@ -562,6 +565,9 @@ static inline void led_trigger_register_simple(const char *name,static inline void led_trigger_unregister_simple (struct led_trigger *trigger) {}static inline void led_trigger_event (struct led_trigger *trigger,enum led_brightness event) {} +static inline void led_mc_trigger_event (struct led_trigger *trig, +unsigned int *intensity_value,unsigned int num_colors, +enum led_brightness brightness) {}static inline void led_trigger_blink (struct led_trigger *trigger,unsigned long delay_on,unsigned long delay_off) {}
Signature · 1 line
2.44.0
PATCH v5 5/6 power: supply: power-supply-leds: Add charging_red_full_green trigger for RGB LED
In reply to Kate HsuanAdd 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.
--- drivers/power/supply/power_supply_leds.c | 25 ++++++++++++++++++++++++ include/linux/power_supply.h | 2 ++ 2 files changed, 27 insertions(+)
drivers/power/supply/power_supply_leds.c +25 -0
@@ -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. */
include/linux/power_supply.h +2 -0
@@ -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 };
Signature · 1 line
2.44.0
PATCH v5 6/6 platform: x86-android-tablets: others: Set the LED trigger to charging_red_full_green for Xiaomi pad2
In reply to Kate HsuanSet the default trigger to bq27520-0-charging-red-full-green. The LED will show red when the battery is charging. The LED will show green when the battery status is full.
--- drivers/platform/x86/x86-android-tablets/other.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/x86-android-tablets/other.c +1 -1
@@ -610,7 +610,7 @@ static const struct property_entry ktd2026_rgb_led_props[] = {PROPERTY_ENTRY_U32 ("reg" ,0 ),PROPERTY_ENTRY_U32 ("color" ,LED_COLOR_ID_RGB ),PROPERTY_ENTRY_STRING ("function" ,"indicator" ), - PROPERTY_ENTRY_STRING("linux,default-trigger", "bq27520-0-charging"), + PROPERTY_ENTRY_STRING("linux,default-trigger", "bq27520-0-charging-red-full-green"), { } };
Signature · 1 line
2.44.0