From: Pi-Hsun Shih <pihsun@chromium.org>
To: unlisted-recipients:; (no To-header on input)
Cc: Pi-Hsun Shih <pihsun@chromium.org>,
Erin Lo <erin.lo@mediatek.com>,
Enric Balletbo Serra <eballetbo@gmail.com>,
Guenter Roeck <groeck@chromium.org>,
Lee Jones <lee.jones@linaro.org>,
Benson Leung <bleung@chromium.org>,
Enric Balletbo i Serra <enric.balletbo@collabora.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v4 5/6] cros_ec: differentiate SCP from EC by feature bit.
Date: Thu, 31 Jan 2019 17:31:30 +0800 [thread overview]
Message-ID: <20190131093131.245531-6-pihsun@chromium.org> (raw)
In-Reply-To: <20190131093131.245531-1-pihsun@chromium.org>
Since a SCP and EC would both exist on a system, and use the cros_ec_dev
driver, we need to differentiate between them for the userspace, or they
would both be registered at /dev/cros_ec, causing a conflict.
Cc: Enric Balletbo Serra <eballetbo@gmail.com>
Cc: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
---
Changes from v3:
- No change.
Changes from v2:
- No change.
Changes from v1:
- New patch extracted from Patch 5.
---
drivers/mfd/cros_ec_dev.c | 9 +++++++++
include/linux/mfd/cros_ec.h | 1 +
include/linux/mfd/cros_ec_commands.h | 2 ++
3 files changed, 12 insertions(+)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 2d0fee488c5aa8..67983853413d07 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -414,6 +414,15 @@ static int ec_device_probe(struct platform_device *pdev)
device_initialize(&ec->class_dev);
cdev_init(&ec->cdev, &fops);
+ if (cros_ec_check_features(ec, EC_FEATURE_SCP)) {
+ dev_info(dev, "SCP detected.\n");
+ /*
+ * Help userspace differentiating ECs from SCP,
+ * regardless of the probing order.
+ */
+ ec_platform->ec_name = CROS_EC_DEV_SCP_NAME;
+ }
+
/*
* Add the class device
* Link to the character device for creating the /dev entry
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
index de8b588c8776da..fd297cf8f97295 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -24,6 +24,7 @@
#define CROS_EC_DEV_NAME "cros_ec"
#define CROS_EC_DEV_PD_NAME "cros_pd"
+#define CROS_EC_DEV_SCP_NAME "cros_scp"
/*
* The EC is unresponsive for a time after a reboot command. Add a
diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index fc91082d4c357b..3e5da6e93b2f42 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -856,6 +856,8 @@ enum ec_feature_code {
EC_FEATURE_RTC = 27,
/* EC supports CEC commands */
EC_FEATURE_CEC = 35,
+ /* The MCU exposes a SCP */
+ EC_FEATURE_SCP = 39,
};
#define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))
--
2.20.1.611.gfbb209baf1-goog
next prev parent reply other threads:[~2019-01-31 9:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190131093131.245531-1-pihsun@chromium.org>
2019-01-31 9:31 ` [PATCH v4 1/6] dt-bindings: Add a binding for Mediatek SCP Pi-Hsun Shih
2019-01-31 9:31 ` [PATCH v4 2/6] remoteproc/mediatek: add SCP support for mt8183 Pi-Hsun Shih
2019-02-02 1:03 ` Matthias Kaehlcke
2019-02-04 17:59 ` Matthias Brugger
[not found] ` <20190202001749.GT81583@google.com>
2019-02-04 18:02 ` Matthias Brugger
2019-02-13 3:16 ` Pi-Hsun Shih
2019-02-13 3:20 ` Pi-Hsun Shih
2019-02-13 17:01 ` Matthias Kaehlcke
2019-01-31 9:31 ` [PATCH v4 3/6] rpmsg: add rpmsg support for mt8183 SCP Pi-Hsun Shih
2019-02-04 20:42 ` Matthias Kaehlcke
2019-01-31 9:31 ` [PATCH v4 4/6] mfd: add EC host command support using rpmsg Pi-Hsun Shih
2019-01-31 9:31 ` Pi-Hsun Shih [this message]
2019-01-31 9:31 ` [PATCH v4 6/6] remoteproc/mediatek: Load ELF instead of bin file for mtk_scp Pi-Hsun Shih
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190131093131.245531-6-pihsun@chromium.org \
--to=pihsun@chromium.org \
--cc=bleung@chromium.org \
--cc=eballetbo@gmail.com \
--cc=enric.balletbo@collabora.com \
--cc=erin.lo@mediatek.com \
--cc=groeck@chromium.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).