All of lore.kernel.org
 help / color / mirror / Atom feed
From: Li Jun <jun.li@nxp.com>
To: gregkh@linuxfoundation.org, robh+dt@kernel.org,
	heikki.krogerus@linux.intel.com, linux@roeck-us.net
Cc: a.hajda@samsung.com, mark.rutland@arm.com, jun.li@nxp.com,
	yueyao@google.com, peter.chen@nxp.com, garsilva@embeddedor.com,
	o_leveque@orange.fr, shufan_lee@richtek.com,
	linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-imx@nxp.com
Subject: [PATCH v2 07/12] staging: typec: tcpci: correct drp toggling
Date: Mon, 26 Feb 2018 19:49:14 +0800	[thread overview]
Message-ID: <1519645759-12701-8-git-send-email-jun.li@nxp.com> (raw)
In-Reply-To: <1519645759-12701-1-git-send-email-jun.li@nxp.com>

Per tcpci spec 4.4.5.2 ROLE_CONTROL description: "the TCPM shall
write B6 (DRP) =1b and the starting value of Rp/Rd to B3..0 (CC1/CC2)
to indicate DRP autonomous toggling mode to the TCPC", so add CC1/CC2
setting, also we should issue COMMAND.Look4Connection to start it.

Signed-off-by: Li Jun <jun.li@nxp.com>
---
 drivers/staging/typec/tcpci.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index 953fc97..530a5d7 100644
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -109,6 +109,7 @@ static int tcpci_start_drp_toggling(struct tcpc_dev *tcpc,
 {
 	struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
 	unsigned int reg = TCPC_ROLE_CTRL_DRP;
+	int ret;
 
 	switch (cc) {
 	default:
@@ -126,7 +127,19 @@ static int tcpci_start_drp_toggling(struct tcpc_dev *tcpc,
 		break;
 	}
 
-	return regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+	if (cc == TYPEC_CC_RD)
+		reg |= (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
+			(TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
+	else
+		reg |= (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+			(TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT);
+
+	ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+	if (ret < 0)
+		return ret;
+
+	return regmap_write(tcpci->regmap, TCPC_COMMAND,
+				TCPC_CMD_LOOK4CONNECTION);
 }
 
 static enum typec_cc_status tcpci_to_typec_cc(unsigned int cc, bool sink)
-- 
2.7.4


WARNING: multiple messages have this Message-ID (diff)
From: Jun Li <jun.li@nxp.com>
To: gregkh@linuxfoundation.org, robh+dt@kernel.org,
	heikki.krogerus@linux.intel.com, linux@roeck-us.net
Cc: a.hajda@samsung.com, mark.rutland@arm.com, jun.li@nxp.com,
	yueyao@google.com, peter.chen@nxp.com, garsilva@embeddedor.com,
	o_leveque@orange.fr, shufan_lee@richtek.com,
	linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-imx@nxp.com
Subject: [v2,07/12] staging: typec: tcpci: correct drp toggling
Date: Mon, 26 Feb 2018 19:49:14 +0800	[thread overview]
Message-ID: <1519645759-12701-8-git-send-email-jun.li@nxp.com> (raw)

Per tcpci spec 4.4.5.2 ROLE_CONTROL description: "the TCPM shall
write B6 (DRP) =1b and the starting value of Rp/Rd to B3..0 (CC1/CC2)
to indicate DRP autonomous toggling mode to the TCPC", so add CC1/CC2
setting, also we should issue COMMAND.Look4Connection to start it.

Signed-off-by: Li Jun <jun.li@nxp.com>
---
 drivers/staging/typec/tcpci.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index 953fc97..530a5d7 100644
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -109,6 +109,7 @@ static int tcpci_start_drp_toggling(struct tcpc_dev *tcpc,
 {
 	struct tcpci *tcpci = tcpc_to_tcpci(tcpc);
 	unsigned int reg = TCPC_ROLE_CTRL_DRP;
+	int ret;
 
 	switch (cc) {
 	default:
@@ -126,7 +127,19 @@ static int tcpci_start_drp_toggling(struct tcpc_dev *tcpc,
 		break;
 	}
 
-	return regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+	if (cc == TYPEC_CC_RD)
+		reg |= (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) |
+			(TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT);
+	else
+		reg |= (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) |
+			(TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT);
+
+	ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);
+	if (ret < 0)
+		return ret;
+
+	return regmap_write(tcpci->regmap, TCPC_COMMAND,
+				TCPC_CMD_LOOK4CONNECTION);
 }
 
 static enum typec_cc_status tcpci_to_typec_cc(unsigned int cc, bool sink)

  parent reply	other threads:[~2018-02-26 12:05 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-26 11:49 [PATCH v2 00/12] staging: typec: tcpci: move out of staging Li Jun
2018-02-26 11:49 ` [PATCH v2 01/12] usb: typec: add API to get port type and preferred role Li Jun
2018-02-26 11:49   ` [v2,01/12] " Jun Li
2018-02-26 13:19   ` [PATCH v2 01/12] " Heikki Krogerus
2018-02-26 13:19     ` [v2,01/12] " Heikki Krogerus
2018-03-05  7:54     ` [PATCH v2 01/12] " Jun Li
2018-03-05  7:54       ` [v2,01/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 02/12] usb: typec: add API to get sink and source config Li Jun
2018-02-26 11:49   ` [v2,02/12] " Jun Li
2018-02-26 13:32   ` [PATCH v2 02/12] " Heikki Krogerus
2018-02-26 13:32     ` [v2,02/12] " Heikki Krogerus
2018-03-05  8:40     ` [PATCH v2 02/12] " Jun Li
2018-03-05  8:40       ` [v2,02/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 03/12] staging: typec: tcpci: support port config passed via dt Li Jun
2018-02-26 11:49   ` [v2,03/12] " Jun Li
2018-02-26 14:06   ` [PATCH v2 03/12] " Heikki Krogerus
2018-02-26 14:06     ` [v2,03/12] " Heikki Krogerus
2018-02-26 14:30     ` [PATCH v2 03/12] " Jun Li
2018-02-26 14:30       ` [v2,03/12] " Jun Li
2018-02-27 11:03       ` [PATCH v2 03/12] " Heikki Krogerus
2018-02-27 11:03         ` [v2,03/12] " Heikki Krogerus
2018-03-05  8:53         ` [PATCH v2 03/12] " Jun Li
2018-03-05  8:53           ` [v2,03/12] " Jun Li
2018-03-05  9:53           ` [PATCH v2 03/12] " Heikki Krogerus
2018-03-05  9:53             ` [v2,03/12] " Heikki Krogerus
2018-03-05 10:35             ` [PATCH v2 03/12] " Jun Li
2018-03-05 10:35               ` [v2,03/12] " Jun Li
2018-03-05 11:30               ` [PATCH v2 03/12] " Heikki Krogerus
2018-03-05 11:30                 ` [v2,03/12] " Heikki Krogerus
2018-03-05 12:38                 ` [PATCH v2 03/12] " Jun Li
2018-03-05 12:38                   ` [v2,03/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 04/12] staging: typec: tcpci: register port before request irq Li Jun
2018-02-26 11:49   ` [v2,04/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 05/12] staging: typec: tcpci: enable vbus detection Li Jun
2018-02-26 11:49   ` [v2,05/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 06/12] typec: tcpm: add starting value for drp toggling Li Jun
2018-02-26 11:49   ` [v2,06/12] " Jun Li
2018-02-26 11:49 ` Li Jun [this message]
2018-02-26 11:49   ` [v2,07/12] staging: typec: tcpci: correct " Jun Li
2018-02-26 11:49 ` [PATCH v2 08/12] staging: typec: tcpci: keep the uncontact cc line open Li Jun
2018-02-26 11:49   ` [v2,08/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 09/12] staging: typec: tcpci: Only touch target bit when enable vconn Li Jun
2018-02-26 11:49   ` [v2,09/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 10/12] dt-bindings: connector: add properties for typec power delivery Li Jun
2018-02-26 11:49   ` [v2,10/12] " Jun Li
2018-02-27  8:41   ` [PATCH v2 10/12] " Andrzej Hajda
2018-02-27  8:41     ` [v2,10/12] " Andrzej Hajda
2018-03-02 22:38     ` [PATCH v2 10/12] " Rob Herring
2018-03-02 22:38       ` [v2,10/12] " Rob Herring
2018-03-05  7:52       ` [PATCH v2 10/12] " Jun Li
2018-03-05  7:52         ` [v2,10/12] " Jun Li
2018-03-05 12:25         ` [PATCH v2 10/12] " Jun Li
2018-03-05 12:25           ` [v2,10/12] " Jun Li
2018-03-05  7:00     ` [PATCH v2 10/12] " Jun Li
2018-03-05  7:00       ` [v2,10/12] " Jun Li
2018-03-05  9:59       ` [PATCH v2 10/12] " Andrzej Hajda
2018-03-05  9:59         ` [v2,10/12] " Andrzej Hajda
2018-03-06  9:38         ` [PATCH v2 10/12] " Jun Li
2018-03-06  9:38           ` [v2,10/12] " Jun Li
2018-03-06 11:54           ` [PATCH v2 10/12] " Andrzej Hajda
2018-03-06 11:54             ` [v2,10/12] " Andrzej Hajda
2018-03-06 12:02           ` [PATCH v2 10/12] " Heikki Krogerus
2018-03-06 12:02             ` [v2,10/12] " Heikki Krogerus
2018-03-08  1:41             ` [PATCH v2 10/12] " Jun Li
2018-03-08  1:41               ` [v2,10/12] " Jun Li
2018-03-09  7:34               ` [PATCH v2 10/12] " Heikki Krogerus
2018-03-09  7:34                 ` [v2,10/12] " Heikki Krogerus
2018-03-02 22:29   ` [PATCH v2 10/12] " Rob Herring
2018-03-02 22:29     ` [v2,10/12] " Rob Herring
2018-03-05  7:07     ` [PATCH v2 10/12] " Jun Li
2018-03-05  7:07       ` [v2,10/12] " Jun Li
2018-02-26 11:49 ` [PATCH v2 11/12] dt-bindings: usb: add documentation for typec port controller(TCPCI) Li Jun
2018-02-26 11:49   ` [v2,11/12] " Jun Li
2018-03-02 22:56   ` [PATCH v2 11/12] " Rob Herring
2018-03-02 22:56     ` [v2,11/12] " Rob Herring
2018-02-26 11:49 ` [PATCH v2 12/12] staging: typec: tcpci: move tcpci driver out of staging Li Jun
2018-02-26 11:49   ` [v2,12/12] " Jun Li

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=1519645759-12701-8-git-send-email-jun.li@nxp.com \
    --to=jun.li@nxp.com \
    --cc=a.hajda@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=garsilva@embeddedor.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=linux-imx@nxp.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=mark.rutland@arm.com \
    --cc=o_leveque@orange.fr \
    --cc=peter.chen@nxp.com \
    --cc=robh+dt@kernel.org \
    --cc=shufan_lee@richtek.com \
    --cc=yueyao@google.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.