Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1357380

[PATCH v5 6/6] platform/chrome: Register USB PD charger device

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 0/6] EC-based USB Power Delivery support for Chrome machines Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100
  [PATCH v5 5/6] power: cros_usbpd-charger: Add EC-based USB PD charger driver Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100
  [PATCH v5 1/6] mfd: cros_ec: Add MKBP event support Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100
  [PATCH v5 3/6] mfd: cros_ec: Add cros_ec_get_host_event Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100
    Re: [PATCH v5 3/6] mfd: cros_ec: Add cros_ec_get_host_event Benson Leung <bleung@chromium.org> - 2016-03-14 20:30 +0100
  [PATCH v5 2/6] mfd: cros_ec: Add cros_ec_cmd_xfer_status helper Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100
    Re: [PATCH v5 2/6] mfd: cros_ec: Add cros_ec_cmd_xfer_status helper Benson Leung <bleung@chromium.org> - 2016-03-14 18:30 +0100
  [PATCH v5 6/6] platform/chrome: Register USB PD charger device Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100
  [PATCH v5 4/6] mfd: cros_ec: Add more definitions for PD commands Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-14 16:50 +0100

csiph-web