linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_*
@ 2016-12-21  6:10 ` Baolin Wang
  2016-12-21  6:10   ` [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set Baolin Wang
                     ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  6:10 UTC (permalink / raw)
  To: myungjoo.ham, cw00.choi, wens, kishon, heiko
  Cc: linux-kernel, linux-arm-kernel, linux-rockchip, linaro-kernel,
	baolin.wang, broonie, neilb

Current there is both "EXTCON_USB" and "EXTCON_CHG_USB_SDP" which
both seem to suggest a standard downstream port. But there is no
documentation describing how these relate.

Thus add documentation to describe EXTCON_CHG_USB_SDP should always
appear together with EXTCON_USB, and EXTCON_CHG_USB_ACA would normally
appear with EXTCON_USB_HOST.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 include/linux/extcon.h |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index b871c0c..6498b05 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -46,7 +46,14 @@
 #define EXTCON_USB		1
 #define EXTCON_USB_HOST		2
 
-/* Charging external connector */
+/*
+ * Charging external connector
+ *
+ * When one SDP charger connector was reported, we should also report
+ * the USB connector, which means EXTCON_CHG_USB_SDP should always
+ * appear together with EXTCON_USB. The same as ACA charger connector,
+ * EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.
+ */
 #define EXTCON_CHG_USB_SDP	5	/* Standard Downstream Port */
 #define EXTCON_CHG_USB_DCP	6	/* Dedicated Charging Port */
 #define EXTCON_CHG_USB_CDP	7	/* Charging Downstream Port */
-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  6:10 ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Baolin Wang
@ 2016-12-21  6:10   ` Baolin Wang
  2016-12-21  7:22     ` Chanwoo Choi
  2016-12-21  6:10   ` [PATCH 3/3] phy: rockchip-inno-usb2: " Baolin Wang
  2016-12-21  7:20   ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Chanwoo Choi
  2 siblings, 1 reply; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  6:10 UTC (permalink / raw)
  To: myungjoo.ham, cw00.choi, wens, kishon, heiko
  Cc: linux-kernel, linux-arm-kernel, linux-rockchip, linaro-kernel,
	baolin.wang, broonie, neilb

According to the documentation, we should set the EXTCON_USB when
one SDP charger connector was reported.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/extcon/extcon-axp288.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index 42f41e8..4490726 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -102,6 +102,7 @@ enum axp288_extcon_irq {
 };
 
 static const unsigned int axp288_extcon_cables[] = {
+	EXTCON_USB,
 	EXTCON_CHG_USB_SDP,
 	EXTCON_CHG_USB_CDP,
 	EXTCON_CHG_USB_DCP,
@@ -225,8 +226,12 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
 			vbus_attach ? USB_EVENT_VBUS : USB_EVENT_NONE, NULL);
 	}
 
-	if (notify_charger)
+	if (notify_charger) {
 		extcon_set_state_sync(info->edev, cable, vbus_attach);
+		if (cable == EXTCON_CHG_USB_SDP)
+			extcon_set_state_sync(info->edev, EXTCON_USB,
+					      vbus_attach);
+	}
 
 	/* Clear the flags on disconnect event */
 	if (!vbus_attach)
-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 3/3] phy: rockchip-inno-usb2: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  6:10 ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Baolin Wang
  2016-12-21  6:10   ` [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set Baolin Wang
@ 2016-12-21  6:10   ` Baolin Wang
  2016-12-21  7:29     ` Chanwoo Choi
  2016-12-21  7:20   ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Chanwoo Choi
  2 siblings, 1 reply; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  6:10 UTC (permalink / raw)
  To: myungjoo.ham, cw00.choi, wens, kishon, heiko
  Cc: linux-kernel, linux-arm-kernel, linux-rockchip, linaro-kernel,
	baolin.wang, broonie, neilb

According to the documentation, we should set the EXTCON_USB when
one SDP charger connector was reported.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/phy/phy-rockchip-inno-usb2.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c
index 2f99ec9..71fbe0f 100644
--- a/drivers/phy/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/phy-rockchip-inno-usb2.c
@@ -595,9 +595,14 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work)
 		if (rport->vbus_attached != vbus_attach) {
 			rport->vbus_attached = vbus_attach;
 
-			if (notify_charger && rphy->edev)
+			if (notify_charger && rphy->edev) {
 				extcon_set_cable_state_(rphy->edev,
 							cable, vbus_attach);
+				if (cable == EXTCON_CHG_USB_SDP)
+					extcon_set_cable_state_(rphy->edev,
+								EXTCON_USB,
+								vbus_attach);
+			}
 		}
 		break;
 	case OTG_STATE_B_PERIPHERAL:
-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_*
  2016-12-21  6:10 ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Baolin Wang
  2016-12-21  6:10   ` [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set Baolin Wang
  2016-12-21  6:10   ` [PATCH 3/3] phy: rockchip-inno-usb2: " Baolin Wang
@ 2016-12-21  7:20   ` Chanwoo Choi
  2016-12-21  7:53     ` Baolin Wang
  2 siblings, 1 reply; 12+ messages in thread
From: Chanwoo Choi @ 2016-12-21  7:20 UTC (permalink / raw)
  To: Baolin Wang, myungjoo.ham, wens, kishon, heiko
  Cc: linux-kernel, linux-arm-kernel, linux-rockchip, linaro-kernel,
	broonie, neilb

Hi,

On 2016년 12월 21일 15:10, Baolin Wang wrote:
> Current there is both "EXTCON_USB" and "EXTCON_CHG_USB_SDP" which
> both seem to suggest a standard downstream port. But there is no
> documentation describing how these relate.
> 
> Thus add documentation to describe EXTCON_CHG_USB_SDP should always
> appear together with EXTCON_USB, and EXTCON_CHG_USB_ACA would normally
> appear with EXTCON_USB_HOST.
> 
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
> ---
>  include/linux/extcon.h |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
> index b871c0c..6498b05 100644
> --- a/include/linux/extcon.h
> +++ b/include/linux/extcon.h
> @@ -46,7 +46,14 @@
>  #define EXTCON_USB		1
>  #define EXTCON_USB_HOST		2
>  
> -/* Charging external connector */
> +/*
> + * Charging external connector
> + *
> + * When one SDP charger connector was reported, we should also report
> + * the USB connector, which means EXTCON_CHG_USB_SDP should always
> + * appear together with EXTCON_USB. The same as ACA charger connector,
> + * EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.
> + */

Looks good to me.
But, you use the different word for ACA as following:
I think that 'would normally' is proper in descritpion.

- commit msg : EXTCON_CHG_USB_ACA would normally appear with EXTCON_USB_HOST.
- description: EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.

>  #define EXTCON_CHG_USB_SDP	5	/* Standard Downstream Port */
>  #define EXTCON_CHG_USB_DCP	6	/* Dedicated Charging Port */
>  #define EXTCON_CHG_USB_CDP	7	/* Charging Downstream Port */
> 

-- 
Regards,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  6:10   ` [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set Baolin Wang
@ 2016-12-21  7:22     ` Chanwoo Choi
  2016-12-21  7:55       ` Baolin Wang
  0 siblings, 1 reply; 12+ messages in thread
From: Chanwoo Choi @ 2016-12-21  7:22 UTC (permalink / raw)
  To: Baolin Wang, myungjoo.ham, wens, kishon, heiko
  Cc: linux-kernel, linux-arm-kernel, linux-rockchip, linaro-kernel,
	broonie, neilb

Hi,

On 2016년 12월 21일 15:10, Baolin Wang wrote:
> According to the documentation, we should set the EXTCON_USB when
> one SDP charger connector was reported.
> 
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
> ---
>  drivers/extcon/extcon-axp288.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index 42f41e8..4490726 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -102,6 +102,7 @@ enum axp288_extcon_irq {
>  };
>  
>  static const unsigned int axp288_extcon_cables[] = {
> +	EXTCON_USB,
>  	EXTCON_CHG_USB_SDP,
>  	EXTCON_CHG_USB_CDP,
>  	EXTCON_CHG_USB_DCP,
> @@ -225,8 +226,12 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
>  			vbus_attach ? USB_EVENT_VBUS : USB_EVENT_NONE, NULL);
>  	}
>  
> -	if (notify_charger)
> +	if (notify_charger) {
>  		extcon_set_state_sync(info->edev, cable, vbus_attach);
> +		if (cable == EXTCON_CHG_USB_SDP)
> +			extcon_set_state_sync(info->edev, EXTCON_USB,
> +					      vbus_attach);
> +	}
>  
>  	/* Clear the flags on disconnect event */
>  	if (!vbus_attach)
> 

The extcon-axp288.c driver has some patches on extcon-next[1] branch.
[1] https://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/log/?h=extcon-next

I rework your patch on extcon-next branch as following:
If you ok, I'll merge it for v4.11.

commit 1a96f92bdfab86d0b634e56092f543cad348fd0b
Refs: extcon-next, extcon-next-for-4.10-15-g1a96f92bdfab
Author:     Baolin Wang <baolin.wang@linaro.org>
AuthorDate: Wed Dec 21 15:51:26 2016 +0900
Commit:     Chanwoo Choi <cw00.choi@samsung.com>
CommitDate: Wed Dec 21 15:52:00 2016 +0900

    extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set

    According to the documentation, we should set the EXTCON_USB when
    one SDP charger connector was reported.

    Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
    Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 drivers/extcon/extcon-axp288.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index 3e145e2a4860..f4fd03e58e37 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -96,6 +96,7 @@ enum axp288_extcon_irq {
        EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_CDP,
        EXTCON_CHG_USB_DCP,
+       EXTCON_USB,
        EXTCON_NONE,
 };

@@ -206,8 +207,15 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
                                        : EXTCON_GPIO_MUX_SEL_PMIC);

        extcon_set_state_sync(info->edev, info->previous_cable, false);
+       if (info->previous_cable == EXTCON_CHG_USB_SDP)
+               extcon_set_state_sync(info->edev, EXTCON_USB, false);
+
        if (vbus_attach) {
                extcon_set_state_sync(info->edev, cable, vbus_attach);
+               if (cable == EXTCON_CHG_USB_SDP)
+                       extcon_set_state_sync(info->edev, EXTCON_USB,
+                                               vbus_attach);
+
                info->previous_cable = cable;
        }

-- 
Regards,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 3/3] phy: rockchip-inno-usb2: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  6:10   ` [PATCH 3/3] phy: rockchip-inno-usb2: " Baolin Wang
@ 2016-12-21  7:29     ` Chanwoo Choi
  2016-12-21  7:57       ` Baolin Wang
  0 siblings, 1 reply; 12+ messages in thread
From: Chanwoo Choi @ 2016-12-21  7:29 UTC (permalink / raw)
  To: Baolin Wang, myungjoo.ham, wens, kishon, heiko
  Cc: linux-kernel, linux-arm-kernel, linux-rockchip, linaro-kernel,
	broonie, neilb

Hi,

On 2016년 12월 21일 15:10, Baolin Wang wrote:
> According to the documentation, we should set the EXTCON_USB when
> one SDP charger connector was reported.
> 
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
> ---
>  drivers/phy/phy-rockchip-inno-usb2.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c
> index 2f99ec9..71fbe0f 100644
> --- a/drivers/phy/phy-rockchip-inno-usb2.c
> +++ b/drivers/phy/phy-rockchip-inno-usb2.c
> @@ -595,9 +595,14 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work)
>  		if (rport->vbus_attached != vbus_attach) {
>  			rport->vbus_attached = vbus_attach;
>  
> -			if (notify_charger && rphy->edev)
> +			if (notify_charger && rphy->edev) {
>  				extcon_set_cable_state_(rphy->edev,
>  							cable, vbus_attach);
> +				if (cable == EXTCON_CHG_USB_SDP)
> +					extcon_set_cable_state_(rphy->edev,
> +								EXTCON_USB,
> +								vbus_attach);
> +			}
>  		}
>  		break;
>  	case OTG_STATE_B_PERIPHERAL:
> 

