extcon: Add the EXTCON_CHG_USB_SDP to support SDP charing port

This patch adds the new EXTCON_CHG_USB_SDP connector to support SDP (Standard
Downstream Port) USB charging port. The commit 11eecf910bd8 ("extcon: Modify
the id and name of external connector") add the new EXTCON_CHG_USB_SDP
connector which support the both data transfer and usb charging at the same
time.

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

diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index b30ab97ce75f779d5be85ba0b14074e81a153ea0..852a7112f451990243c20c8a746f7d2e7d167cad 100644 (file)
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -150,6 +150,7 @@ enum max14577_muic_acc_type {
 
 static const unsigned int max14577_extcon_cable[] = {
        EXTCON_USB,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_CHG_USB_FAST,
        EXTCON_CHG_USB_SLOW,
@@ -454,6 +455,8 @@ static int max14577_muic_chg_handler(struct max14577_muic_info *info)
                        return ret;
 
                extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
                break;
        case MAX14577_CHARGER_TYPE_DEDICATED_CHG:
                extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index fdf8f5d4d4e9ff72aaac992756d1b18792fe4d98..f17cb76b567cc949e4827932e1eeff9953ca7ea8 100644 (file)
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -204,6 +204,7 @@ enum max77693_muic_acc_type {
 static const unsigned int max77693_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_CHG_USB_FAST,
        EXTCON_CHG_USB_SLOW,
@@ -512,8 +513,11 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
                break;
        case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD:         /* Dock-Audio */
                dock_id = EXTCON_DOCK;
-               if (!attached)
+               if (!attached) {
                        extcon_set_cable_state_(info->edev, EXTCON_USB, false);
+                       extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                               false);
+               }
                break;
        default:
                dev_err(info->dev, "failed to detect %s dock device\n",
@@ -601,6 +605,8 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
                if (ret < 0)
                        return ret;
                extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
                break;
        case MAX77693_MUIC_GND_MHL:
        case MAX77693_MUIC_GND_MHL_VB:
@@ -830,6 +836,8 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
                         */
                        extcon_set_cable_state_(info->edev, EXTCON_USB,
                                                attached);
+                       extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                               attached);
 
                        if (!cable_attached)
                                extcon_set_cable_state_(info->edev, EXTCON_DOCK,
@@ -899,6 +907,8 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
 
                        extcon_set_cable_state_(info->edev, EXTCON_USB,
                                                attached);
+                       extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                               attached);
                        break;
                case MAX77693_CHARGER_TYPE_DEDICATED_CHG:
                        /* Only TA cable */

diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
index 74dfb7f4f2774c5c87e4e14a39db3e84ecbf8191..7bbc30097771ff65162ccb81ef9b60bd3da21bae 100644 (file)
--- a/drivers/extcon/extcon-max77843.c
+++ b/drivers/extcon/extcon-max77843.c
@@ -122,6 +122,7 @@ enum max77843_muic_charger_type {
 static const unsigned int max77843_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_CHG_USB_CDP,
        EXTCON_CHG_USB_FAST,
@@ -486,6 +487,8 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                        return ret;
 
                extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
                break;
        case MAX77843_MUIC_CHG_DOWNSTREAM:
                ret = max77843_muic_set_path(info,

diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index b2b13b3dce14743d1a977c0fa760325d15b6969b..9a89320d09a8b6e08660cadca6abd6b79e23c24d 100644 (file)
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -148,6 +148,7 @@ struct max8997_muic_info {
 static const unsigned int max8997_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_CHG_USB_FAST,
        EXTCON_CHG_USB_SLOW,
@@ -334,6 +335,8 @@ static int max8997_muic_handle_usb(struct max8997_muic_info *info,
                break;
        case MAX8997_USB_DEVICE:
                extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
                break;
        default:
                dev_err(info->dev, "failed to detect %s usb cable\n",

diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
index 7635a8eaf4c61b276749963b8e974d5afd2a5646..97e074d70eca21264d0743ae7ebf3e90b4ce228c 100644 (file)
--- a/drivers/extcon/extcon-rt8973a.c
+++ b/drivers/extcon/extcon-rt8973a.c
@@ -93,6 +93,7 @@ static struct reg_data rt8973a_reg_data[] = {
 static const unsigned int rt8973a_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_JIG,
        EXTCON_NONE,
@@ -398,6 +399,9 @@ static int rt8973a_muic_cable_handler(struct rt8973a_muic_info *info,
 
        /* Change the state of external accessory */
        extcon_set_cable_state_(info->edev, id, attached);
+       if (id == EXTCON_USB)
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
 
        return 0;
 }

diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
index 571de2e6e7c4a3c9ee632ffaf8700f66d9223736..df769a17e736fcadae1fbf05543fd6837ebd0f13 100644 (file)
--- a/drivers/extcon/extcon-sm5502.c
+++ b/drivers/extcon/extcon-sm5502.c
@@ -95,6 +95,7 @@ static struct reg_data sm5502_reg_data[] = {
 static const unsigned int sm5502_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_NONE,
 };
@@ -411,6 +412,9 @@ static int sm5502_muic_cable_handler(struct sm5502_muic_info *info,
 
        /* Change the state of external accessory */
        extcon_set_cable_state_(info->edev, id, attached);
+       if (id == EXTCON_USB)
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
 
        return 0;
 }