platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector

In ACPI, and now also in DT, the USB connectors usually have
their own device nodes. In case of USB Type-C, those
connector (port) nodes are child nodes of the controller or
PHY device, in our case the fusb302. The software fwnodes
allow us to create a similar child node for fusb302 that
represents the connector also on Intel CHT.

This makes it possible replace the fusb302 specific device
properties which were deprecated with the common USB
connector properties that tcpm.c is able to use directly.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 9eb2ec47b47e27e234c497aa54ef5183c5730eb0..dcfe47baff723555ea697aead0321c925e0fec6d 100644 (file)
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
+#include <linux/usb/pd.h>
 
 #define EXPECTED_PTYPE         4
 
@@ -31,6 +32,7 @@ enum {
        INT33FE_NODE_FUSB302,
        INT33FE_NODE_MAX17047,
        INT33FE_NODE_PI3USB30532,
+       INT33FE_NODE_USB_CONNECTOR,
        INT33FE_NODE_MAX,
 };
 
@@ -82,10 +84,33 @@ static const struct property_entry fusb302_props[] = {
        { }
 };
 
+#define PDO_FIXED_FLAGS \
+       (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM)
+
+static const u32 src_pdo[] = {
+       PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS),
+};
+
+static const u32 snk_pdo[] = {
+       PDO_FIXED(5000, 400, PDO_FIXED_FLAGS),
+       PDO_VAR(5000, 12000, 3000),
+};
+
+static const struct property_entry usb_connector_props[] = {
+       PROPERTY_ENTRY_STRING("data-role", "dual"),
+       PROPERTY_ENTRY_STRING("power-role", "dual"),
+       PROPERTY_ENTRY_STRING("try-power-role", "sink"),
+       PROPERTY_ENTRY_U32_ARRAY("source-pdos", src_pdo),
+       PROPERTY_ENTRY_U32_ARRAY("sink-pdos", snk_pdo),
+       PROPERTY_ENTRY_U32("op-sink-microwatt", 2500000),
+       { }
+};
+
 static const struct software_node nodes[] = {
        { "fusb302", NULL, fusb302_props },
        { "max17047", NULL, max17047_props },
        { "pi3usb30532" },
+       { "connector", &nodes[0], usb_connector_props },
        { }
 };