From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: "Sameer Nanda" <snanda@chromium.org>,
"Javier Martinez Canillas" <javier@osg.samsung.com>,
"Lee Jones" <lee.jones@linaro.org>,
"Benson Leung" <bleung@chromium.org>,
"Enric Balletbò" <enric.balletbo@collabora.co.uk>,
"Vic Yang" <victoryang@chromium.org>,
"Stephen Boyd" <sboyd@codeaurora.org>,
"Vincent Palatin" <vpalatin@chromium.org>,
"Randall Spangler" <rspangler@chromium.org>,
"Todd Broch" <tbroch@chromium.org>,
"Gwendal Grignou" <gwendal@chromium.org>,
"Tomeu Vizoso" <tomeu.vizoso@collabora.com>,
"Olof Johansson" <olof@lixom.net>
Subject: [PATCH v5 6/6] platform/chrome: Register USB PD charger device
Date: Mon, 14 Mar 2016 16:45:01 +0100 [thread overview]
Message-ID: <1457970301-24616-7-git-send-email-tomeu.vizoso@collabora.com> (raw)
In-Reply-To: <1457970301-24616-1-git-send-email-tomeu.vizoso@collabora.com>
Check if a EC has andy PD ports and register a USB PD charger device if
so.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Only register the PD charger device if there are any PD ports in this
EC.
- Dropped patch using EC_CMD_GET_FEATURES to decide whether to create a
charger device because we are now only creating one if a EC has any PD
ports.
- Dropped patch adding power_supply types because it has been merged
already.
Changes in v2:
- Move cros_ec_usb_pd_charger_register into cros_ec_dev.c.
drivers/platform/chrome/cros_ec_dev.c | 44 +++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/drivers/platform/chrome/cros_ec_dev.c b/drivers/platform/chrome/cros_ec_dev.c
index d45cd254ed1c..b1251f4a04c1 100644
--- a/drivers/platform/chrome/cros_ec_dev.c
+++ b/drivers/platform/chrome/cros_ec_dev.c
@@ -22,6 +22,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/uaccess.h>
+#include <linux/mfd/core.h>
#include "cros_ec_dev.h"
@@ -87,6 +88,30 @@ exit:
return ret;
}
+static int cros_ec_has_usb_pd_ports(struct cros_ec_dev *ec)
+{
+ struct cros_ec_command *msg;
+ struct ec_response_usb_pd_ports *resp;
+ int ret;
+
+ msg = kmalloc(sizeof(*msg) + sizeof(*resp), GFP_KERNEL);
+ if (!msg)
+ return -ENOMEM;
+
+ msg->version = 0;
+ msg->command = EC_CMD_USB_PD_PORTS + ec->cmd_offset;
+ msg->insize = sizeof(struct ec_response_usb_pd_ports);
+ msg->outsize = 0;
+
+ ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
+ resp = (struct ec_response_usb_pd_ports *)msg->data;
+ ret = ret >= 0 && msg->result == EC_RES_SUCCESS && resp->num_ports;
+
+ kfree(msg);
+
+ return ret;
+}
+
/* Device file ops */
static int ec_device_open(struct inode *inode, struct file *filp)
{
@@ -217,6 +242,13 @@ static void __remove(struct device *dev)
kfree(ec);
}
+static const struct mfd_cell cros_usb_pd_charger_devs[] = {
+ {
+ .name = "cros-usb-pd-charger",
+ .id = -1,
+ },
+};
+
static int ec_device_probe(struct platform_device *pdev)
{
int retval = -ENOMEM;
@@ -269,8 +301,20 @@ static int ec_device_probe(struct platform_device *pdev)
goto dev_reg_failed;
}
+ if (cros_ec_has_usb_pd_ports(ec)) {
+ retval = mfd_add_devices(dev, 0, cros_usb_pd_charger_devs,
+ ARRAY_SIZE(cros_usb_pd_charger_devs),
+ NULL, 0, NULL);
+ if (retval) {
+ dev_err(dev, "failed to add usb-pd-charger device\n");
+ goto pd_reg_failed;
+ }
+ }
+
return 0;
+pd_reg_failed:
+ put_device(&ec->class_dev);
dev_reg_failed:
set_named_failed:
dev_set_drvdata(dev, NULL);
--
2.5.0
prev parent reply other threads:[~2016-03-14 15:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 15:44 [PATCH v5 0/6] EC-based USB Power Delivery support for Chrome machines Tomeu Vizoso
2016-03-14 15:44 ` [PATCH v5 1/6] mfd: cros_ec: Add MKBP event support Tomeu Vizoso
2016-03-14 15:44 ` [PATCH v5 2/6] mfd: cros_ec: Add cros_ec_cmd_xfer_status helper Tomeu Vizoso
2016-03-14 17:24 ` Benson Leung
2016-03-14 15:44 ` [PATCH v5 3/6] mfd: cros_ec: Add cros_ec_get_host_event Tomeu Vizoso
2016-03-14 19:23 ` Benson Leung
2016-03-14 15:44 ` [PATCH v5 4/6] mfd: cros_ec: Add more definitions for PD commands Tomeu Vizoso
2016-03-14 15:45 ` [PATCH v5 5/6] power: cros_usbpd-charger: Add EC-based USB PD charger driver Tomeu Vizoso
2016-04-14 9:35 ` Pavel Machek
2016-03-14 15:45 ` Tomeu Vizoso [this message]
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=1457970301-24616-7-git-send-email-tomeu.vizoso@collabora.com \
--to=tomeu.vizoso@collabora.com \
--cc=bleung@chromium.org \
--cc=enric.balletbo@collabora.co.uk \
--cc=gwendal@chromium.org \
--cc=javier@osg.samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rspangler@chromium.org \
--cc=sboyd@codeaurora.org \
--cc=snanda@chromium.org \
--cc=tbroch@chromium.org \
--cc=victoryang@chromium.org \
--cc=vpalatin@chromium.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).