git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-next-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
cros_ec_dev.c
diff --git
a/drivers/mfd/cros_ec_dev.c
b/drivers/mfd/cros_ec_dev.c
index 02d4271dfe06bb0f4f111f021e8fbe0b4a189e34..344ad03bdc428a6f5f07888735240847b9402c84 100644
(file)
--- a/
drivers/mfd/cros_ec_dev.c
+++ b/
drivers/mfd/cros_ec_dev.c
@@
-64,6
+64,11
@@
static const struct cros_feature_to_name cros_mcu_devices[] = {
.name = CROS_EC_DEV_SCP_NAME,
.desc = "System Control Processor",
},
+ {
+ .id = EC_FEATURE_SCP_C1,
+ .name = CROS_EC_DEV_SCP_C1_NAME,
+ .desc = "System Control Processor 2nd Core",
+ },
{
.id = EC_FEATURE_TOUCHPAD,
.name = CROS_EC_DEV_TP_NAME,