From: Chanwoo Choi <cw00.choi@samsung.com>
To: Baolin Wang <baolin.wang@linaro.org>,
myungjoo.ham@samsung.com, wens@csie.org, kishon@ti.com,
heiko@sntech.de
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org,
linaro-kernel@lists.linaro.org, broonie@kernel.org,
neilb@suse.com
Subject: Re: [PATCH 2/3] extcon: axp288: Set EXTCON_USB when EXTCON_CHG_USB_SDP was set
Date: Wed, 21 Dec 2016 16:22:35 +0900 [thread overview]
Message-ID: <585A2DBB.8070504@samsung.com> (raw)
In-Reply-To: <11fb7adc2982a9134faee9abb1de4dcfb253f2d2.1482300213.git.baolin.wang@linaro.org>
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
next prev parent reply other threads:[~2016-12-21 7:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=585A2DBB.8070504@samsung.com \
--to=cw00.choi@samsung.com \
--cc=baolin.wang@linaro.org \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=kishon@ti.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=myungjoo.ham@samsung.com \
--cc=neilb@suse.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).