Looks good to me. But I prefer to use the 'extcon_set_state_sync' intead of extcon_set_cable_state_().
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>

I sent the patches[1] for extcon API to alter the deprecated API.
If you possible, I'd like you to alter the extcon API instead of deprecated API.
[1] https://patchwork.kernel.org/patch/9453645/
- extcon_set_cable_state_() -> extcon_set_state_sync()
- extcon_get_cable_state_() -> extcon_get_state()
- Use devm_extcon_register_notifier() instead of extcon_register_notifier().

-- 
Regards,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_*
  2016-12-21  7:20   ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Chanwoo Choi
@ 2016-12-21  7:53     ` Baolin Wang
  2016-12-21  7:58       ` Chanwoo Choi
  0 siblings, 1 reply; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  7:53 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: myungjoo.ham, Chen-Yu Tsai, Kishon, Heiko Stübner, LKML,
	linux-arm-kernel, linux-rockchip, Linaro Kernel Mailman List,
	Mark Brown, NeilBrown

Hi,

On 21 December 2016 at 15:20, Chanwoo Choi <cw00.choi@samsung.com> wrote:
> Hi,
>
> On 2016년 12월 21일 15:10, Baolin Wang wrote:
>> Current there is both "EXTCON_USB" and "EXTCON_CHG_USB_SDP" which
>> both seem to suggest a standard downstream port. But there is no
>> documentation describing how these relate.
>>
>> Thus add documentation to describe EXTCON_CHG_USB_SDP should always
>> appear together with EXTCON_USB, and EXTCON_CHG_USB_ACA would normally
>> appear with EXTCON_USB_HOST.
>>
>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>> ---
>>  include/linux/extcon.h |    9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
>> index b871c0c..6498b05 100644
>> --- a/include/linux/extcon.h
>> +++ b/include/linux/extcon.h
>> @@ -46,7 +46,14 @@
>>  #define EXTCON_USB           1
>>  #define EXTCON_USB_HOST              2
>>
>> -/* Charging external connector */
>> +/*
>> + * Charging external connector
>> + *
>> + * When one SDP charger connector was reported, we should also report
>> + * the USB connector, which means EXTCON_CHG_USB_SDP should always
>> + * appear together with EXTCON_USB. The same as ACA charger connector,
>> + * EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.
>> + */
>
> Looks good to me.
> But, you use the different word for ACA as following:
> I think that 'would normally' is proper in descritpion.

