summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2018-09-20 14:23:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-03 06:26:30 +0200
commit6875404a12f8f33d52eaa49d1fe80072a88ccb8e (patch)
tree59af14790eb97f11ea68eb0b5d9b391d0485110b
parent681a9fc184b30062ff4e1677540cb6d512c2e455 (diff)
downloadlinux-stable-6875404a12f8f33d52eaa49d1fe80072a88ccb8e.tar.gz
linux-stable-6875404a12f8f33d52eaa49d1fe80072a88ccb8e.tar.bz2
linux-stable-6875404a12f8f33d52eaa49d1fe80072a88ccb8e.zip
platform: x86: intel_cht_int33fe: Add connections for the USB Type-C port
commit 495965a1002a0b301bf4fbfd1aed3233f3e7db1b upstream. Assigning the mux to the USB Type-C port on top of fusb302. That will prepare this driver for the change in the USB Type-C class code, where the class driver will assume the muxes to be always assigned to the ports and not the controllers. Once the USB Type-C class driver has been updated, the connections between the mux and fusb302 can be dropped. Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/platform/x86/intel_cht_int33fe.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 424064187124..419ce8c8ffb5 100644
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -34,7 +34,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[5];
+ struct device_connection connections[8];
};
/*
@@ -187,6 +187,16 @@ static int cht_int33fe_probe(struct i2c_client *client)
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 = "typec-switch";
+ data->connections[5].endpoint[0] = "port0";
+ data->connections[5].endpoint[1] = "i2c-pi3usb30532";
+ data->connections[5].id = "typec-mux";
+ data->connections[6].endpoint[0] = "port0";
+ data->connections[6].endpoint[1] = "i2c-pi3usb30532";
+ data->connections[6].id = "idff01m01";
+
device_connections_add(data->connections);
memset(&board_info, 0, sizeof(board_info));