From: Heikki Krogerus <heikki.krogerus@linux.intel.com> To: Hans de Goede <hdegoede@redhat.com> Cc: Andy Shevchenko <andy.shevchenko@gmail.com>, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 08/12] platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector Date: Fri, 15 Mar 2019 19:57:56 +0300 [thread overview] Message-ID: <20190315165800.5058-9-heikki.krogerus@linux.intel.com> (raw) In-Reply-To: <20190315165800.5058-1-heikki.krogerus@linux.intel.com> 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> --- drivers/platform/x86/intel_cht_int33fe.c | 37 ++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 26444d31945b..44860c748bf5 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -25,6 +25,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/pci.h> +#include <linux/usb/pd.h> #define EXPECTED_PTYPE 4 @@ -32,6 +33,7 @@ enum { INT33FE_NODE_FUSB302, INT33FE_NODE_MAX17047, INT33FE_NODE_PI3USB30532, + INT33FE_NODE_USB_CONNECTOR, INT33FE_NODE_MAX, }; @@ -112,9 +114,29 @@ cht_int33fe_max17047(struct device *dev, struct cht_int33fe_data *data) static const struct property_entry fusb302_props[] = { PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), - PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000), - PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000), - PROPERTY_ENTRY_U32("fcs,max-sink-microwatt", 36000000), + { } +}; + +#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("name", "connector"), + 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", 36000000), { } }; @@ -149,6 +171,15 @@ static int cht_int33fe_add_nodes(struct cht_int33fe_data *data) data->node[i] = fwnode; } + /* Node for the USB connector (FUSB302 is the parent) */ + fwnode = fwnode_create_software_node(usb_connector_props, + data->node[INT33FE_NODE_FUSB302]); + if (IS_ERR(fwnode)) { + ret = PTR_ERR(fwnode); + goto err_remove_nodes; + } + data->node[INT33FE_NODE_USB_CONNECTOR] = fwnode; + return 0; err_remove_nodes: -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Heikki Krogerus <heikki.krogerus@linux.intel.com> To: Hans de Goede <hdegoede@redhat.com> Cc: Andy Shevchenko <andy.shevchenko@gmail.com>, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [08/12] platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector Date: Fri, 15 Mar 2019 19:57:56 +0300 [thread overview] Message-ID: <20190315165800.5058-9-heikki.krogerus@linux.intel.com> (raw) 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> --- drivers/platform/x86/intel_cht_int33fe.c | 37 ++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 26444d31945b..44860c748bf5 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -25,6 +25,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/pci.h> +#include <linux/usb/pd.h> #define EXPECTED_PTYPE 4 @@ -32,6 +33,7 @@ enum { INT33FE_NODE_FUSB302, INT33FE_NODE_MAX17047, INT33FE_NODE_PI3USB30532, + INT33FE_NODE_USB_CONNECTOR, INT33FE_NODE_MAX, }; @@ -112,9 +114,29 @@ cht_int33fe_max17047(struct device *dev, struct cht_int33fe_data *data) static const struct property_entry fusb302_props[] = { PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), - PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000), - PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000), - PROPERTY_ENTRY_U32("fcs,max-sink-microwatt", 36000000), + { } +}; + +#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("name", "connector"), + 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", 36000000), { } }; @@ -149,6 +171,15 @@ static int cht_int33fe_add_nodes(struct cht_int33fe_data *data) data->node[i] = fwnode; } + /* Node for the USB connector (FUSB302 is the parent) */ + fwnode = fwnode_create_software_node(usb_connector_props, + data->node[INT33FE_NODE_FUSB302]); + if (IS_ERR(fwnode)) { + ret = PTR_ERR(fwnode); + goto err_remove_nodes; + } + data->node[INT33FE_NODE_USB_CONNECTOR] = fwnode; + return 0; err_remove_nodes:
next prev parent reply other threads:[~2019-03-15 16:58 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-15 16:57 [RFC PATCH 00/12] platform/x86: intel_cht_int33fe: Real DisplayPort reference Heikki Krogerus 2019-03-15 16:57 ` [PATCH 01/12] software node: Prevent potential NULL Pointer Dereference Heikki Krogerus 2019-03-15 16:57 ` [01/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 02/12] software node: Increment parent node's ref count Heikki Krogerus 2019-03-15 16:57 ` [02/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 03/12] software node: Add support for references Heikki Krogerus 2019-03-15 16:57 ` [03/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 04/12] software node: Implement .get_reference_args fwnode operation Heikki Krogerus 2019-03-15 16:57 ` [04/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 05/12] ACPI / property: Don't limit named child node matching to data nodes Heikki Krogerus 2019-03-15 16:57 ` [05/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 06/12] device connection: Find connections also by checking the references Heikki Krogerus 2019-03-15 16:57 ` [06/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 07/12] platform/x86: intel_cht_int33fe: Provide software node for all components Heikki Krogerus 2019-03-15 16:57 ` [07/12] " Heikki Krogerus 2019-03-17 20:36 ` [PATCH 07/12] " Andy Shevchenko 2019-03-17 20:36 ` [07/12] " Andy Shevchenko 2019-03-18 9:10 ` [PATCH 07/12] " Heikki Krogerus 2019-03-18 9:10 ` [07/12] " Heikki Krogerus 2019-03-18 9:25 ` [PATCH 07/12] " Andy Shevchenko 2019-03-18 9:25 ` [07/12] " Andy Shevchenko 2019-03-15 16:57 ` Heikki Krogerus [this message] 2019-03-15 16:57 ` [08/12] platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector Heikki Krogerus 2019-03-15 16:57 ` [PATCH 09/12] platform/x86: intel_cht_int33fe: Link with external dependencies using fwnodes Heikki Krogerus 2019-03-15 16:57 ` [09/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 10/12] platform/x86: intel_cht_int33fe: Replacing the old connections with references Heikki Krogerus 2019-03-15 16:57 ` [10/12] " Heikki Krogerus 2019-03-15 16:57 ` [PATCH 11/12] drm: Add fwnode member to the struct drm_connector Heikki Krogerus 2019-03-15 16:57 ` [11/12] " Heikki Krogerus 2019-03-15 16:58 ` [PATCH 12/12] drm/i915: Associate the ACPI connector nodes with connector entries Heikki Krogerus 2019-03-15 16:58 ` [12/12] " Heikki Krogerus
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=20190315165800.5058-9-heikki.krogerus@linux.intel.com \ --to=heikki.krogerus@linux.intel.com \ --cc=andy.shevchenko@gmail.com \ --cc=hdegoede@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=platform-driver-x86@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.