Merge branches 'ib-leds-mfd-6.11', 'ib-leds-platform-power-6.11' and 'ib-mfd-leds...

diff --cc drivers/leds/led-class-multicolor.c
Simple merge

diff --cc drivers/leds/led-core.c
Simple merge

diff --cc drivers/mfd/cros_ec_dev.c
index d8408054ba15bb75c1f9f298b7f410a371a01bcd,a52d59cc2b1ecba0998f465cd53d9b8de5c6a5a4,4444b361aeae1b659874c05da5f870edcc348447..af698e2466578caf99d466ce1ce36d75ba6b96ea
--- 1/drivers/mfd/cros_ec_dev.c
--- 2/drivers/mfd/cros_ec_dev.c
--- 3/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@@@ -99,10 -99,6 -99,10 +99,14 @@@@ static const struct mfd_cell cros_ec_wd
        { .name = "cros-ec-wdt", }
   };
   
 ++static const struct mfd_cell cros_ec_led_cells[] = {
 ++     { .name = "cros-ec-led", },
 ++};
 ++
++ static const struct mfd_cell cros_ec_keyboard_leds_cells[] = {
++      { .name = "cros-keyboard-leds", },
++ };
++ 
   static const struct cros_feature_to_cells cros_subdevices[] = {
        {
                .id             = EC_FEATURE_CEC,
@@@@ -129,11 -125,6 -129,11 +133,16 @@@@
                .mfd_cells      = cros_ec_wdt_cells,
                .num_cells      = ARRAY_SIZE(cros_ec_wdt_cells),
        },
 ++     {
 ++             .id             = EC_FEATURE_LED,
 ++             .mfd_cells      = cros_ec_led_cells,
 ++             .num_cells      = ARRAY_SIZE(cros_ec_led_cells),
 ++     },
++      {
++              .id             = EC_FEATURE_PWM_KEYB,
++              .mfd_cells      = cros_ec_keyboard_leds_cells,
++              .num_cells      = ARRAY_SIZE(cros_ec_keyboard_leds_cells),
++      },
   };
   
   static const struct mfd_cell cros_ec_platform_cells[] = {

diff --cc include/linux/leds.h
index dedea965afbfead17d0f4d7002af1087ecb9bfb0,517b6198df07674a82d61459da040693cf854244,36663ac6c58a1a0539d8b0231023152c7fbc9da5..6885603f211bb58cc56106ff3f16bcec97db0ec1
--- 1/include/linux/leds.h
--- 2/include/linux/leds.h
--- 3/include/linux/leds.h
+++ b/include/linux/leds.h
@@@@ -107,6 -107,7 -107,7 +107,8 @@@@ 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)
++ #define LED_REJECT_NAME_CONFLICT BIT(24)
+++#define LED_MULTI_COLOR              BIT(25)
   
        /* set_brightness_work / blink_timer flags, atomic, private. */
        unsigned long           work_flags;