Okay, I will change to 'would normally' in next version patch. Thanks.

>
> - commit msg : EXTCON_CHG_USB_ACA would normally appear with EXTCON_USB_HOST.
> - description: EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.
>
>>  #define EXTCON_CHG_USB_SDP   5       /* Standard Downstream Port */
>>  #define EXTCON_CHG_USB_DCP   6       /* Dedicated Charging Port */
>>  #define EXTCON_CHG_USB_CDP   7       /* Charging Downstream Port */
>>
>
> --
> Regards,
> Chanwoo Choi



-- 
Baolin.wang
Best Regards

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  7:22     ` Chanwoo Choi
@ 2016-12-21  7:55       ` Baolin Wang
  2016-12-21  7:59         ` Chanwoo Choi
  0 siblings, 1 reply; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  7:55 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: myungjoo.ham, Chen-Yu Tsai, Kishon, Heiko Stübner, LKML,
	linux-arm-kernel, linux-rockchip, Linaro Kernel Mailman List,
	Mark Brown, NeilBrown

Hi,

On 21 December 2016 at 15:22, Chanwoo Choi <cw00.choi@samsung.com> wrote:
> Hi,
>
> On 2016년 12월 21일 15:10, Baolin Wang wrote:
>> According to the documentation, we should set the EXTCON_USB when
>> one SDP charger connector was reported.
>>
>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>> ---
>>  drivers/extcon/extcon-axp288.c |    7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
>> index 42f41e8..4490726 100644
>> --- a/drivers/extcon/extcon-axp288.c
>> +++ b/drivers/extcon/extcon-axp288.c
>> @@ -102,6 +102,7 @@ enum axp288_extcon_irq {
>>  };
>>
>>  static const unsigned int axp288_extcon_cables[] = {
>> +     EXTCON_USB,
>>       EXTCON_CHG_USB_SDP,
>>       EXTCON_CHG_USB_CDP,
>>       EXTCON_CHG_USB_DCP,
>> @@ -225,8 +226,12 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
>>                       vbus_attach ? USB_EVENT_VBUS : USB_EVENT_NONE, NULL);
>>       }
>>
>> -     if (notify_charger)
>> +     if (notify_charger) {
>>               extcon_set_state_sync(info->edev, cable, vbus_attach);
>> +             if (cable == EXTCON_CHG_USB_SDP)
>> +                     extcon_set_state_sync(info->edev, EXTCON_USB,
>> +                                           vbus_attach);
>> +     }
>>
>>       /* Clear the flags on disconnect event */
>>       if (!vbus_attach)
>>
>
> The extcon-axp288.c driver has some patches on extcon-next[1] branch.
> [1] https://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/log/?h=extcon-next
>
> I rework your patch on extcon-next branch as following:
> If you ok, I'll merge it for v4.11.

It is okay for me. Thanks.

>
> commit 1a96f92bdfab86d0b634e56092f543cad348fd0b
> Refs: extcon-next, extcon-next-for-4.10-15-g1a96f92bdfab
> Author:     Baolin Wang <baolin.wang@linaro.org>
> AuthorDate: Wed Dec 21 15:51:26 2016 +0900
> Commit:     Chanwoo Choi <cw00.choi@samsung.com>
> CommitDate: Wed Dec 21 15:52:00 2016 +0900
>
>     extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
>
>     According to the documentation, we should set the EXTCON_USB when
>     one SDP charger connector was reported.
>
>     Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>     Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
>  drivers/extcon/extcon-axp288.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index 3e145e2a4860..f4fd03e58e37 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -96,6 +96,7 @@ enum axp288_extcon_irq {
>         EXTCON_CHG_USB_SDP,
>         EXTCON_CHG_USB_CDP,
>         EXTCON_CHG_USB_DCP,
> +       EXTCON_USB,
>         EXTCON_NONE,
>  };
>
> @@ -206,8 +207,15 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
>                                         : EXTCON_GPIO_MUX_SEL_PMIC);
>
>         extcon_set_state_sync(info->edev, info->previous_cable, false);
> +       if (info->previous_cable == EXTCON_CHG_USB_SDP)
> +               extcon_set_state_sync(info->edev, EXTCON_USB, false);
> +
>         if (vbus_attach) {
>                 extcon_set_state_sync(info->edev, cable, vbus_attach);
> +               if (cable == EXTCON_CHG_USB_SDP)
> +                       extcon_set_state_sync(info->edev, EXTCON_USB,
> +                                               vbus_attach);
> +
>                 info->previous_cable = cable;
>         }
>
> --
> Regards,
> Chanwoo Choi



-- 
Baolin.wang
Best Regards

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 3/3] phy: rockchip-inno-usb2: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  7:29     ` Chanwoo Choi
@ 2016-12-21  7:57       ` Baolin Wang
  0 siblings, 0 replies; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  7:57 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: myungjoo.ham, Chen-Yu Tsai, Kishon, Heiko Stübner, LKML,
	linux-arm-kernel, linux-rockchip, Linaro Kernel Mailman List,
	Mark Brown, NeilBrown

Hi,

On 21 December 2016 at 15:29, Chanwoo Choi <cw00.choi@samsung.com> wrote:
> Hi,
>
> On 2016년 12월 21일 15:10, Baolin Wang wrote:
>> According to the documentation, we should set the EXTCON_USB when
>> one SDP charger connector was reported.
>>
>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>> ---
>>  drivers/phy/phy-rockchip-inno-usb2.c |    7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c
>> index 2f99ec9..71fbe0f 100644
>> --- a/drivers/phy/phy-rockchip-inno-usb2.c
>> +++ b/drivers/phy/phy-rockchip-inno-usb2.c
>> @@ -595,9 +595,14 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work)
>>               if (rport->vbus_attached != vbus_attach) {
>>                       rport->vbus_attached = vbus_attach;
>>
>> -                     if (notify_charger && rphy->edev)
>> +                     if (notify_charger && rphy->edev) {
>>                               extcon_set_cable_state_(rphy->edev,
>>                                                       cable, vbus_attach);
>> +                             if (cable == EXTCON_CHG_USB_SDP)
>> +                                     extcon_set_cable_state_(rphy->edev,
>> +                                                             EXTCON_USB,
>> +                                                             vbus_attach);
>> +                     }
>>               }
>>               break;
>>       case OTG_STATE_B_PERIPHERAL:
>>
>
> Looks good to me. But I prefer to use the 'extcon_set_state_sync' intead of extcon_set_cable_state_().
> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
>
> I sent the patches[1] for extcon API to alter the deprecated API.
> If you possible, I'd like you to alter the extcon API instead of deprecated API.

Okay, I will change to extcon_set_state_sync() in next version patch. Thanks.

> [1] https://patchwork.kernel.org/patch/9453645/
> - extcon_set_cable_state_() -> extcon_set_state_sync()
> - extcon_get_cable_state_() -> extcon_get_state()
> - Use devm_extcon_register_notifier() instead of extcon_register_notifier().
>
> --
> Regards,
> Chanwoo Choi



-- 
Baolin.wang
Best Regards

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_*
  2016-12-21  7:53     ` Baolin Wang
