summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee@kernel.org>2024-07-04 17:07:01 +0100
committerLee Jones <lee@kernel.org>2024-07-04 17:07:01 +0100
commit5ffe70d81e08cc101e9d609f69fd587e2bed4b8c (patch)
tree3253ab882c7beacc0d32d9234c184bcf4ff5829a /drivers/mfd
parentf5ace555243953d12031679712e8594a40873ed0 (diff)
parent970c3a6b7aa3c68ccdf5af2562c3d39533dd62a9 (diff)
downloadlinux-stable-5ffe70d81e08cc101e9d609f69fd587e2bed4b8c.tar.gz
linux-stable-5ffe70d81e08cc101e9d609f69fd587e2bed4b8c.tar.bz2
linux-stable-5ffe70d81e08cc101e9d609f69fd587e2bed4b8c.zip
Merge branch 'ib-mfd-leds-platform-6.11' into ibs-for-mfd-merged
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/cros_ec_dev.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index d8408054ba15..af698e246657 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -103,6 +103,10 @@ 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,
@@ -134,6 +138,11 @@ static const struct cros_feature_to_cells cros_subdevices[] = {
.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[] = {