platform/chrome: cros_ec_typec: Use notifier for updates

Register a listener for the cros-usbpd-notifier, and update port state
when a notification comes in.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index 03ea5129ed0c3d2d5df9d18fec9864e20e369f0f..a484ab2c91ff0e7a811cfdcac36d1edccdf7272a 100644 (file)
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -217,6 +217,7 @@ config CROS_EC_SYSFS
 config CROS_EC_TYPEC
        tristate "ChromeOS EC Type-C Connector Control"
        depends on MFD_CROS_EC_DEV && TYPEC
+       depends on CROS_USBPD_NOTIFY
        default MFD_CROS_EC_DEV
        help
          If you say Y here, you get support for accessing Type C connector

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 874269c070739e6ff02d1fb85534231de80738cc..d444dd7422a2a429190e02fa65c04faeab7f7e0a 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -11,6 +11,7 @@
 #include <linux/of.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
+#include <linux/platform_data/cros_usbpd_notify.h>
 #include <linux/platform_device.h>
 #include <linux/usb/typec.h>
 
@@ -26,6 +27,7 @@ struct cros_typec_data {
        struct typec_port *ports[EC_USB_PD_MAX_PORTS];
        /* Initial capabilities for each port. */
        struct typec_capability *caps[EC_USB_PD_MAX_PORTS];
+       struct notifier_block nb;
 };
 
 static int cros_typec_parse_port_props(struct typec_capability *cap,
@@ -272,6 +274,22 @@ static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
        return 0;
 }
 
+static int cros_ec_typec_event(struct notifier_block *nb,
+                              unsigned long host_event, void *_notify)
+{
+       struct cros_typec_data *typec = container_of(nb, struct cros_typec_data,
+                                                    nb);
+       int ret, i;
+
+       for (i = 0; i < typec->num_ports; i++) {
+               ret = cros_typec_port_update(typec, i);
+               if (ret < 0)
+                       dev_warn(typec->dev, "Update failed for port: %d\n", i);
+       }
+
+       return NOTIFY_OK;
+}
+
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id cros_typec_acpi_id[] = {
        { "GOOG0014", 0 },
@@ -332,6 +350,11 @@ static int cros_typec_probe(struct platform_device *pdev)
                        goto unregister_ports;
        }
 
+       typec->nb.notifier_call = cros_ec_typec_event;
+       ret = cros_usbpd_register_notify(&typec->nb);
+       if (ret < 0)
+               goto unregister_ports;
+
        return 0;
 
 unregister_ports: