extcon: Unify the dock device names on max8997/77693

[karo-tx-linux.git] / drivers / extcon / extcon-max77693.c

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index a66bec8f6252dc140fbe6919b3cb846740f70a64..652bb13739f133f43027e966cc91045be91c14f9 100644 (file)
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -209,13 +209,8 @@ enum {
        EXTCON_CABLE_CHARGE_DOWNSTREAM,
        EXTCON_CABLE_MHL,
        EXTCON_CABLE_MHL_TA,
-       EXTCON_CABLE_JIG_USB_ON,
-       EXTCON_CABLE_JIG_USB_OFF,
-       EXTCON_CABLE_JIG_UART_OFF,
-       EXTCON_CABLE_JIG_UART_ON,
-       EXTCON_CABLE_DOCK_SMART,
-       EXTCON_CABLE_DOCK_DESK,
-       EXTCON_CABLE_DOCK_AUDIO,
+       EXTCON_CABLE_JIG,
+       EXTCON_CABLE_DOCK,
 
        _EXTCON_CABLE_NUM,
 };
@@ -229,13 +224,8 @@ static const char *max77693_extcon_cable[] = {
        [EXTCON_CABLE_CHARGE_DOWNSTREAM]        = "Charge-downstream",
        [EXTCON_CABLE_MHL]                      = "MHL",
        [EXTCON_CABLE_MHL_TA]                   = "MHL-TA",
-       [EXTCON_CABLE_JIG_USB_ON]               = "JIG-USB-ON",
-       [EXTCON_CABLE_JIG_USB_OFF]              = "JIG-USB-OFF",
-       [EXTCON_CABLE_JIG_UART_OFF]             = "JIG-UART-OFF",
-       [EXTCON_CABLE_JIG_UART_ON]              = "JIG-UART-ON",
-       [EXTCON_CABLE_DOCK_SMART]               = "Dock-Smart",
-       [EXTCON_CABLE_DOCK_DESK]                = "Dock-Desk",
-       [EXTCON_CABLE_DOCK_AUDIO]               = "Dock-Audio",
+       [EXTCON_CABLE_JIG]                      = "JIG",
+       [EXTCON_CABLE_DOCK]                     = "DOCK",
 
        NULL,
 };
@@ -507,15 +497,15 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
                }
 
                /*
-                * Notify Dock-Smart/MHL state.
-                * - Dock-Smart device include three type of cable which
+                * Notify Dock/MHL state.
+                * - Dock device include three type of cable which
                 * are HDMI, USB for mouse/keyboard and micro-usb port
-                * for USB/TA cable. Dock-Smart device need always exteranl
-                * power supply(USB/TA cable through micro-usb cable). Dock-
-                * Smart device support screen output of target to separate
+                * for USB/TA cable. Dock device need always exteranl
+                * power supply(USB/TA cable through micro-usb cable). Dock
+                * device support screen output of target to separate
                 * monitor and mouse/keyboard for desktop mode.
                 *
-                * Features of 'USB/TA cable with Dock-Smart device'
+                * Features of 'USB/TA cable with Dock device'
                 * - Support MHL
                 * - Support external output feature of audio
                 * - Support charging through micro-usb port without data
@@ -529,14 +519,14 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state(info->edev, "Dock-Smart", attached);
+               extcon_set_cable_state(info->edev, "DOCK", attached);
                extcon_set_cable_state(info->edev, "MHL", attached);
                goto out;
        case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE:       /* Dock-Desk */
-               strcpy(dock_name, "Dock-Desk");
+               strcpy(dock_name, "DOCK");
                break;
        case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD:         /* Dock-Audio */
-               strcpy(dock_name, "Dock-Audio");
+               strcpy(dock_name, "DOCK");
                if (!attached)
                        extcon_set_cable_state(info->edev, "USB", false);
                break;
@@ -642,7 +632,6 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
 static int max77693_muic_jig_handler(struct max77693_muic_info *info,
                int cable_type, bool attached)
 {
-       char cable_name[32];
        int ret = 0;
        u8 path = CONTROL1_SW_OPEN;
 
@@ -652,23 +641,13 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info,
 
        switch (cable_type) {
        case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF:    /* ADC_JIG_USB_OFF */
-               /* PATH:AP_USB */
-               strcpy(cable_name, "JIG-USB-OFF");
-               path = CONTROL1_SW_USB;
-               break;
        case MAX77693_MUIC_ADC_FACTORY_MODE_USB_ON:     /* ADC_JIG_USB_ON */
                /* PATH:AP_USB */
-               strcpy(cable_name, "JIG-USB-ON");
                path = CONTROL1_SW_USB;
                break;
        case MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF:   /* ADC_JIG_UART_OFF */
-               /* PATH:AP_UART */
-               strcpy(cable_name, "JIG-UART-OFF");
-               path = CONTROL1_SW_UART;
-               break;
        case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:    /* ADC_JIG_UART_ON */
                /* PATH:AP_UART */
-               strcpy(cable_name, "JIG-UART-ON");
                path = CONTROL1_SW_UART;
                break;
        default:
@@ -681,7 +660,7 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info,
        if (ret < 0)
                return ret;
 
-       extcon_set_cable_state(info->edev, cable_name, attached);
+       extcon_set_cable_state(info->edev, "JIG", attached);
 
        return 0;
 }
@@ -864,7 +843,7 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
                        extcon_set_cable_state(info->edev, "USB", attached);
 
                        if (!cable_attached)
-                               extcon_set_cable_state(info->edev, "Dock-Audio",
+                               extcon_set_cable_state(info->edev, "DOCK",
                                                      cable_attached);
                        break;
                case MAX77693_MUIC_ADC_RESERVED_ACC_3:          /* Dock-Smart */
@@ -893,8 +872,7 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
                        if (ret < 0)
                                return ret;
 
-                       extcon_set_cable_state(info->edev, "Dock-Smart",
-                                             attached);
+                       extcon_set_cable_state(info->edev, "DOCK", attached);
                        extcon_set_cable_state(info->edev, "MHL", attached);
 
                        break;