From: Lee Jones <lee@kernel.org>
Date: Thu, 4 Jul 2024 16:07:01 +0000 (+0100)
Subject: Merge branch 'ib-mfd-leds-platform-6.11' into ibs-for-mfd-merged
X-Git-Tag: v6.11-rc1~147^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ffe70d81e08cc101e9d609f69fd587e2bed4b8c;p=thirdparty%2Fkernel%2Flinux.git

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

5ffe70d81e08cc101e9d609f69fd587e2bed4b8c
diff --cc drivers/mfd/cros_ec_dev.c
index d8408054ba15b,4444b361aeae1..af698e2466578
--- a/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[] = {