Skip to content

Commit 148b0aa

Browse files
Heikki Krogerusgregkh
authored andcommitted
platform: x86: intel_cht_int33fe: Remove the old connections for the muxes
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: Andy Shevchenko <[email protected]> Acked-by: Hans de Goede <[email protected]> Tested-by: Hans de Goede <[email protected]> Signed-off-by: Heikki Krogerus <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2348112 commit 148b0aa

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

drivers/platform/x86/intel_cht_int33fe.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct cht_int33fe_data {
3434
struct i2c_client *fusb302;
3535
struct i2c_client *pi3usb30532;
3636
/* Contain a list-head must be per device */
37-
struct device_connection connections[8];
37+
struct device_connection connections[5];
3838
};
3939

4040
/*
@@ -174,29 +174,19 @@ static int cht_int33fe_probe(struct i2c_client *client)
174174
return -EPROBE_DEFER; /* Wait for i2c-adapter to load */
175175
}
176176

177-
data->connections[0].endpoint[0] = "i2c-fusb302";
177+
data->connections[0].endpoint[0] = "port0";
178178
data->connections[0].endpoint[1] = "i2c-pi3usb30532";
179179
data->connections[0].id = "typec-switch";
180-
data->connections[1].endpoint[0] = "i2c-fusb302";
180+
data->connections[1].endpoint[0] = "port0";
181181
data->connections[1].endpoint[1] = "i2c-pi3usb30532";
182182
data->connections[1].id = "typec-mux";
183-
data->connections[2].endpoint[0] = "i2c-fusb302";
183+
data->connections[2].endpoint[0] = "port0";
184184
data->connections[2].endpoint[1] = "i2c-pi3usb30532";
185185
data->connections[2].id = "idff01m01";
186186
data->connections[3].endpoint[0] = "i2c-fusb302";
187187
data->connections[3].endpoint[1] = "intel_xhci_usb_sw-role-switch";
188188
data->connections[3].id = "usb-role-switch";
189189

190-
data->connections[4].endpoint[0] = "port0";
191-
data->connections[4].endpoint[1] = "i2c-pi3usb30532";
192-
data->connections[4].id = "typec-switch";
193-
data->connections[5].endpoint[0] = "port0";
194-
data->connections[5].endpoint[1] = "i2c-pi3usb30532";
195-
data->connections[5].id = "typec-mux";
196-
data->connections[6].endpoint[0] = "port0";
197-
data->connections[6].endpoint[1] = "i2c-pi3usb30532";
198-
data->connections[6].id = "idff01m01";
199-
200190
device_connections_add(data->connections);
201191

202192
memset(&board_info, 0, sizeof(board_info));

0 commit comments

Comments
 (0)