@ 2016-12-21  7:58       ` Chanwoo Choi
  2016-12-21  7:59         ` Baolin Wang
  0 siblings, 1 reply; 12+ messages in thread
From: Chanwoo Choi @ 2016-12-21  7:58 UTC (permalink / raw)
  To: Baolin Wang
  Cc: myungjoo.ham, Chen-Yu Tsai, Kishon, Heiko Stübner, LKML,
	linux-arm-kernel, linux-rockchip, Linaro Kernel Mailman List,
	Mark Brown, NeilBrown

Hi,

On 2016년 12월 21일 16:53, Baolin Wang wrote:
> Hi,
> 
> On 21 December 2016 at 15:20, Chanwoo Choi <cw00.choi@samsung.com> wrote:
>> Hi,
>>
>> On 2016년 12월 21일 15:10, Baolin Wang wrote:
>>> Current there is both "EXTCON_USB" and "EXTCON_CHG_USB_SDP" which
>>> both seem to suggest a standard downstream port. But there is no
>>> documentation describing how these relate.
>>>
>>> Thus add documentation to describe EXTCON_CHG_USB_SDP should always
>>> appear together with EXTCON_USB, and EXTCON_CHG_USB_ACA would normally
>>> appear with EXTCON_USB_HOST.
>>>
>>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>>> ---
>>>  include/linux/extcon.h |    9 ++++++++-
>>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
>>> index b871c0c..6498b05 100644
>>> --- a/include/linux/extcon.h
>>> +++ b/include/linux/extcon.h
>>> @@ -46,7 +46,14 @@
>>>  #define EXTCON_USB           1
>>>  #define EXTCON_USB_HOST              2
>>>
>>> -/* Charging external connector */
>>> +/*
>>> + * Charging external connector
>>> + *
>>> + * When one SDP charger connector was reported, we should also report
>>> + * the USB connector, which means EXTCON_CHG_USB_SDP should always
>>> + * appear together with EXTCON_USB. The same as ACA charger connector,
>>> + * EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.
>>> + */
>>
>> Looks good to me.
>> But, you use the different word for ACA as following:
>> I think that 'would normally' is proper in descritpion.
> 
> Okay, I will change to 'would normally' in next version patch. Thanks.

