On 2015년 12월 29일 10:16, Krzysztof Kozlowski wrote:
> On 29.12.2015 09:37, Chanwoo Choi wrote:
>> 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.
>>
>> Cc: Krzysztof Kozlowski <[email protected]>
>> Cc: MyungJoo Ham <[email protected]>
>> Signed-off-by: Chanwoo Choi <[email protected]>
>> ---
>> drivers/extcon/extcon-max14577.c | 3 +++
>> drivers/extcon/extcon-max77693.c | 12 ++++++++++--
>> drivers/extcon/extcon-max77843.c | 3 +++
>> drivers/extcon/extcon-max8997.c | 3 +++
>> drivers/extcon/extcon-rt8973a.c | 4 ++++
>> drivers/extcon/extcon-sm5502.c | 4 ++++
>> 6 files changed, 27 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/extcon/extcon-max14577.c
>> b/drivers/extcon/extcon-max14577.c
>> index b30ab97ce75f..852a7112f451 100644
>> --- 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 fdf8f5d4d4e9..b472f2405534 100644
>> --- 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,
>> @@ -897,7 +905,7 @@ static int max77693_muic_chg_handler(struct
>> max77693_muic_info *info)
>> if (ret < 0)
>> return ret;
>>
>> - extcon_set_cable_state_(info->edev, EXTCON_USB,
>> + extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
>> attached);
>
>
> Why for MAX77693_CHARGER_TYPE_USB you are not setting the EXTCON_USB
> type? From the description and max14577 code I would suspect that you
> want to set both: USB and SDP.
You're right. It is my mistake. I'll fix it.
>
>> break;
>> case MAX77693_CHARGER_TYPE_DEDICATED_CHG:
>> diff --git a/drivers/extcon/extcon-max77843.c
>> b/drivers/extcon/extcon-max77843.c
>> index 74dfb7f4f277..7bbc30097771 100644
>> --- 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 b2b13b3dce14..79263421b075 100644
>> --- 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,
>> @@ -484,6 +485,8 @@ static int max8997_muic_chg_handler(struct
>> max8997_muic_info *info)
>> max8997_muic_handle_usb(info,
>> MAX8997_USB_DEVICE, attached);
>> }
>> + extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
>> + attached);
>
> I am missing something. If this is MAX8997_CHARGER_TYPE_USB but not
> MAX8997_MUIC_ADC_OPEN then you will set only SDP, not USB. Aren't they
> symmetric?
>
> You aren't setting the SDP in ADC handler, only in charger handler. Why?
EXTCON_CHG_USD_SDP shoule be handled in max8997_muic_handle_usb() function.
I'll fix it as following diff:
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 79263421b075..9a89320d09a8 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -335,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",
@@ -485,8 +487,6 @@ static int max8997_muic_chg_handler(struct
max8997_muic_info *info)
max8997_muic_handle_usb(info,
MAX8997_USB_DEVICE, attached);
}
- extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
- attached);
break;
Best Regards,
Chanwoo Choi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
