usb: typec: tipd: Forward plug orientation to typec subsystem

In order to bring up the USB3 PHY on the Apple M1 we need to know the
orientation of the Type-C cable. Extract it from the status register and
forward it to the typec subsystem.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/20220226125912.59828-1-sven@svenpeter.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 7ffcda94d323af085ec1c551749c1cb20da2e3b7..16b4560216ba6e99ff8f47dab0b25cfa348ae702 100644 (file)
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -256,6 +256,10 @@ static int tps6598x_connect(struct tps6598x *tps, u32 status)
        typec_set_pwr_opmode(tps->port, mode);
        typec_set_pwr_role(tps->port, TPS_STATUS_TO_TYPEC_PORTROLE(status));
        typec_set_vconn_role(tps->port, TPS_STATUS_TO_TYPEC_VCONN(status));
+       if (TPS_STATUS_TO_UPSIDE_DOWN(status))
+               typec_set_orientation(tps->port, TYPEC_ORIENTATION_REVERSE);
+       else
+               typec_set_orientation(tps->port, TYPEC_ORIENTATION_NORMAL);
        tps6598x_set_data_role(tps, TPS_STATUS_TO_TYPEC_DATAROLE(status), true);
 
        tps->partner = typec_register_partner(tps->port, &desc);
@@ -278,6 +282,7 @@ static void tps6598x_disconnect(struct tps6598x *tps, u32 status)
        typec_set_pwr_opmode(tps->port, TYPEC_PWR_MODE_USB);
        typec_set_pwr_role(tps->port, TPS_STATUS_TO_TYPEC_PORTROLE(status));
        typec_set_vconn_role(tps->port, TPS_STATUS_TO_TYPEC_VCONN(status));
+       typec_set_orientation(tps->port, TYPEC_ORIENTATION_NONE);
        tps6598x_set_data_role(tps, TPS_STATUS_TO_TYPEC_DATAROLE(status), false);
 
        power_supply_changed(tps->psy);

diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h
index 3dae84c524fb57ce7e8bf2a3a8593a614ad89ca5..527857549d699ea6cbd426beab91c71961729b96 100644 (file)
--- a/drivers/usb/typec/tipd/tps6598x.h
+++ b/drivers/usb/typec/tipd/tps6598x.h
@@ -17,6 +17,7 @@
 /* TPS_REG_STATUS bits */
 #define TPS_STATUS_PLUG_PRESENT                BIT(0)
 #define TPS_STATUS_PLUG_UPSIDE_DOWN    BIT(4)
+#define TPS_STATUS_TO_UPSIDE_DOWN(s)   (!!((s) & TPS_STATUS_PLUG_UPSIDE_DOWN))
 #define TPS_STATUS_PORTROLE            BIT(5)
 #define TPS_STATUS_TO_TYPEC_PORTROLE(s) (!!((s) & TPS_STATUS_PORTROLE))
 #define TPS_STATUS_DATAROLE            BIT(6)