Don't need to send next patch. I modify it and apply it. Thanks.

-- 
Regards,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_*
  2016-12-21  7:58       ` Chanwoo Choi
@ 2016-12-21  7:59         ` Baolin Wang
  0 siblings, 0 replies; 12+ messages in thread
From: Baolin Wang @ 2016-12-21  7:59 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: myungjoo.ham, Chen-Yu Tsai, Kishon, Heiko Stübner, LKML,
	linux-arm-kernel, linux-rockchip, Linaro Kernel Mailman List,
	Mark Brown, NeilBrown

Hi,

On 21 December 2016 at 15:58, Chanwoo Choi <cw00.choi@samsung.com> wrote:
> Hi,
>
> On 2016년 12월 21일 16:53, Baolin Wang wrote:
>> Hi,
>>
>> On 21 December 2016 at 15:20, Chanwoo Choi <cw00.choi@samsung.com> wrote:
>>> Hi,
>>>
>>> On 2016년 12월 21일 15:10, Baolin Wang wrote:
>>>> Current there is both "EXTCON_USB" and "EXTCON_CHG_USB_SDP" which
>>>> both seem to suggest a standard downstream port. But there is no
>>>> documentation describing how these relate.
>>>>
>>>> Thus add documentation to describe EXTCON_CHG_USB_SDP should always
>>>> appear together with EXTCON_USB, and EXTCON_CHG_USB_ACA would normally
>>>> appear with EXTCON_USB_HOST.
>>>>
>>>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>>>> ---
>>>>  include/linux/extcon.h |    9 ++++++++-
>>>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
>>>> index b871c0c..6498b05 100644
>>>> --- a/include/linux/extcon.h
>>>> +++ b/include/linux/extcon.h
>>>> @@ -46,7 +46,14 @@
>>>>  #define EXTCON_USB           1
>>>>  #define EXTCON_USB_HOST              2
>>>>
>>>> -/* Charging external connector */
>>>> +/*
>>>> + * Charging external connector
>>>> + *
>>>> + * When one SDP charger connector was reported, we should also report
>>>> + * the USB connector, which means EXTCON_CHG_USB_SDP should always
>>>> + * appear together with EXTCON_USB. The same as ACA charger connector,
>>>> + * EXTCON_CHG_USB_ACA should always appear with EXTCON_USB_HOST.
>>>> + */
>>>
>>> Looks good to me.
>>> But, you use the different word for ACA as following:
>>> I think that 'would normally' is proper in descritpion.
>>
>> Okay, I will change to 'would normally' in next version patch. Thanks.
>
> Don't need to send next patch. I modify it and apply it. Thanks.

