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

Commit 11008a9b authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

platform: x86: intel_cht_int33fe: Remove the old connections for the muxes 



commit 148b0aa78e4e1077e38f928124bbc9c2d2d24006 upstream.

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.

Acked-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 056cda45

drivers/platform/x86/intel_cht_int33fe.c

+4 −14
Original line number Diff line number Diff line
@@ -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[8];

	struct device_connection connections[5];

};



/*
@@ -174,29 +174,19 @@ 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 = "typec-mux";

	data->connections[2].endpoint[0] = "i2c-fusb302";

	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 = "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));