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 10/12] platform/x86: intel_cht_int33fe: Replacing the old connections with references Date: Fri, 15 Mar 2019 19:57:58 +0300 [thread overview] Message-ID: <20190315165800.5058-11-heikki.krogerus@linux.intel.com> (raw) In-Reply-To: <20190315165800.5058-1-heikki.krogerus@linux.intel.com> Now that the software nodes support references, and the device connection API support parsing fwnode references, replacing the old connection descriptions with software node references. Relying on device names when matching the connection would not have been possible to link the USB Type-C connector and the DisplayPort connector together, but with real references it's not problem. The DisplayPort ACPI node is dag up, and the drivers own software node for the DisplayPort is set as the secondary node for it. The USB Type-C connector refers the software node, but it is now tied to the ACPI node, and therefore any device entry (struct drm_connector in practice) that the node combo is assigned to. The USB role switch device does not have ACPI node, so we have to wait for the device to appear. Then we can simply assign our software node for the to the device. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- drivers/platform/x86/intel_cht_int33fe.c | 94 +++++++++++++++++++----- 1 file changed, 77 insertions(+), 17 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index aa71b97a22e9..5cdb7fa33f2b 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -39,15 +39,22 @@ enum { INT33FE_NODE_MAX, }; +enum { + INT33FE_REF_ORIENTATION, + INT33FE_REF_MODE_MUX, + INT33FE_REF_DISPLAYPORT, + INT33FE_REF_ROLE_SWITCH, + INT33FE_REF_MAX, +}; + struct cht_int33fe_data { struct i2c_client *max17047; struct i2c_client *fusb302; struct i2c_client *pi3usb30532; - /* Contain a list-head must be per device */ - struct device_connection connections[4]; struct fwnode_handle *dp; struct fwnode_handle *node[INT33FE_NODE_MAX]; + struct software_node_reference *ref[INT33FE_REF_MAX]; }; /* @@ -290,6 +297,65 @@ static int cht_int33fe_add_nodes(struct cht_int33fe_data *data) return ret; } +static void cht_int33fe_remove_references(struct cht_int33fe_data *data) +{ + int i; + + for (i = 0; i < INT33FE_REF_MAX; i++) + fwnode_remove_software_node_reference(data->ref[i]); +} + +static int cht_int33fe_add_references(struct cht_int33fe_data *data) +{ + struct fwnode_reference_args args[2] = { }; + struct software_node_reference *ref; + struct fwnode_handle *con; + + con = data->node[INT33FE_NODE_USB_CONNECTOR]; + + /* USB Type-C muxes */ + args[0].fwnode = data->node[INT33FE_NODE_PI3USB30532]; + args[1].fwnode = NULL; + + ref = fwnode_create_software_node_reference(con, "orientation-switch", + args); + if (IS_ERR(ref)) + return PTR_ERR(ref); + data->ref[INT33FE_REF_ORIENTATION] = ref; + + ref = fwnode_create_software_node_reference(con, "mode-switch", + args); + if (IS_ERR(ref)) { + cht_int33fe_remove_references(data); + return PTR_ERR(ref); + } + data->ref[INT33FE_REF_MODE_MUX] = ref; + + /* USB role switch */ + args[0].fwnode = data->node[INT33FE_NODE_ROLE_SWITCH]; + args[1].fwnode = NULL; + + ref = fwnode_create_software_node_reference(con, "usb-role-switch", args); + if (IS_ERR(ref)) { + cht_int33fe_remove_references(data); + return PTR_ERR(ref); + } + data->ref[INT33FE_REF_ROLE_SWITCH] = ref; + + /* DisplayPort */ + args[0].fwnode = data->node[INT33FE_NODE_DISPLAYPORT]; + args[1].fwnode = NULL; + + ref = fwnode_create_software_node_reference(con, "displayport", args); + if (IS_ERR(ref)) { + cht_int33fe_remove_references(data); + return PTR_ERR(ref); + } + data->ref[INT33FE_REF_DISPLAYPORT] = ref; + + return 0; +} + static int cht_int33fe_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -358,22 +424,14 @@ static int cht_int33fe_probe(struct platform_device *pdev) if (ret) return ret; - /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ - ret = cht_int33fe_max17047(dev, data); + ret = cht_int33fe_add_references(data); if (ret) goto out_remove_nodes; - data->connections[0].endpoint[0] = "port0"; - data->connections[0].endpoint[1] = "i2c-pi3usb30532"; - data->connections[0].id = "orientation-switch"; - data->connections[1].endpoint[0] = "port0"; - data->connections[1].endpoint[1] = "i2c-pi3usb30532"; - data->connections[1].id = "mode-switch"; - data->connections[2].endpoint[0] = "i2c-fusb302"; - data->connections[2].endpoint[1] = "intel_xhci_usb_sw-role-switch"; - data->connections[2].id = "usb-role-switch"; - - device_connections_add(data->connections); + /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ + ret = cht_int33fe_max17047(dev, data); + if (ret) + goto out_remove_references; memset(&board_info, 0, sizeof(board_info)); strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE); @@ -406,9 +464,11 @@ static int cht_int33fe_probe(struct platform_device *pdev) i2c_unregister_device(data->fusb302); out_unregister_max17047: - device_connections_remove(data->connections); i2c_unregister_device(data->max17047); +out_remove_references: + cht_int33fe_remove_references(data); + out_remove_nodes: cht_int33fe_remove_nodes(data); @@ -423,7 +483,7 @@ static int cht_int33fe_remove(struct platform_device *pdev) i2c_unregister_device(data->fusb302); i2c_unregister_device(data->max17047); - device_connections_remove(data->connections); + cht_int33fe_remove_references(data); cht_int33fe_remove_nodes(data); return 0; -- 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: [10/12] platform/x86: intel_cht_int33fe: Replacing the old connections with references Date: Fri, 15 Mar 2019 19:57:58 +0300 [thread overview] Message-ID: <20190315165800.5058-11-heikki.krogerus@linux.intel.com> (raw) Now that the software nodes support references, and the device connection API support parsing fwnode references, replacing the old connection descriptions with software node references. Relying on device names when matching the connection would not have been possible to link the USB Type-C connector and the DisplayPort connector together, but with real references it's not problem. The DisplayPort ACPI node is dag up, and the drivers own software node for the DisplayPort is set as the secondary node for it. The USB Type-C connector refers the software node, but it is now tied to the ACPI node, and therefore any device entry (struct drm_connector in practice) that the node combo is assigned to. The USB role switch device does not have ACPI node, so we have to wait for the device to appear. Then we can simply assign our software node for the to the device. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- drivers/platform/x86/intel_cht_int33fe.c | 94 +++++++++++++++++++----- 1 file changed, 77 insertions(+), 17 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index aa71b97a22e9..5cdb7fa33f2b 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -39,15 +39,22 @@ enum { INT33FE_NODE_MAX, }; +enum { + INT33FE_REF_ORIENTATION, + INT33FE_REF_MODE_MUX, + INT33FE_REF_DISPLAYPORT, + INT33FE_REF_ROLE_SWITCH, + INT33FE_REF_MAX, +}; + struct cht_int33fe_data { struct i2c_client *max17047; struct i2c_client *fusb302; struct i2c_client *pi3usb30532; - /* Contain a list-head must be per device */ - struct device_connection connections[4]; struct fwnode_handle *dp; struct fwnode_handle *node[INT33FE_NODE_MAX]; + struct software_node_reference *ref[INT33FE_REF_MAX]; }; /* @@ -290,6 +297,65 @@ static int cht_int33fe_add_nodes(struct cht_int33fe_data *data) return ret; } +static void cht_int33fe_remove_references(struct cht_int33fe_data *data) +{ + int i; + + for (i = 0; i < INT33FE_REF_MAX; i++) + fwnode_remove_software_node_reference(data->ref[i]); +} + +static int cht_int33fe_add_references(struct cht_int33fe_data *data) +{ + struct fwnode_reference_args args[2] = { }; + struct software_node_reference *ref; + struct fwnode_handle *con; + + con = data->node[INT33FE_NODE_USB_CONNECTOR]; + + /* USB Type-C muxes */ + args[0].fwnode = data->node[INT33FE_NODE_PI3USB30532]; + args[1].fwnode = NULL; + + ref = fwnode_create_software_node_reference(con, "orientation-switch", + args); + if (IS_ERR(ref)) + return PTR_ERR(ref); + data->ref[INT33FE_REF_ORIENTATION] = ref; + + ref = fwnode_create_software_node_reference(con, "mode-switch", + args); + if (IS_ERR(ref)) { + cht_int33fe_remove_references(data); + return PTR_ERR(ref); + } + data->ref[INT33FE_REF_MODE_MUX] = ref; + + /* USB role switch */ + args[0].fwnode = data->node[INT33FE_NODE_ROLE_SWITCH]; + args[1].fwnode = NULL; + + ref = fwnode_create_software_node_reference(con, "usb-role-switch", args); + if (IS_ERR(ref)) { + cht_int33fe_remove_references(data); + return PTR_ERR(ref); + } + data->ref[INT33FE_REF_ROLE_SWITCH] = ref; + + /* DisplayPort */ + args[0].fwnode = data->node[INT33FE_NODE_DISPLAYPORT]; + args[1].fwnode = NULL; + + ref = fwnode_create_software_node_reference(con, "displayport", args); + if (IS_ERR(ref)) { + cht_int33fe_remove_references(data); + return PTR_ERR(ref); + } + data->ref[INT33FE_REF_DISPLAYPORT] = ref; + + return 0; +} + static int cht_int33fe_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -358,22 +424,14 @@ static int cht_int33fe_probe(struct platform_device *pdev) if (ret) return ret; - /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ - ret = cht_int33fe_max17047(dev, data); + ret = cht_int33fe_add_references(data); if (ret) goto out_remove_nodes; - data->connections[0].endpoint[0] = "port0"; - data->connections[0].endpoint[1] = "i2c-pi3usb30532"; - data->connections[0].id = "orientation-switch"; - data->connections[1].endpoint[0] = "port0"; - data->connections[1].endpoint[1] = "i2c-pi3usb30532"; - data->connections[1].id = "mode-switch"; - data->connections[2].endpoint[0] = "i2c-fusb302"; - data->connections[2].endpoint[1] = "intel_xhci_usb_sw-role-switch"; - data->connections[2].id = "usb-role-switch"; - - device_connections_add(data->connections); + /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */ + ret = cht_int33fe_max17047(dev, data); + if (ret) + goto out_remove_references; memset(&board_info, 0, sizeof(board_info)); strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE); @@ -406,9 +464,11 @@ static int cht_int33fe_probe(struct platform_device *pdev) i2c_unregister_device(data->fusb302); out_unregister_max17047: - device_connections_remove(data->connections); i2c_unregister_device(data->max17047); +out_remove_references: + cht_int33fe_remove_references(data); + out_remove_nodes: cht_int33fe_remove_nodes(data); @@ -423,7 +483,7 @@ static int cht_int33fe_remove(struct platform_device *pdev) i2c_unregister_device(data->fusb302); i2c_unregister_device(data->max17047); - device_connections_remove(data->connections); + cht_int33fe_remove_references(data); cht_int33fe_remove_nodes(data); return 0;
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 ` [PATCH 08/12] platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector Heikki Krogerus 2019-03-15 16:57 ` [08/12] " 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 ` Heikki Krogerus [this message] 2019-03-15 16:57 ` [10/12] platform/x86: intel_cht_int33fe: Replacing the old connections with references 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-11-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.