Skip to content

Commit f36cb4e

Browse files
committed
extcon: remove EXTCON_PROP_USB_ID property
Fix commit 536277d ("FROMLIST: extcon: Add the support for extcon property according to extcon type"), which introduce EXTCON_PROP_USB_ID property, but upstream don't have such property. Remove it make merge easy. Change-Id: I7905049629aa85158b7e705b40018f83fa85a9ac Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
1 parent 8131a15 commit f36cb4e

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

include/linux/extcon.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@
9999
/*
100100
* Properties of EXTCON_TYPE_USB.
101101
*
102-
* - EXTCON_PROP_USB_ID
103-
* @type: integer (intval)
104-
* @value: 0 (low) or 1 (high)
105-
* @default: 0 (low)
106102
* - EXTCON_PROP_USB_VBUS
107103
* @type: integer (intval)
108104
* @value: 0 (low) or 1 (high)
@@ -112,12 +108,11 @@
112108
* @value: 0 (normal) or 1 (flip)
113109
* @default: 0 (normal)
114110
*/
115-
#define EXTCON_PROP_USB_ID 0
116-
#define EXTCON_PROP_USB_VBUS 1
117-
#define EXTCON_PROP_USB_TYPEC_POLARITY 2
111+
#define EXTCON_PROP_USB_VBUS 0
112+
#define EXTCON_PROP_USB_TYPEC_POLARITY 1
118113

119114
#define EXTCON_PROP_USB_MIN 0
120-
#define EXTCON_PROP_USB_MAX 2
115+
#define EXTCON_PROP_USB_MAX 1
121116
#define EXTCON_PROP_USB_CNT (EXTCON_PROP_USB_MAX - EXTCON_PROP_USB_MIN + 1)
122117

123118
/* Properties of EXTCON_TYPE_CHG. */

0 commit comments

Comments
 (0)