extcon: Unify the jig cable names on rt8973 and max14577/77693/77843

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

diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
index 8db6a926ea07cd8569b62cc1dc0bc379663dccc8..d64aed485fdccc1c9efb50d8569c6c5476b32b49 100644 (file)
--- a/drivers/extcon/extcon-max77843.c
+++ b/drivers/extcon/extcon-max77843.c
@@ -127,10 +127,7 @@ enum {
        MAX77843_CABLE_SLOW_CHARGER,
        MAX77843_CABLE_MHL,
        MAX77843_CABLE_MHL_TA,
-       MAX77843_CABLE_JIG_USB_ON,
-       MAX77843_CABLE_JIG_USB_OFF,
-       MAX77843_CABLE_JIG_UART_ON,
-       MAX77843_CABLE_JIG_UART_OFF,
+       MAX77843_CABLE_JIG,
 
        MAX77843_CABLE_NUM,
 };
@@ -144,10 +141,7 @@ static const char *max77843_extcon_cable[] = {
        [MAX77843_CABLE_SLOW_CHARGER]           = "SLOW-CHARGER",
        [MAX77843_CABLE_MHL]                    = "MHL",
        [MAX77843_CABLE_MHL_TA]                 = "MHL-TA",
-       [MAX77843_CABLE_JIG_USB_ON]             = "JIG-USB-ON",
-       [MAX77843_CABLE_JIG_USB_OFF]            = "JIG-USB-OFF",
-       [MAX77843_CABLE_JIG_UART_ON]            = "JIG-UART-ON",
-       [MAX77843_CABLE_JIG_UART_OFF]           = "JIG-UART-OFF",
+       [MAX77843_CABLE_JIG]                    = "JIG",
 };
 
 struct max77843_muic_irq {
@@ -385,36 +379,29 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
                int cable_type, bool attached)
 {
        int ret;
+       u8 path = CONTROL1_SW_OPEN;
 
        dev_dbg(info->dev, "external connector is %s (adc:0x%02x)\n",
                        attached ? "attached" : "detached", cable_type);
 
        switch (cable_type) {
        case MAX77843_MUIC_ADC_FACTORY_MODE_USB_OFF:
-               ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached);
-               if (ret < 0)
-                       return ret;
-               extcon_set_cable_state(info->edev, "JIG-USB-OFF", attached);
-               break;
        case MAX77843_MUIC_ADC_FACTORY_MODE_USB_ON:
-               ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached);
-               if (ret < 0)
-                       return ret;
-               extcon_set_cable_state(info->edev, "JIG-USB-ON", attached);
+               path = CONTROL1_SW_USB;
                break;
        case MAX77843_MUIC_ADC_FACTORY_MODE_UART_OFF:
-               ret = max77843_muic_set_path(info, CONTROL1_SW_UART, attached);
-               if (ret < 0)
-                       return ret;
-               extcon_set_cable_state(info->edev, "JIG-UART-OFF", attached);
+               path = CONTROL1_SW_UART;
                break;
        default:
-               ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
-               if (ret < 0)
-                       return ret;
-               break;
+               return -EINVAL;
        }
 
+       ret = max77843_muic_set_path(info, path, attached);
+       if (ret < 0)
+               return ret;
+
+       extcon_set_cable_state(info->edev, "JIG", attached);
+
        return 0;
 }