| Message ID | 20240416053909.256319-5-hpa@redhat.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | KTD2026 indicator LED for X86 Xiaomi Pad2 | expand |
Hi Kate, kernel test robot noticed the following build errors: [auto build test ERROR on sre-power-supply/for-next] [also build test ERROR on lee-leds/for-leds-next linus/master v6.9-rc4] [cannot apply to pavel-leds/for-next next-20240416] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Kate-Hsuan/platform-x86-android-tablets-other-Add-swnode-for-Xiaomi-pad2-indicator-LED/20240416-134240 base: https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git for-next patch link: https://lore.kernel.org/r/20240416053909.256319-5-hpa%40redhat.com patch subject: [PATCH v6 4/5] power: supply: power-supply-leds: Add charging_orange_full_green trigger for RGB LED config: parisc64-defconfig (https://download.01.org/0day-ci/archive/20240417/202404170023.1zEGO9ja-lkp@intel.com/config) compiler: hppa64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240417/202404170023.1zEGO9ja-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202404170023.1zEGO9ja-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/power/supply/power_supply_leds.c: In function 'power_supply_update_bat_leds': >> drivers/power/supply/power_supply_leds.c:42:17: error: implicit declaration of function 'led_mc_trigger_event'; did you mean 'led_trigger_event'? [-Werror=implicit-function-declaration] 42 | led_mc_trigger_event(psy->charging_orange_full_green_trig, | ^~~~~~~~~~~~~~~~~~~~ | led_trigger_event cc1: some warnings being treated as errors vim +42 drivers/power/supply/power_supply_leds.c 21 22 static void power_supply_update_bat_leds(struct power_supply *psy) 23 { 24 union power_supply_propval status; 25 unsigned int intensity_green[3] = {255, 0, 0}; 26 unsigned int intensity_orange[3] = {128, 0, 255}; 27 unsigned int intensity_red[3] = {0, 0, 255}; 28 29 if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) 30 return; 31 32 dev_dbg(&psy->dev, "%s %d\n", __func__, status.intval); 33 34 switch (status.intval) { 35 case POWER_SUPPLY_STATUS_FULL: 36 led_trigger_event(psy->charging_full_trig, LED_FULL); 37 led_trigger_event(psy->charging_trig, LED_OFF); 38 led_trigger_event(psy->full_trig, LED_FULL); 39 /* Going from blink to LED on requires a LED_OFF event to stop blink */ 40 led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); 41 led_trigger_event(psy->charging_blink_full_solid_trig, LED_FULL); > 42 led_mc_trigger_event(psy->charging_orange_full_green_trig, 43 intensity_green, 44 ARRAY_SIZE(intensity_green), 45 LED_FULL); 46 break; 47 case POWER_SUPPLY_STATUS_CHARGING: 48 led_trigger_event(psy->charging_full_trig, LED_FULL); 49 led_trigger_event(psy->charging_trig, LED_FULL); 50 led_trigger_event(psy->full_trig, LED_OFF); 51 led_trigger_blink(psy->charging_blink_full_solid_trig, 0, 0); 52 led_mc_trigger_event(psy->charging_orange_full_green_trig, 53 intensity_orange, 54 ARRAY_SIZE(intensity_orange), 55 LED_FULL); 56 break; 57 default: 58 led_trigger_event(psy->charging_full_trig, LED_OFF); 59 led_trigger_event(psy->charging_trig, LED_OFF); 60 led_trigger_event(psy->full_trig, LED_OFF); 61 led_trigger_event(psy->charging_blink_full_solid_trig, 62 LED_OFF); 63 led_mc_trigger_event(psy->charging_orange_full_green_trig, 64 intensity_red, 65 ARRAY_SIZE(intensity_red), 66 LED_OFF); 67 break; 68 } 69 } 70
On Tue, Apr 16, 2024 at 8:03 PM kernel test robot <lkp@intel.com> wrote: > > Hi Kate, > > kernel test robot noticed the following build errors: > All errors (new ones prefixed by >>): > > drivers/power/supply/power_supply_leds.c: In function 'power_supply_update_bat_leds': > >> drivers/power/supply/power_supply_leds.c:42:17: error: implicit declaration of function 'led_mc_trigger_event'; did you mean 'led_trigger_event'? [-Werror=implicit-function-declaration] > 42 | led_mc_trigger_event(psy->charging_orange_full_green_trig, > | ^~~~~~~~~~~~~~~~~~~~ > | led_trigger_event > cc1: some warnings being treated as errors Probably you need a new dependency or so.
Hi Kate, kernel test robot noticed the following build errors: [auto build test ERROR on sre-power-supply/for-next] [also build test ERROR on lee-leds/for-leds-next linus/master v6.9-rc4] [cannot apply to next-20240416] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Kate-Hsuan/platform-x86-android-tablets-other-Add-swnode-for-Xiaomi-pad2-indicator-LED/20240416-134240 base: https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git for-next patch link: https://lore.kernel.org/r/20240416053909.256319-5-hpa%40redhat.com patch subject: [PATCH v6 4/5] power: supply: power-supply-leds: Add charging_orange_full_green trigger for RGB LED config: arm-defconfig (https://download.01.org/0day-ci/archive/20240417/202404170705.Or8MFKNi-lkp@intel.com/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project.git f28c006a5895fc0e329fe15fead81e37457cb1d1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240417/202404170705.Or8MFKNi-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202404170705.Or8MFKNi-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/power/supply/power_supply_leds.c:42:3: error: implicit declaration of function 'led_mc_trigger_event' is invalid in C99 [-Werror,-Wimplicit-function-declaration] led_mc_trigger_event(psy->charging_orange_full_green_trig, ^ drivers/power/supply/power_supply_leds.c:42:3: note: did you mean 'led_trigger_event'? include/linux/leds.h:489:6: note: 'led_trigger_event' declared here void led_trigger_event(struct led_trigger *trigger, enum led_brightness event); ^ 1 error generated. vim +/led_mc_trigger_event +42 drivers/power/supply/power_supply_leds.c 21 22 static void power_supply_update_bat_leds(struct power_supply *psy) 23 { 24 union power_supply_propval status; 25 unsigned int intensity_green[3] = {255, 0, 0}; 26 unsigned int intensity_orange[3] = {128, 0, 255}; 27 unsigned int intensity_red[3] = {0, 0, 255}; 28 29 if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) 30 return; 31 32 dev_dbg(&psy->dev, "%s %d\n", __func__, status.intval); 33 34 switch (status.intval) { 35 case POWER_SUPPLY_STATUS_FULL: 36 led_trigger_event(psy->charging_full_trig, LED_FULL); 37 led_trigger_event(psy->charging_trig, LED_OFF); 38 led_trigger_event(psy->full_trig, LED_FULL); 39 /* Going from blink to LED on requires a LED_OFF event to stop blink */ 40 led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); 41 led_trigger_event(psy->charging_blink_full_solid_trig, LED_FULL); > 42 led_mc_trigger_event(psy->charging_orange_full_green_trig, 43 intensity_green, 44 ARRAY_SIZE(intensity_green), 45 LED_FULL); 46 break; 47 case POWER_SUPPLY_STATUS_CHARGING: 48 led_trigger_event(psy->charging_full_trig, LED_FULL); 49 led_trigger_event(psy->charging_trig, LED_FULL); 50 led_trigger_event(psy->full_trig, LED_OFF); 51 led_trigger_blink(psy->charging_blink_full_solid_trig, 0, 0); 52 led_mc_trigger_event(psy->charging_orange_full_green_trig, 53 intensity_orange, 54 ARRAY_SIZE(intensity_orange), 55 LED_FULL); 56 break; 57 default: 58 led_trigger_event(psy->charging_full_trig, LED_OFF); 59 led_trigger_event(psy->charging_trig, LED_OFF); 60 led_trigger_event(psy->full_trig, LED_OFF); 61 led_trigger_event(psy->charging_blink_full_solid_trig, 62 LED_OFF); 63 led_mc_trigger_event(psy->charging_orange_full_green_trig, 64 intensity_red, 65 ARRAY_SIZE(intensity_red), 66 LED_OFF); 67 break; 68 } 69 } 70
Hi, On Wed, Apr 17, 2024 at 1:34 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, Apr 16, 2024 at 8:03 PM kernel test robot <lkp@intel.com> wrote: > > > > Hi Kate, > > > > kernel test robot noticed the following build errors: > > > All errors (new ones prefixed by >>): > > > > drivers/power/supply/power_supply_leds.c: In function 'power_supply_update_bat_leds': > > >> drivers/power/supply/power_supply_leds.c:42:17: error: implicit declaration of function 'led_mc_trigger_event'; did you mean 'led_trigger_event'? [-Werror=implicit-function-declaration] > > 42 | led_mc_trigger_event(psy->charging_orange_full_green_trig, > > | ^~~~~~~~~~~~~~~~~~~~ > > | led_trigger_event > > cc1: some warnings being treated as errors > > Probably you need a new dependency or so. I will include Hans' two patches for led_mc_trigger_event() in v7 patch. > > -- > With Best Regards, > Andy Shevchenko >
Hi, On Tue, Apr 16, 2024 at 01:39:08PM +0800, Kate Hsuan wrote: > Add 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. > > Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/ > > Signed-off-by: Kate Hsuan <hpa@redhat.com> > --- Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > drivers/power/supply/power_supply_leds.c | 26 ++++++++++++++++++++++++ > include/linux/power_supply.h | 2 ++ > 2 files changed, 28 insertions(+) > > diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c > index c7db29d5fcb8..8dd99199c65b 100644 > --- a/drivers/power/supply/power_supply_leds.c > +++ b/drivers/power/supply/power_supply_leds.c > @@ -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. */ > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > index c0992a77feea..9b6898085224 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_orange_full_green_trig; > + char *charging_orange_full_green_trig_name; > #endif > }; > > -- > 2.44.0 > >
Hi, On 4/18/24 2:34 PM, Sebastian Reichel wrote: > Hi, > > On Tue, Apr 16, 2024 at 01:39:08PM +0800, Kate Hsuan wrote: >> Add 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. >> >> Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/ >> >> Signed-off-by: Kate Hsuan <hpa@redhat.com> >> --- > > Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> Thanks. Does this mean your ok with routing this change through the LED tree together with the 2 LED core patches adding the new led_mc_trigger_event() function this uses ? Regards, Hans > -- Sebastian > >> drivers/power/supply/power_supply_leds.c | 26 ++++++++++++++++++++++++ >> include/linux/power_supply.h | 2 ++ >> 2 files changed, 28 insertions(+) >> >> diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c >> index c7db29d5fcb8..8dd99199c65b 100644 >> --- a/drivers/power/supply/power_supply_leds.c >> +++ b/drivers/power/supply/power_supply_leds.c >> @@ -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. */ >> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h >> index c0992a77feea..9b6898085224 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_orange_full_green_trig; >> + char *charging_orange_full_green_trig_name; >> #endif >> }; >> >> -- >> 2.44.0 >> >>
Hi, On Fri, Apr 19, 2024 at 09:37:56AM +0200, Hans de Goede wrote: > On 4/18/24 2:34 PM, Sebastian Reichel wrote: > > On Tue, Apr 16, 2024 at 01:39:08PM +0800, Kate Hsuan wrote: > >> Add 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. > >> > >> Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/ > >> > >> Signed-off-by: Kate Hsuan <hpa@redhat.com> > >> --- > > > > Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> > > Thanks. Does this mean your ok with routing this change through the LED tree > together with the 2 LED core patches adding the new led_mc_trigger_event() > function this uses ? Yes. -- Sebastian
diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c index c7db29d5fcb8..8dd99199c65b 100644 --- a/drivers/power/supply/power_supply_leds.c +++ b/drivers/power/supply/power_supply_leds.c @@ -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. */ diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c0992a77feea..9b6898085224 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_orange_full_green_trig; + char *charging_orange_full_green_trig_name; #endif };
Add 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. Link: https://lore.kernel.org/linux-leds/f40a0b1a-ceac-e269-c2dd-0158c5b4a1ad@gmail.com/ Signed-off-by: Kate Hsuan <hpa@redhat.com> --- drivers/power/supply/power_supply_leds.c | 26 ++++++++++++++++++++++++ include/linux/power_supply.h | 2 ++ 2 files changed, 28 insertions(+)