Revert "platform/chrome: Add Type-C mux set command definitions"

This reverts commit 28a6ed8e39f77f6ac613ec9b7461aa75e85fa79a.

The chrome platform driver changes need to come in through the platform
tree due to some api changes that showed up there that cause build
errors in linux-next

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20220719160821.5e68e30b@oak.ozlabs.ibm.com
Cc: Prashant Malani <pmalani@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index a3945c5e7f50a653d69907a83b8b7d8dad45f8f8..8cfa8cfca77ef42ebf41e7e773b62a9081000223 100644 (file)
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -5722,21 +5722,8 @@ enum typec_control_command {
        TYPEC_CONTROL_COMMAND_EXIT_MODES,
        TYPEC_CONTROL_COMMAND_CLEAR_EVENTS,
        TYPEC_CONTROL_COMMAND_ENTER_MODE,
-       TYPEC_CONTROL_COMMAND_TBT_UFP_REPLY,
-       TYPEC_CONTROL_COMMAND_USB_MUX_SET,
 };
 
-/* Replies the AP may specify to the TBT EnterMode command as a UFP */
-enum typec_tbt_ufp_reply {
-       TYPEC_TBT_UFP_REPLY_NAK,
-       TYPEC_TBT_UFP_REPLY_ACK,
-};
-
-struct typec_usb_mux_set {
-       uint8_t mux_index;      /* Index of the mux to set in the chain */
-       uint8_t mux_flags;      /* USB_PD_MUX_*-encoded USB mux state to set */
-} __ec_align1;
-
 struct ec_params_typec_control {
        uint8_t port;
        uint8_t command;        /* enum typec_control_command */
@@ -5750,8 +5737,6 @@ struct ec_params_typec_control {
        union {
                uint32_t clear_events_mask;
                uint8_t mode_to_enter;      /* enum typec_mode */
-               uint8_t tbt_ufp_reply;      /* enum typec_tbt_ufp_reply */
-               struct typec_usb_mux_set mux_params;
                uint8_t placeholder[128];
        };
 } __ec_align1;
@@ -5830,9 +5815,6 @@ enum tcpc_cc_polarity {
 #define PD_STATUS_EVENT_SOP_DISC_DONE          BIT(0)
 #define PD_STATUS_EVENT_SOP_PRIME_DISC_DONE    BIT(1)
 #define PD_STATUS_EVENT_HARD_RESET             BIT(2)
-#define PD_STATUS_EVENT_DISCONNECTED           BIT(3)
-#define PD_STATUS_EVENT_MUX_0_SET_DONE         BIT(4)
-#define PD_STATUS_EVENT_MUX_1_SET_DONE         BIT(5)
 
 struct ec_params_typec_status {
        uint8_t port;