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

Commit 29b4aec2 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

platform/x86: intel_cht_int33fe: Add device connections for the Type-C port



We need to add device-connections for the Type-C mux/switch and usb-role
code to be able to find the PI3USB30532 Type-C cross-switch and the
device/host role-switch integrated in the CHT SoC.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da95cc1d
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ struct cht_int33fe_data {
	struct i2c_client *max17047;
	struct i2c_client *fusb302;
	struct i2c_client *pi3usb30532;
	/* Contain a list-head must be per device */
	struct device_connection connections[3];
};

/*
@@ -172,6 +174,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[1] = "i2c-pi3usb30532";
	data->connections[0].id = "typec-switch";
	data->connections[1].endpoint[0] = "i2c-fusb302";
	data->connections[1].endpoint[1] = "i2c-pi3usb30532";
	data->connections[1].id = "typec-mux";
	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_connection_add(&data->connections[0]);
	device_connection_add(&data->connections[1]);
	device_connection_add(&data->connections[2]);

	memset(&board_info, 0, sizeof(board_info));
	strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
	board_info.dev_name = "fusb302";
@@ -201,6 +217,10 @@ static int cht_int33fe_probe(struct i2c_client *client)
	if (data->max17047)
		i2c_unregister_device(data->max17047);

	device_connection_remove(&data->connections[2]);
	device_connection_remove(&data->connections[1]);
	device_connection_remove(&data->connections[0]);

	return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
}

@@ -213,6 +233,10 @@ static int cht_int33fe_remove(struct i2c_client *i2c)
	if (data->max17047)
		i2c_unregister_device(data->max17047);

	device_connection_remove(&data->connections[2]);
	device_connection_remove(&data->connections[1]);
	device_connection_remove(&data->connections[0]);

	return 0;
}