diff mbox series

[8/8] plarform: x86: intel_cht_int33fe: Remove the old connections for the muxes

Message ID 20180831142026.49401-9-heikki.krogerus@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series usb: typec: A few more improvements for Intel CHT | expand

Commit Message

Heikki Krogerus Aug. 31, 2018, 2:20 p.m. UTC 
USB Type-C class driver now expects the muxes to be always
assigned to the ports and not controllers, so the
connections for the mux and fusb302 can be removed.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/platform/x86/intel_cht_int33fe.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 4a41c546ce2f..f4449d546459 100644
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -35,7 +35,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[6];
+	struct device_connection connections[4];
 };
 
 /*
@@ -176,27 +176,20 @@  static int cht_int33fe_probe(struct i2c_client *client)
 			return -EPROBE_DEFER; /* Wait for i2c-adapter to load */
 	}
 
-	data->connections[0].endpoint[0] = "i2c-fusb302";
+	data->connections[0].endpoint[0] = "port0";
 	data->connections[0].endpoint[1] = "i2c-pi3usb30532";
 	data->connections[0].id = "typec-switch";
-	data->connections[1].endpoint[0] = "i2c-fusb302";
+	data->connections[1].endpoint[0] = "port0";
 	data->connections[1].endpoint[1] = "i2c-pi3usb30532";
 	data->connections[1].id = "idff01m01";
 
-	data->connections[2].endpoint[0] = "port0";
-	data->connections[2].endpoint[1] = "i2c-pi3usb30532";
-	data->connections[2].id = "typec-switch";
-	data->connections[3].endpoint[0] = "port0";
-	data->connections[3].endpoint[1] = "i2c-pi3usb30532";
-	data->connections[3].id = "idff01m01";
-
 	/* Only adding connection for role switch if UDC exists */
 	udc = pci_get_class(PCI_CLASS_SERIAL_USB_DEVICE, NULL);
 	if (udc) {
 		pci_dev_put(udc);
-		data->connections[4].endpoint[0] = "i2c-fusb302";
-		data->connections[4].endpoint[1] = "intel_xhci_usb_sw-role-switch";
-		data->connections[4].id = "usb-role-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);