Revert "mfd: cros_ec: Add SCP Core-1 as a new CrOS EC MCU"

This reverts commit 66ee379d743c69c726b61d078119a34d5be96a35.

The feature flag introduced by Commit 66ee379d743c ("mfd: cros_ec: Add
SCP Core-1 as a new CrOS EC MCU") was not first added in the source EC
code base[1]. This can lead to the possible misinterpration of an EC's
supported feature set, as well as causes issues with all future feature
flag updates.

[1] https://source.chromium.org/chromium/chromiumos/platform/ec/+/main:include/ec_commands.h

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Acked-by: Lee Jones <lee@kernel.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20221228004648.793339-2-pmalani@chromium.org

diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 344ad03bdc428a6f5f07888735240847b9402c84..02d4271dfe06bb0f4f111f021e8fbe0b4a189e34 100644 (file)
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -64,11 +64,6 @@ 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,

diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index 5744a2d746aabd6735a81b3ea5cae0e387752e57..7c94bf5c8f05b39cfdc89f04252e366c8007f7e4 100644 (file)
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -1300,8 +1300,6 @@ enum ec_feature_code {
         * mux.
         */
        EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK = 43,
-       /* The MCU is a System Companion Processor (SCP) 2nd Core. */
-       EC_FEATURE_SCP_C1 = 45,
 };
 
 #define EC_FEATURE_MASK_0(event_code) BIT(event_code % 32)

diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
index 7fb2196f99b0a1472879b0afa0c235006588ed0c..017d502ed66eb36d6dd524a2e12b67a99cd3acf6 100644 (file)
--- a/include/linux/platform_data/cros_ec_proto.h
+++ b/include/linux/platform_data/cros_ec_proto.h
@@ -19,7 +19,6 @@
 #define CROS_EC_DEV_ISH_NAME   "cros_ish"
 #define CROS_EC_DEV_PD_NAME    "cros_pd"
 #define CROS_EC_DEV_SCP_NAME   "cros_scp"
-#define CROS_EC_DEV_SCP_C1_NAME        "cros_scp_c1"
 #define CROS_EC_DEV_TP_NAME    "cros_tp"
 
 #define CROS_EC_DEV_EC_INDEX 0