From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Chen Yu <chenyu56@huawei.com>, Jun Li <jun.li@nxp.com>,
Hans de Goede <hdegoede@redhat.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 3/9] platform/x86: intel_cht_int33fe: Remove old style mux connections
Date: Wed, 13 Feb 2019 10:45:51 +0300 [thread overview]
Message-ID: <20190213074557.66028-4-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20190213074557.66028-1-heikki.krogerus@linux.intel.com>
The new mux connection naming scheme is now in use, so
dropping the connections still using the old names. From now
on the same connection description named "mode-switch" is
used with both the port and the alternate modes, so on CHT
the DP alt mode will use the same connection as the port to
get a handle to the mux device.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/platform/x86/intel_cht_int33fe.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 295fe19ad4c2..6fa3cced6f8e 100644
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -32,7 +32,7 @@ struct cht_int33fe_data {
struct i2c_client *fusb302;
struct i2c_client *pi3usb30532;
/* Contain a list-head must be per device */
- struct device_connection connections[7];
+ struct device_connection connections[4];
};
/*
@@ -174,22 +174,13 @@ static int cht_int33fe_probe(struct platform_device *pdev)
data->connections[0].endpoint[0] = "port0";
data->connections[0].endpoint[1] = "i2c-pi3usb30532";
- data->connections[0].id = "typec-switch";
+ data->connections[0].id = "orientation-switch";
data->connections[1].endpoint[0] = "port0";
data->connections[1].endpoint[1] = "i2c-pi3usb30532";
- data->connections[1].id = "typec-mux";
- data->connections[2].endpoint[0] = "port0";
- data->connections[2].endpoint[1] = "i2c-pi3usb30532";
- data->connections[2].id = "idff01m01";
- data->connections[3].endpoint[0] = "i2c-fusb302";
- data->connections[3].endpoint[1] = "intel_xhci_usb_sw-role-switch";
- data->connections[3].id = "usb-role-switch";
- data->connections[4].endpoint[0] = "port0";
- data->connections[4].endpoint[1] = "i2c-pi3usb30532";
- data->connections[4].id = "orientation-switch";
- data->connections[5].endpoint[0] = "port0";
- data->connections[5].endpoint[1] = "i2c-pi3usb30532";
- data->connections[5].id = "mode-switch";
+ 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);
--
2.20.1
next prev parent reply other threads:[~2019-02-13 7:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 7:45 [PATCH v3 0/9] device connection: Add support for device graphs Heikki Krogerus
2019-02-13 7:45 ` [PATCH v3 1/9] platform/x86: intel_cht_int33fe: Prepare for better mux naming scheme Heikki Krogerus
2019-02-13 8:34 ` Sergei Shtylyov
2019-02-13 7:45 ` [PATCH v3 2/9] usb: typec: Rationalize the API for the muxes Heikki Krogerus
2019-02-13 7:45 ` Heikki Krogerus [this message]
2019-02-13 7:45 ` [PATCH v3 4/9] device connection: Add fwnode member to struct device_connection Heikki Krogerus
2019-02-13 7:45 ` [PATCH v3 5/9] usb: typec: mux: Find the muxes by also matching against the device node Heikki Krogerus
2019-02-13 7:45 ` [PATCH v3 6/9] usb: roles: " Heikki Krogerus
2019-02-13 7:45 ` [PATCH v3 7/9] usb: typec: Find the ports " Heikki Krogerus
2019-02-13 8:38 ` Sergei Shtylyov
2019-02-13 7:45 ` [PATCH v3 8/9] device connection: Prepare support for firmware described connections Heikki Krogerus
2019-02-13 7:45 ` [PATCH v3 9/9] device connection: Find device connections also from device graphs Heikki Krogerus
2019-02-14 10:10 ` [PATCH v3 0/9] device connection: Add support for " Greg Kroah-Hartman
2019-02-15 12:47 ` Heikki Krogerus
2019-02-18 8:07 ` Greg Kroah-Hartman
2019-02-18 8:51 ` 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=20190213074557.66028-4-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=chenyu56@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jun.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).