Commit f470a655 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

usb: typec: Combine the definitions for Accessory and USB modes 



There is no need to describe them sparately.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20200701115618.22482-2-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9b70170

include/linux/usb/typec_altmode.h

+5 −9
Original line number Diff line number Diff line
@@ -95,13 +95,7 @@ enum { 
 *

 * Port drivers can use TYPEC_MODE_AUDIO and TYPEC_MODE_DEBUG as the mode

 * value for typec_set_mode() when accessory modes are supported.

 */

enum {

	TYPEC_MODE_AUDIO = TYPEC_STATE_MODAL,	/* Audio Accessory */

	TYPEC_MODE_DEBUG,			/* Debug Accessory */

};



/*

 *

 * USB4 also requires that the pins on the connector are repurposed, just like

 * Alternate Modes. USB4 mode is however not entered with the Enter Mode Command

 * like the Alternate Modes are, but instead with a special Enter_USB Message.
@@ -112,9 +106,11 @@ enum { 
 * state values, just like the Accessory Modes.

 */

enum {

	TYPEC_MODE_USB2 = TYPEC_MODE_DEBUG,	/* USB 2.0 mode */

	TYPEC_MODE_USB2 = TYPEC_STATE_MODAL,	/* USB 2.0 mode */

	TYPEC_MODE_USB3,			/* USB 3.2 mode */

	TYPEC_MODE_USB4				/* USB4 mode */

	TYPEC_MODE_USB4,			/* USB4 mode */

	TYPEC_MODE_AUDIO,			/* Audio Accessory */

	TYPEC_MODE_DEBUG,			/* Debug Accessory */

};



#define TYPEC_MODAL_STATE(_state_)	((_state_) + TYPEC_STATE_MODAL)

CRA Git | Maintained and supported by SUSTech CRA and CCSE