Commit 32f02a21 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 28a6ed8e.

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: default avatarStephen 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d3e9b0d

include/linux/platform_data/cros_ec_commands.h

+0 −18
Original line number Diff line number Diff line
@@ -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;