Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[cascardo/linux.git] / drivers / extcon / extcon.c

diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index a0a1eea..7829846 100644 (file)
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -93,6 +93,11 @@ struct __extcon_info {
                .id = EXTCON_CHG_USB_SLOW,
                .name = "SLOW-CHARGER",
        },
+       [EXTCON_CHG_WPT] = {
+               .type = EXTCON_TYPE_CHG,
+               .id = EXTCON_CHG_WPT,
+               .name = "WPT",
+       },
 
        /* Jack external connector */
        [EXTCON_JACK_MICROPHONE] = {
@@ -162,6 +167,11 @@ struct __extcon_info {
                .id = EXTCON_DISP_DP,
                .name = "DP",
        },
+       [EXTCON_DISP_HMD] = {
+               .type = EXTCON_TYPE_DISP | EXTCON_TYPE_USB,
+               .id = EXTCON_DISP_HMD,
+               .name = "HMD",
+       },
 
        /* Miscellaneous external connector */
        [EXTCON_DOCK] = {