Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c129b8 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Will McVicker
Browse files

UPSTREAM: platform/x86: intel_cht_int33fe: Remove old style mux connections 



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.

Bug: 150877929
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarJun Li <jun.li@nxp.com>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: If11eda46906d48ab4824aca0d949e1cf23067756
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
(cherry picked from commit 393cd68d0dd3cbaacd8b1ee571d4105a170cf856)
parent 60876b18

drivers/platform/x86/intel_cht_int33fe.c

+6 −15
Original line number Diff line number Diff line
@@ -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[7];

	struct device_connection connections[4];

};



/*
@@ -177,22 +177,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);