On Fri, Feb 16, 2018 at 12:47 PM, Hans de Goede <hdegoede@xxxxxxxxxx> wrote:
> 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 switch integrated in the CHT SoC.
>
Acked-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> drivers/platform/x86/intel_cht_int33fe.c | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
> index 380ef7ec094f..a3f8674f14da 100644
> --- a/drivers/platform/x86/intel_cht_int33fe.c
> +++ b/drivers/platform/x86/intel_cht_int33fe.c
> @@ -21,6 +21,7 @@
> */
>
> #include <linux/acpi.h>
> +#include <linux/connection.h>
> #include <linux/i2c.h>
> #include <linux/interrupt.h>
> #include <linux/module.h>
> @@ -33,6 +34,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 devcon connections[3];
> };
>
> /*
> @@ -172,6 +175,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";
> +
> + add_device_connection(&data->connections[0]);
> + add_device_connection(&data->connections[1]);
> + add_device_connection(&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 +218,10 @@ static int cht_int33fe_probe(struct i2c_client *client)
> if (data->max17047)
> i2c_unregister_device(data->max17047);
>
> + remove_device_connection(&data->connections[2]);
> + remove_device_connection(&data->connections[1]);
> + remove_device_connection(&data->connections[0]);
> +
> return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
> }
>
> @@ -213,6 +234,10 @@ static int cht_int33fe_remove(struct i2c_client *i2c)
> if (data->max17047)
> i2c_unregister_device(data->max17047);
>
> + remove_device_connection(&data->connections[2]);
> + remove_device_connection(&data->connections[1]);
> + remove_device_connection(&data->connections[0]);
> +
> return 0;
> }
>
> --
> 2.14.3
>
--
With Best Regards,
Andy Shevchenko
