extcon: Alter MHL-TA cable name to TA cable name

This patch alters the MHL-TA cable name to TA cable name because MHL-TA is not
standard name. The MHL-TA is MHL cable with charger cable (TA or USB). So, this
patch use the TA cable instead of MHL-TA to inform the charger cable state.
- MHL-TA -> TA

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 652bb13739f133f43027e966cc91045be91c14f9..a4fe7fd3f74d6265b096c24fd09cee860aaa9dbe 100644 (file)
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -208,7 +208,6 @@ enum {
        EXTCON_CABLE_SLOW_CHARGER,
        EXTCON_CABLE_CHARGE_DOWNSTREAM,
        EXTCON_CABLE_MHL,
-       EXTCON_CABLE_MHL_TA,
        EXTCON_CABLE_JIG,
        EXTCON_CABLE_DOCK,
 
@@ -223,7 +222,6 @@ static const char *max77693_extcon_cable[] = {
        [EXTCON_CABLE_SLOW_CHARGER]             = "Slow-charger",
        [EXTCON_CABLE_CHARGE_DOWNSTREAM]        = "Charge-downstream",
        [EXTCON_CABLE_MHL]                      = "MHL",
-       [EXTCON_CABLE_MHL_TA]                   = "MHL-TA",
        [EXTCON_CABLE_JIG]                      = "JIG",
        [EXTCON_CABLE_DOCK]                     = "DOCK",
 
@@ -802,19 +800,19 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
                case MAX77693_MUIC_GND_MHL:
                case MAX77693_MUIC_GND_MHL_VB:
                        /*
-                        * MHL cable with MHL-TA(USB/TA) cable
+                        * MHL cable with USB/TA cable
                         * - MHL cable include two port(HDMI line and separate
                         * micro-usb port. When the target connect MHL cable,
-                        * extcon driver check whether MHL-TA(USB/TA) cable is
-                        * connected. If MHL-TA cable is connected, extcon
+                        * extcon driver check whether USB/TA cable is
+                        * connected. If USB/TA cable is connected, extcon
                         * driver notify state to notifiee for charging battery.
                         *
-                        * Features of 'MHL-TA(USB/TA) with MHL cable'
+                        * Features of 'USB/TA with MHL cable'
                         * - Support MHL
                         * - Support charging through micro-usb port without
                         *   data connection
                         */
-                       extcon_set_cable_state(info->edev, "MHL-TA", attached);
+                       extcon_set_cable_state(info->edev, "TA", attached);
                        if (!cable_attached)
                                extcon_set_cable_state(info->edev,
                                                      "MHL", cable_attached);

diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
index d64aed485fdccc1c9efb50d8569c6c5476b32b49..5746d7bc165f9dde88c4587de493f73f35080aef 100644 (file)
--- a/drivers/extcon/extcon-max77843.c
+++ b/drivers/extcon/extcon-max77843.c
@@ -126,7 +126,6 @@ enum {
        MAX77843_CABLE_FAST_CHARGER,
        MAX77843_CABLE_SLOW_CHARGER,
        MAX77843_CABLE_MHL,
-       MAX77843_CABLE_MHL_TA,
        MAX77843_CABLE_JIG,
 
        MAX77843_CABLE_NUM,
@@ -140,7 +139,6 @@ static const char *max77843_extcon_cable[] = {
        [MAX77843_CABLE_FAST_CHARGER]           = "FAST-CHARGER",
        [MAX77843_CABLE_SLOW_CHARGER]           = "SLOW-CHARGER",
        [MAX77843_CABLE_MHL]                    = "MHL",
-       [MAX77843_CABLE_MHL_TA]                 = "MHL-TA",
        [MAX77843_CABLE_JIG]                    = "JIG",
 };
 
@@ -529,9 +527,9 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
 
                /* Charger cable on MHL accessory is attach or detach */
                if (gnd_type == MAX77843_MUIC_GND_MHL_VB)
-                       extcon_set_cable_state(info->edev, "MHL-TA", true);
+                       extcon_set_cable_state(info->edev, "TA", true);
                else if (gnd_type == MAX77843_MUIC_GND_MHL)
-                       extcon_set_cable_state(info->edev, "MHL-TA", false);
+                       extcon_set_cable_state(info->edev, "TA", false);
                break;
        case MAX77843_MUIC_CHG_NONE:
                break;