On 06/08/2018 02:29 PM, Heikki Krogerus wrote: > Instead of the tcpm specific mux states, using the generic > USB type-c connector state values, and with DisplayPort > using connector states defined for the DisplayPort Alt Mode. > > Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > --- > drivers/usb/typec/mux/pi3usb30532.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/typec/mux/pi3usb30532.c b/drivers/usb/typec/mux/pi3usb30532.c > index b0e88db60ecf..bcea242852f2 100644 > --- a/drivers/usb/typec/mux/pi3usb30532.c > +++ b/drivers/usb/typec/mux/pi3usb30532.c [...] > @@ -83,21 +83,24 @@ static int pi3usb30532_mux_set(struct typec_mux *mux, int state) > new_conf = pi->conf; > > switch (state) { > - case TYPEC_MUX_NONE: > + case TYPEC_STATE_SAFE: > new_conf = PI3USB30532_CONF_OPEN; > break; > - case TYPEC_MUX_USB: > + case TYPEC_STATE_USB: > new_conf = (new_conf & PI3USB30532_CONF_SWAP) | > - PI3USB30532_CONF_USB3; > + PI3USB30532_CONF_USB3; Unrelated white space change, inconsistent with the others below... > break; > - case TYPEC_MUX_DP: > + case TYPEC_DP_STATE_C: > + case TYPEC_DP_STATE_E: > new_conf = (new_conf & PI3USB30532_CONF_SWAP) | > PI3USB30532_CONF_4LANE_DP; > break; > - case TYPEC_MUX_DOCK: > + case TYPEC_DP_STATE_D: > new_conf = (new_conf & PI3USB30532_CONF_SWAP) | > PI3USB30532_CONF_USB3_AND_2LANE_DP; > break; > + default: > + break; > } > > ret = pi3usb30532_set_conf(pi, new_conf); MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html