aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/extcon.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-11-23 03:04:05 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-11-23 03:04:05 -0500
commit92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch)
tree15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/linux/extcon.h
parent15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff)
parent1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff)
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2 Backmerge to get at commit 1b0e3a049efe471c399674fd954500ce97438d30 Author: Imre Deak <imre.deak@intel.com> Date: Thu Nov 5 23:04:11 2015 +0200 drm/i915/skl: disable display side power well support for now so that we can proplery re-eanble skl power wells in -next. Conflicts are just adjacent lines changed, except for intel_fbdev.c where we need to interleave the changs. Nothing nefarious. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/extcon.h')
-rw-r--r--include/linux/extcon.h62
1 files changed, 36 insertions, 26 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index c0f8c4fc5d45..7abf674c388c 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -31,32 +31,42 @@
31/* 31/*
32 * Define the unique id of supported external connectors 32 * Define the unique id of supported external connectors
33 */ 33 */
34#define EXTCON_NONE 0 34#define EXTCON_NONE 0
35 35
36#define EXTCON_USB 1 /* USB connector */ 36/* USB external connector */
37#define EXTCON_USB_HOST 2 37#define EXTCON_USB 1
38 38#define EXTCON_USB_HOST 2
39#define EXTCON_TA 3 /* Charger connector */ 39
40#define EXTCON_FAST_CHARGER 4 40/* Charging external connector */
41#define EXTCON_SLOW_CHARGER 5 41#define EXTCON_CHG_USB_SDP 5 /* Standard Downstream Port */
42#define EXTCON_CHARGE_DOWNSTREAM 6 42#define EXTCON_CHG_USB_DCP 6 /* Dedicated Charging Port */
43 43#define EXTCON_CHG_USB_CDP 7 /* Charging Downstream Port */
44#define EXTCON_LINE_IN 7 /* Audio/Video connector */ 44#define EXTCON_CHG_USB_ACA 8 /* Accessory Charger Adapter */
45#define EXTCON_LINE_OUT 8 45#define EXTCON_CHG_USB_FAST 9
46#define EXTCON_MICROPHONE 9 46#define EXTCON_CHG_USB_SLOW 10
47#define EXTCON_HEADPHONE 10 47
48#define EXTCON_HDMI 11 48/* Jack external connector */
49#define EXTCON_MHL 12 49#define EXTCON_JACK_MICROPHONE 20
50#define EXTCON_DVI 13 50#define EXTCON_JACK_HEADPHONE 21
51#define EXTCON_VGA 14 51#define EXTCON_JACK_LINE_IN 22
52#define EXTCON_SPDIF_IN 15 52#define EXTCON_JACK_LINE_OUT 23
53#define EXTCON_SPDIF_OUT 16 53#define EXTCON_JACK_VIDEO_IN 24
54#define EXTCON_VIDEO_IN 17 54#define EXTCON_JACK_VIDEO_OUT 25
55#define EXTCON_VIDEO_OUT 18 55#define EXTCON_JACK_SPDIF_IN 26 /* Sony Philips Digital InterFace */
56 56#define EXTCON_JACK_SPDIF_OUT 27
57#define EXTCON_DOCK 19 /* Misc connector */ 57
58#define EXTCON_JIG 20 58/* Display external connector */
59#define EXTCON_MECHANICAL 21 59#define EXTCON_DISP_HDMI 40 /* High-Definition Multimedia Interface */
60#define EXTCON_DISP_MHL 41 /* Mobile High-Definition Link */
61#define EXTCON_DISP_DVI 42 /* Digital Visual Interface */
62#define EXTCON_DISP_VGA 43 /* Video Graphics Array */
63
64/* Miscellaneous external connector */
65#define EXTCON_DOCK 60
66#define EXTCON_JIG 61
67#define EXTCON_MECHANICAL 62
68
69#define EXTCON_NUM 63
60 70
61struct extcon_cable; 71struct extcon_cable;
62 72