From: Lee Jones <lee@kernel.org>
Date: Fri, 21 Jun 2024 10:54:35 +0000 (+0100)
Subject: Merge branches 'ib-leds-mfd-6.11', 'ib-leds-platform-power-6.11' and 'ib-mfd-leds... 
X-Git-Tag: io_uring-6.11-20240722~53^2~59
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=59561ccd90b8fca31f15d7505c73cc22ffd04c06;p=linux-2.6-block.git

Merge branches 'ib-leds-mfd-6.11', 'ib-leds-platform-power-6.11' and 'ib-mfd-leds-platform-6.11' into ibs-for-leds-merged
---

59561ccd90b8fca31f15d7505c73cc22ffd04c06
diff --cc drivers/mfd/cros_ec_dev.c
index d8408054ba15,a52d59cc2b1e,4444b361aeae..af698e246657
--- a/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 dedea965afbf,517b6198df07,36663ac6c58a..6885603f211b
--- a/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;