Okay, Thanks a lot.

-- 
Baolin.wang
Best Regards

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
  2016-12-21  7:55       ` Baolin Wang
@ 2016-12-21  7:59         ` Chanwoo Choi
  0 siblings, 0 replies; 12+ messages in thread
From: Chanwoo Choi @ 2016-12-21  7:59 UTC (permalink / raw)
  To: Baolin Wang
  Cc: myungjoo.ham, Chen-Yu Tsai, Kishon, Heiko Stübner, LKML,
	linux-arm-kernel, linux-rockchip, Linaro Kernel Mailman List,
	Mark Brown, NeilBrown

Hi,

On 2016년 12월 21일 16:55, Baolin Wang wrote:
> Hi,
> 
> On 21 December 2016 at 15:22, Chanwoo Choi <cw00.choi@samsung.com> wrote:
>> Hi,
>>
>> On 2016년 12월 21일 15:10, Baolin Wang wrote:
>>> According to the documentation, we should set the EXTCON_USB when
>>> one SDP charger connector was reported.
>>>
>>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>>> ---
>>>  drivers/extcon/extcon-axp288.c |    7 ++++++-
>>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
>>> index 42f41e8..4490726 100644
>>> --- a/drivers/extcon/extcon-axp288.c
>>> +++ b/drivers/extcon/extcon-axp288.c
>>> @@ -102,6 +102,7 @@ enum axp288_extcon_irq {
>>>  };
>>>
>>>  static const unsigned int axp288_extcon_cables[] = {
>>> +     EXTCON_USB,
>>>       EXTCON_CHG_USB_SDP,
>>>       EXTCON_CHG_USB_CDP,
>>>       EXTCON_CHG_USB_DCP,
>>> @@ -225,8 +226,12 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
>>>                       vbus_attach ? USB_EVENT_VBUS : USB_EVENT_NONE, NULL);
>>>       }
>>>
>>> -     if (notify_charger)
>>> +     if (notify_charger) {
>>>               extcon_set_state_sync(info->edev, cable, vbus_attach);
>>> +             if (cable == EXTCON_CHG_USB_SDP)
>>> +                     extcon_set_state_sync(info->edev, EXTCON_USB,
>>> +                                           vbus_attach);
>>> +     }
>>>
>>>       /* Clear the flags on disconnect event */
>>>       if (!vbus_attach)
>>>
>>
>> The extcon-axp288.c driver has some patches on extcon-next[1] branch.
>> [1] https://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/log/?h=extcon-next
>>
>> I rework your patch on extcon-next branch as following:
>> If you ok, I'll merge it for v4.11.
> 
> It is okay for me. Thanks.

Applied it. Thanks.

[snip]

-- 
Regards,
Chanwoo Choi

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2016-12-21  7:59 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <CGME20161221061321epcas2p196fd90254d59164e1195840bdd546fa7@epcas2p1.samsung.com>
2016-12-21  6:10 ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Baolin Wang
2016-12-21  6:10   ` [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set Baolin Wang
2016-12-21  7:22     ` Chanwoo Choi
2016-12-21  7:55       ` Baolin Wang
2016-12-21  7:59         ` Chanwoo Choi
2016-12-21  6:10   ` [PATCH 3/3] phy: rockchip-inno-usb2: " Baolin Wang
2016-12-21  7:29     ` Chanwoo Choi
2016-12-21  7:57       ` Baolin Wang
2016-12-21  7:20   ` [PATCH 1/3] extcon: Add documentation for EXTCON_CHG_USB_* and EXTCON_USB_* Chanwoo Choi
2016-12-21  7:53     ` Baolin Wang
2016-12-21  7:58       ` Chanwoo Choi
2016-12-21  7:59         ` Baolin Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).