usb: typec: ps883x: Fix DP+USB3 configuration

Commit 6bebd9b77726 ("usb: typec: ps883x: Rework ps883x_set()") introduced
two regressions:

 1. The CONN_STATUS_0_USB_3_1_CONNECTED bit is mistakenly written to the
    wrong configuration register (cfg1 instead of cfg0). This breaks USB3
    when using USB3+DP adapters.

 2. The switch-case fallthrough block is inverted: Currently,
    TYPEC_DP_STATE_C (DP-only) inherits the USB3 configuration, while
    TYPEC_DP_STATE_D (DP+USB3) is missing the necessary DP sink flags.

Fix these by writing the USB3 bit to the correct register and swapping the
case statement order so both states get their correct bits assigned.

Cc: stable <stable@kernel.org>
Fixes: 6bebd9b77726 ("usb: typec: ps883x: Rework ps883x_set()")
Signed-off-by: Stephan Gerhold <stephan.gerhold@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://patch.msgid.link/20260601-ps883x-usb3dp-fixes-v1-1-d19bec3a6d26@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/mux/ps883x.c b/drivers/usb/typec/mux/ps883x.c
index f52443638ee28060c7d20687753193d6321d486b..64e0a61b776a183971403525780d150402a668a0 100644 (file)
--- a/drivers/usb/typec/mux/ps883x.c
+++ b/drivers/usb/typec/mux/ps883x.c
@@ -206,12 +206,12 @@ static int ps883x_set(struct ps883x_retimer *retimer, struct typec_retimer_state
                                CONN_STATUS_1_DP_HPD_LEVEL;
 
                        switch (state->mode)  {
+                       case TYPEC_DP_STATE_D:
+                               cfg0 |= CONN_STATUS_0_USB_3_1_CONNECTED;
+                               fallthrough;
                        case TYPEC_DP_STATE_C:
                                cfg1 |= CONN_STATUS_1_DP_SINK_REQUESTED |
                                        CONN_STATUS_1_DP_PIN_ASSIGNMENT_C_D;
-                               fallthrough;
-                       case TYPEC_DP_STATE_D:
-                               cfg1 |= CONN_STATUS_0_USB_3_1_CONNECTED;
                                break;
                        default: /* MODE_E */
                                break;