Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[firefly-linux-kernel-4.4.55.git] / drivers / extcon / extcon-max8997.c

diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 7b1ef200b1219ed0a16a6ea483b19497985e54fa..b2b13b3dce14743d1a977c0fa760325d15b6969b 100644 (file)
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -148,11 +148,11 @@ struct max8997_muic_info {
 static const unsigned int max8997_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
-       EXTCON_TA,
-       EXTCON_FAST_CHARGER,
-       EXTCON_SLOW_CHARGER,
-       EXTCON_CHARGE_DOWNSTREAM,
-       EXTCON_MHL,
+       EXTCON_CHG_USB_DCP,
+       EXTCON_CHG_USB_FAST,
+       EXTCON_CHG_USB_SLOW,
+       EXTCON_CHG_USB_CDP,
+       EXTCON_DISP_MHL,
        EXTCON_DOCK,
        EXTCON_JIG,
        EXTCON_NONE,
@@ -403,7 +403,7 @@ static int max8997_muic_adc_handler(struct max8997_muic_info *info)
                        return ret;
                break;
        case MAX8997_MUIC_ADC_MHL:
-               extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
                break;
        case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF:
        case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON:
@@ -486,18 +486,19 @@ static int max8997_muic_chg_handler(struct max8997_muic_info *info)
                }
                break;
        case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT:
-               extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,
                                        attached);
                break;
        case MAX8997_CHARGER_TYPE_DEDICATED_CHG:
-               extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
+                                       attached);
                break;
        case MAX8997_CHARGER_TYPE_500MA:
-               extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,
                                        attached);
                break;
        case MAX8997_CHARGER_TYPE_1A:
-               extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
                                        attached);
                break;
        default: