KTD2026 indicator LED for X86 Xiaomi Pad2
Subsystems (5)
v7 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 shows orange when charging and the LED shows green when the battery is full.
Moreover, the LED trigger is set to the new trigger, called "bq27520-0-charging-orange-full-green" for Xiaomi Pad2 so the LED shows orange when charging and the LED shows green when the battery is full.
--
Changes in v7:
1. Platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED was included in Hans' branch.
2. Included the tags from the previous version in the commit message.
3. Fixed the comma issue for the structure initialiser.
Changes in v6:
1. The I2C ID table was moved to a separate patch.
2. The LED shows orange when charging.
3. The trigger name was renamed to charging-orange-full-green.
4. The default trigger of Xiaomi Pad2 is "bq27520-0-charging-orange-full-green".
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):
leds: rgb: leds-ktd202x: Get device properties through fwnode to
support ACPI
leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027
power: supply: power-supply-leds: Add charging_orange_full_green
trigger for RGB LED
platform: x86-android-tablets: others: Set the LED trigger to
charging_orange_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 | 72 +++++++++++-------- .../platform/x86/x86-android-tablets/other.c | 2 +- drivers/power/supply/power_supply_leds.c | 26 +++++++ include/linux/leds.h | 26 +++++++ include/linux/power_supply.h | 2 + 9 files changed, 149 insertions(+), 32 deletions(-)
Signature · 1 line
2.44.0
PATCH v7 1/6 leds: rgb: leds-ktd202x: Get device properties through fwnode to support ACPI
This LED controller is installed on a Xiaomi pad2 and it is an x86 platform. The original driver is based on the 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 the device tree so this work won't affect the original implementations.
--- drivers/leds/rgb/Kconfig | 1 - drivers/leds/rgb/leds-ktd202x.c | 64 +++++++++++++++++---------------- 2 files changed, 34 insertions(+), 31 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 +34 -30
169 lines not on this page · raw message
Signature · 1 line
2.44.0
Re: [PATCH v7 1/6] leds: rgb: leds-ktd202x: Get device properties through fwnode to support ACPI
Hi,
Quoted 8 lines · Kate Hsuan
This LED controller is installed on a Xiaomi pad2 and it is an x86 platform. The original driver is based on the 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 the device tree so this work won't affect the original implementations.
Signed-off-by Kate Hsuan <[email protected]>
Thanks, patch looks good to me:
Regards,
Hans
Quoted 201 lines
--- drivers/leds/rgb/Kconfig | 1 - drivers/leds/rgb/leds-ktd202x.c | 64 +++++++++++++++++---------------- 2 files changed, 34 insertions(+), 31 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/KTD2027drivers/leds/rgb/leds-ktd202x.c +34
-30@@ -99,7 +99,7 @@ struct ktd202x {struct device *dev;struct regmap *regmap;bool enabled; -int num_leds; +unsigned long num_leds; struct ktd202x_led leds[] __counted_by(num_leds); };@@ -381,16 +381,19 @@ static int ktd202x_blink_mc_set(struct led_classdev *cdev, mc->num_colors); } -static int ktd202x_setup_led_rgb (struct ktd202x *chip,struct device_node *np, +static int ktd202x_setup_led_rgb (struct ktd202x *chip,struct fwnode_handle *fwnode,struct ktd202x_led *led,struct led_init_data *init_data) { +struct fwnode_handle *child;struct led_classdev *cdev; -struct device_node *child;struct mc_subled *info;int num_channels;int i =0 ; - num_channels =of_get_available_child_count (np); + num_channels =0 ; +fwnode_for_each_available_child_node (fwnode, child) + num_channels++; +if (!num_channels || num_channels > chip->num_leds)return -EINVAL ;@@ -398,22 +401,22 @@ static int ktd202x_setup_led_rgb(struct ktd202x *chip, struct device_node *np,if (!info)return -ENOMEM ; -for_each_available_child_of_node (np, child) { +fwnode_for_each_available_child_node (fwnode, child) {u32 mono_color;u32 reg;int ret; - ret =of_property_read_u32 (child,"reg" , ®); + ret =fwnode_property_read_u32 (child,"reg" , ®);if (ret !=0 || reg >= chip->num_leds) { -dev_err (chip->dev,"invalid 'reg' of %pOFn\n" , child); -of_node_put (child); -return -EINVAL ; +dev_err (chip->dev,"invalid 'reg' of %pfw\n" , child); +fwnode_handle_put (child); +return ret; } - ret =of_property_read_u32 (child,"color" , &mono_color); + ret =fwnode_property_read_u32 (child,"color" , &mono_color);if (ret <0 && ret != -EINVAL ) { -dev_err (chip->dev,"failed to parse 'color' of %pOF\n" , child); -of_node_put (child); +dev_err (chip->dev,"failed to parse 'color' of %pfw\n" , child); +fwnode_handle_put (child);return ret; }@@ -433,16 +436,16 @@ static int ktd202x_setup_led_rgb(struct ktd202x *chip, struct device_node *np,return devm_led_classdev_multicolor_register_ext (chip->dev, &led->mcdev, init_data); } -static int ktd202x_setup_led_single (struct ktd202x *chip,struct device_node *np, +static int ktd202x_setup_led_single (struct ktd202x *chip,struct fwnode_handle *fwnode,struct ktd202x_led *led,struct led_init_data *init_data) {struct led_classdev *cdev;u32 reg;int ret; - ret =of_property_read_u32 (np,"reg" , ®); + ret =fwnode_property_read_u32 (fwnode,"reg" , ®);if (ret !=0 || reg >= chip->num_leds) { -dev_err (chip->dev,"invalid 'reg' of %pOFn\n" , np); +dev_err (chip->dev,"invalid 'reg' of %pfw\n" , fwnode);return -EINVAL ; } led->index = reg;@@ -454,7 +457,7 @@ static int ktd202x_setup_led_single(struct ktd202x *chip, struct device_node *npreturn devm_led_classdev_register_ext (chip->dev, &led->cdev, init_data); } -static int ktd202x_add_led (struct ktd202x *chip,struct device_node *np,unsigned int index) +static int ktd202x_add_led (struct ktd202x *chip,struct fwnode_handle *fwnode,unsigned int index) {struct ktd202x_led *led = &chip->leds[index];struct led_init_data init_data = {};@@ -463,21 +466,21 @@ static int ktd202x_add_led(struct ktd202x *chip, struct device_node *np, unsigneint ret;/* Color property is optional in single color case */ - ret =of_property_read_u32 (np,"color" , &color); + ret =fwnode_property_read_u32 (fwnode,"color" , &color);if (ret <0 && ret != -EINVAL ) { -dev_err (chip->dev,"failed to parse 'color' of %pOF\n" , np); +dev_err (chip->dev,"failed to parse 'color' of %pfw\n" , fwnode);return ret; } led->chip = chip; - init_data.fwnode =of_fwnode_handle (np); + init_data.fwnode = fwnode;if (color ==LED_COLOR_ID_RGB ) { cdev = &led->mcdev.led_cdev; - ret =ktd202x_setup_led_rgb (chip, np, led, &init_data); + ret =ktd202x_setup_led_rgb (chip, fwnode, led, &init_data); }else { cdev = &led->cdev; - ret =ktd202x_setup_led_single (chip, np, led, &init_data); + ret =ktd202x_setup_led_single (chip, fwnode, led, &init_data); }if (ret) {@@ -490,15 +493,14 @@ static int ktd202x_add_led(struct ktd202x *chip, struct device_node *np, unsignereturn 0 ; } -static int ktd202x_probe_dt (struct ktd202x *chip) +static int ktd202x_probe_fw (struct ktd202x *chip) { -struct device_node *np =dev_of_node (chip->dev), *child; +struct fwnode_handle *child; +struct device *dev = chip->dev;int count;int i =0 ; - chip->num_leds = (int )(unsigned long )of_device_get_match_data (chip->dev); - - count =of_get_available_child_count (np); + count =device_get_child_node_count (dev);if (!count || count > chip->num_leds)return -EINVAL ;@@ -507,11 +509,11 @@ static int ktd202x_probe_dt(struct ktd202x *chip)/* Allow the device to execute the complete reset */ usleep_range (200 ,300 ); -for_each_available_child_of_node (np, child) { +device_for_each_child_node (dev, child) {int ret =ktd202x_add_led (chip, child, i);if (ret) { -of_node_put (child); +fwnode_handle_put (child);return ret; } i++;@@ -554,6 +556,8 @@ static int ktd202x_probe(struct i2c_client *client)return ret; } + chip->num_leds = (unsigned long )i2c_get_match_data (client); + chip->regulators[0 ].supply ="vin" ; chip->regulators[1 ].supply ="vio" ; ret =devm_regulator_bulk_get (dev,ARRAY_SIZE (chip->regulators), chip->regulators);@@ -568,7 +572,7 @@ static int ktd202x_probe(struct i2c_client *client)return ret; } - ret =ktd202x_probe_dt (chip); + ret =ktd202x_probe_fw (chip);if (ret <0 ) {regulator_bulk_disable (ARRAY_SIZE (chip->regulators), chip->regulators);return ret;@@ -605,7 +609,7 @@ static void ktd202x_shutdown(struct i2c_client *client)static const struct of_device_id ktd202x_match_table[] = { { .compatible ="kinetic,ktd2026" , .data = (void *)KTD2026_NUM_LEDS }, { .compatible ="kinetic,ktd2027" , .data = (void *)KTD2027_NUM_LEDS }, - {}, + {} };MODULE_DEVICE_TABLE (of, ktd202x_match_table);
PATCH v7 2/6 leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027
In reply to Kate HsuanThis table shows the maximum support LED channel for KTD2026 and KTD-2027. The 3-channel LED controller KTD2026 controls R/G/B three LEDs. The 4-channel LED controller KTD2027 controls R/G/B and flashing LEDs.
Datasheet: https://www.kinet-ic.com/uploads/KTD2026-7-04h.pdf
--- drivers/leds/rgb/leds-ktd202x.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/leds/rgb/leds-ktd202x.c +8 -0
@@ -606,6 +606,13 @@ static void ktd202x_shutdown(struct i2c_client *client)regmap_write (chip->regmap,KTD202X_REG_RESET_CONTROL ,KTD202X_RSTR_RESET ); } +static const struct i2c_device_id ktd202x_id[] = { + {"ktd2026" ,KTD2026_NUM_LEDS }, + {"ktd2027" ,KTD2027_NUM_LEDS }, + {} +}; +MODULE_DEVICE_TABLE (i2c, ktd202x_id); +static const struct of_device_id ktd202x_match_table[] = { { .compatible ="kinetic,ktd2026" , .data = (void *)KTD2026_NUM_LEDS }, { .compatible ="kinetic,ktd2027" , .data = (void *)KTD2027_NUM_LEDS },
@@ -621,6 +628,7 @@ static struct i2c_driver ktd202x_driver = { .probe = ktd202x_probe, .remove = ktd202x_remove, .shutdown = ktd202x_shutdown, + .id_table = ktd202x_id, };module_i2c_driver (ktd202x_driver);
Signature · 1 line
2.44.0
Re: [PATCH v7 2/6] leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027
Hi,
On 4/24/24 8:52 AM, Kate Hsuan wrote:
Maybe start the commit message with:
Add an i2c_device_id id_table to match manually instantiated (non device-tree / ACPI instantiated) KTD202x controllers as found on some x86 boards.
?
Quoted 3 lines
This table shows the maximum support LED channel for KTD2026 and KTD-2027. The 3-channel LED controller KTD2026 controls R/G/B three LEDs. The 4-channel LED controller KTD2027 controls R/G/B and flashing LEDs.
Other then that this looks good to me:
Regards,
Hans
Quoted 33 lines
Datasheet: https://www.kinet-ic.com/uploads/KTD2026-7-04h.pdf
Signed-off-by Kate Hsuan <[email protected]>--- drivers/leds/rgb/leds-ktd202x.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/leds/rgb/leds-ktd202x.c +8
-0@@ -606,6 +606,13 @@ static void ktd202x_shutdown(struct i2c_client *client)regmap_write (chip->regmap,KTD202X_REG_RESET_CONTROL ,KTD202X_RSTR_RESET ); } +static const struct i2c_device_id ktd202x_id[] = { + {"ktd2026" ,KTD2026_NUM_LEDS }, + {"ktd2027" ,KTD2027_NUM_LEDS }, + {} +}; +MODULE_DEVICE_TABLE (i2c, ktd202x_id); +static const struct of_device_id ktd202x_match_table[] = { { .compatible ="kinetic,ktd2026" , .data = (void *)KTD2026_NUM_LEDS }, { .compatible ="kinetic,ktd2027" , .data = (void *)KTD2027_NUM_LEDS },@@ -621,6 +628,7 @@ static struct i2c_driver ktd202x_driver = { .probe = ktd202x_probe, .remove = ktd202x_remove, .shutdown = ktd202x_shutdown, + .id_table = ktd202x_id, };module_i2c_driver (ktd202x_driver);
Re: [PATCH v7 2/6] leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027
Hi,
Quoted 5 lines · Hans de Goede
Hi,
On 4/24/24 8:52 AM, Kate Hsuan wrote:
Quoted 7 lines
Maybe start the commit message with:
Add an
i2c_device_idid_tableto match manually instantiated (non device-tree / ACPI instantiated) KTD202x controllers as found on some x86 boards.?
Thank you for reviewing it.
I'll revise the commit message in the v8 patch.
Quoted 49 lines
Quoted 4 lines
This table shows the maximum support LED channel for KTD2026 and KTD-2027. The 3-channel LED controller KTD2026 controls R/G/B three LEDs. The 4-channel LED controller KTD2027 controls R/G/B and flashing LEDs.
Other then that this looks good to me:
Reviewed-by Hans de Goede <[email protected]>Regards,
Hans
Quoted 33 lines
Datasheet: https://www.kinet-ic.com/uploads/KTD2026-7-04h.pdf
Signed-off-by Kate Hsuan <[email protected]>--- drivers/leds/rgb/leds-ktd202x.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/leds/rgb/leds-ktd202x.c +8
-0@@ -606,6 +606,13 @@ static void ktd202x_shutdown(struct i2c_client *client)regmap_write (chip->regmap,KTD202X_REG_RESET_CONTROL ,KTD202X_RSTR_RESET ); } +static const struct i2c_device_id ktd202x_id[] = { + {"ktd2026" ,KTD2026_NUM_LEDS }, + {"ktd2027" ,KTD2027_NUM_LEDS }, + {} +}; +MODULE_DEVICE_TABLE (i2c, ktd202x_id); +static const struct of_device_id ktd202x_match_table[] = { { .compatible ="kinetic,ktd2026" , .data = (void *)KTD2026_NUM_LEDS }, { .compatible ="kinetic,ktd2027" , .data = (void *)KTD2027_NUM_LEDS },@@ -621,6 +628,7 @@ static struct i2c_driver ktd202x_driver = { .probe = ktd202x_probe, .remove = ktd202x_remove, .shutdown = ktd202x_shutdown, + .id_table = ktd202x_id, };module_i2c_driver (ktd202x_driver);
Signature · 2 lines
BR, Kate
PATCH v7 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 the 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 the 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,"error not a multi-color LED\n" ); +return ; + } + + mcled_cdev =lcdev_to_mccdev (led_cdev); +if (num_colors != mcled_cdev->num_colors) { +dev_err_once (led_cdev->dev,"error num_colors mismatch %u != %u\n" , + 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 v7 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 v7 5/6 power: supply: power-supply-leds: Add charging_orange_full_green trigger for RGB LED
In reply to Kate HsuanAdd a charging_orange_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 orange when the battery status is charging. The LED will show green when the battery status is full.
--- drivers/power/supply/power_supply_leds.c | 26 ++++++++++++++++++++++++ include/linux/power_supply.h | 2 ++ 2 files changed, 28 insertions(+)
drivers/power/supply/power_supply_leds.c +26 -0
@@ -22,6 +22,9 @@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_orange[3 ] = {128 ,0 ,255 }; +unsigned int intensity_red[3 ] = {0 ,0 ,255 };if (power_supply_get_property (psy,POWER_SUPPLY_PROP_STATUS , &status))return ;
@@ -36,12 +39,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_orange_full_green_trig, + intensity_green, +ARRAY_SIZE (intensity_green), +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_orange_full_green_trig, + intensity_orange, +ARRAY_SIZE (intensity_orange), +LED_FULL );break ;default :led_trigger_event (psy->charging_full_trig,LED_OFF );
@@ -49,6 +60,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_orange_full_green_trig, + intensity_red, +ARRAY_SIZE (intensity_red), +LED_OFF );break ; } }
@@ -74,6 +89,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_orange_full_green_trig_name =kasprintf (GFP_KERNEL , +"%s-charging-orange-full-green" , psy->desc->name); +if (!psy->charging_orange_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 +102,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_orange_full_green_trig_name, + &psy->charging_orange_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 +125,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_orange_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_orange_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_orange_full_green_trig; +char *charging_orange_full_green_trig_name;#endif };
Signature · 1 line
2.44.0
Re: [PATCH v7 5/6] power: supply: power-supply-leds: Add charging_orange_full_green trigger for RGB LED
Hi,
Quoted 9 lines · Kate Hsuan
Add a
charging_orange_full_greenLED trigger and the trigger is based onled_mc_trigger_event()which can set an RGB LED when the trigger is triggered. The LED will show orange when the battery status is charging. The LED will show green when the battery status is full.Signed-off-by Kate Hsuan <[email protected]>
Thanks, patch looks good to me:
Regards,
Hans
Quoted 103 lines
--- drivers/power/supply/power_supply_leds.c | 26 ++++++++++++++++++++++++ include/linux/power_supply.h | 2 ++ 2 files changed, 28 insertions(+)drivers/power/supply/power_supply_leds.c +26
-0@@ -22,6 +22,9 @@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_orange[3 ] = {128 ,0 ,255 }; +unsigned int intensity_red[3 ] = {0 ,0 ,255 };if (power_supply_get_property (psy,POWER_SUPPLY_PROP_STATUS , &status))return ;@@ -36,12 +39,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_orange_full_green_trig, + intensity_green, +ARRAY_SIZE (intensity_green), +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_orange_full_green_trig, + intensity_orange, +ARRAY_SIZE (intensity_orange), +LED_FULL );break ;default :led_trigger_event (psy->charging_full_trig,LED_OFF );@@ -49,6 +60,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_orange_full_green_trig, + intensity_red, +ARRAY_SIZE (intensity_red), +LED_OFF );break ; } }@@ -74,6 +89,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_orange_full_green_trig_name =kasprintf (GFP_KERNEL , +"%s-charging-orange-full-green" , psy->desc->name); +if (!psy->charging_orange_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 +102,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_orange_full_green_trig_name, + &psy->charging_orange_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 +125,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_orange_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_orange_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_orange_full_green_trig; +char *charging_orange_full_green_trig_name;#endif };
Re: [PATCH v7 5/6] power: supply: power-supply-leds: Add charging_orange_full_green trigger for RGB LED
Hi,
Quoted 8 lines · Hans de Goede
Hi,
Quoted 5 lines · Kate Hsuan
Add a
charging_orange_full_greenLED trigger and the trigger is based onled_mc_trigger_event()which can set an RGB LED when the trigger is triggered. The LED will show orange when the battery status is charging. The LED will show green when the battery status is full.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Kate Hsuan <[email protected]>Thanks, patch looks good to me:
Reviewed-by Hans de Goede <[email protected]>
I withdraw this I just noticed that this:
+ unsigned int intensity_green[3] = {255, 0, 0};
+ unsigned int intensity_orange[3] = {128, 0, 255};
Is based on the color order being "green blue red" which is a pretty exotic color order. The device tree / fwnode bindings for the ktd2026 with which we are using this allow changing the order to red green blue simply by listing the child cells for each color in that order.
Also this:
+ unsigned int intensity_red[3] = {0, 0, 255};
is not necessary since it is only used with LED_OFF as brightness the code can simply use:
led_trigger_event(psy->charging_orange_full_green_trig, LED_OFF);
to turn the LED off.
I'll prepare a new version of this series with this fixed.
Regards,
Hans
Quoted 103 lines
Quoted 103 lines
--- drivers/power/supply/power_supply_leds.c | 26 ++++++++++++++++++++++++ include/linux/power_supply.h | 2 ++ 2 files changed, 28 insertions(+)drivers/power/supply/power_supply_leds.c +26
-0@@ -22,6 +22,9 @@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_orange[3 ] = {128 ,0 ,255 }; +unsigned int intensity_red[3 ] = {0 ,0 ,255 };if (power_supply_get_property (psy,POWER_SUPPLY_PROP_STATUS , &status))return ;@@ -36,12 +39,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_orange_full_green_trig, + intensity_green, +ARRAY_SIZE (intensity_green), +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_orange_full_green_trig, + intensity_orange, +ARRAY_SIZE (intensity_orange), +LED_FULL );break ;default :led_trigger_event (psy->charging_full_trig,LED_OFF );@@ -49,6 +60,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_orange_full_green_trig, + intensity_red, +ARRAY_SIZE (intensity_red), +LED_OFF );break ; } }@@ -74,6 +89,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_orange_full_green_trig_name =kasprintf (GFP_KERNEL , +"%s-charging-orange-full-green" , psy->desc->name); +if (!psy->charging_orange_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 +102,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_orange_full_green_trig_name, + &psy->charging_orange_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 +125,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_orange_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_orange_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_orange_full_green_trig; +char *charging_orange_full_green_trig_name;#endif };
PATCH v7 6/6 platform: x86-android-tablets: others: Set the LED trigger to charging_orange_full_green for Xiaomi pad2
In reply to Kate HsuanSet the default trigger to bq27520-0-charging-orange-full-green. The LED will show orange 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-orange-full-green"), { } };
Signature · 1 line
2.44.0
Re: [PATCH v7 6/6] platform: x86-android-tablets: others: Set the LED trigger to charging_orange_full_green for Xiaomi pad2
Hi,
Quoted 5 lines · Kate Hsuan
Set the default trigger to bq27520-0-charging-orange-full-green. The LED will show orange when the battery is charging. The LED will show green when the battery status is full.
Signed-off-by Kate Hsuan <[email protected]>
Thanks, patch looks good to me:
Regards,
Hans
Quoted 17 lines
--- 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-orange-full-green"), { } };
Hi All,
Quoted 11 lines · Kate Hsuan
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 shows orange when charging and the LED shows green when the battery is full.Moreover, the LED trigger is set to the new trigger, called "bq27520-0-charging-orange-full-green" for Xiaomi Pad2 so the LED shows orange when charging and the LED shows green when the battery is full.
Lee, I believe this series is ready for merging now ? I've reviewed patches 1-2 + 5 and Jacek has reviewed patches 3 + 4.
Patch 5 also has an Acked-by from Sebastian for merging it together with the rest of the series.
Can you merge patches 1-5 ?
Patch 6 just changes the value of a device-property (the default-trigger string) and I can merge that through the pdx86 tree independent of patches 1-5.
Regards,
Hans
Quoted 66 lines
--
Changes in v7:
1. Platform: x86-android-tablets: other: Add swnode for Xiaomi pad2 indicator LED was included in Hans' branch.
2. Included the tags from the previous version in the commit message.
3. Fixed the comma issue for the structure initialiser.Changes in v6:
1. The I2C ID table was moved to a separate patch.
2. The LED shows orange when charging.
3. The trigger name was renamed to charging-orange-full-green.
4. The default trigger of Xiaomi Pad2 is "bq27520-0-charging-orange-full-green".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 ofnum_ledswas 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: Addled_mc_set_brightness()function
leds: trigger: Addled_mc_trigger_event()functionKate Hsuan (4):
leds: rgb: leds-ktd202x: Get device properties through fwnode to
support ACPI
leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027
power: supply: power-supply-leds: Addcharging_orange_full_green
trigger for RGB LED
platform: x86-android-tablets: others: Set the LED trigger to
charging_orange_full_greenfor Xiaomi pad2drivers/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 | 72 +++++++++++-------- .../platform/x86/x86-android-tablets/other.c | 2 +- drivers/power/supply/power_supply_leds.c | 26 +++++++ include/linux/leds.h | 26 +++++++ include/linux/power_supply.h | 2 + 9 files changed, 149 insertions(+), 32 deletions(-)