Merge branch 'ib-mfd-leds-platform-6.11' into ibs-for-mfd-merged

diff --cc drivers/mfd/cros_ec_dev.c
index d8408054ba15bb75c1f9f298b7f410a371a01bcd,4444b361aeae1b659874c05da5f870edcc348447..af698e2466578caf99d466ce1ce36d75ba6b96ea
--- 1/drivers/mfd/cros_ec_dev.c
--- 2/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@@ -99,10 -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 -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
Simple merge