All of lore.kernel.org
 help / color / mirror / Atom feed
From: Li Jun <jun.li@nxp.com>
To: robh+dt@kernel.org, gregkh@linuxfoundation.org,
	heikki.krogerus@linux.intel.com, linux@roeck-us.net
Cc: jun.li@nxp.com, a.hajda@samsung.com, cw00.choi@samsung.com,
	shufan_lee@richtek.com, peter.chen@nxp.com, gsomlo@gmail.com,
	devicetree@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-imx@nxp.com
Subject: [PATCH v5 04/14] usb: typec: add fwnode to tcpc
Date: Thu,  3 May 2018 08:24:44 +0800	[thread overview]
Message-ID: <1525307094-27402-5-git-send-email-jun.li@nxp.com> (raw)
In-Reply-To: <1525307094-27402-1-git-send-email-jun.li@nxp.com>

Add fwnode handle to get the fwnode so we can get typec configs
it contains.

Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
---
 drivers/staging/typec/tcpci.c | 7 +++++++
 drivers/usb/typec/tcpm.c      | 1 +
 include/linux/usb/tcpm.h      | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index 741a80a..01d14fb 100644
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/usb/pd.h>
 #include <linux/usb/tcpm.h>
@@ -474,6 +475,12 @@ static int tcpci_parse_config(struct tcpci *tcpci)
 
 	/* TODO: Populate struct tcpc_config from ACPI/device-tree */
 	tcpci->tcpc.config = &tcpci_tcpc_config;
+	tcpci->tcpc.fwnode = device_get_named_child_node(tcpci->dev,
+							 "connector");
+	if (!tcpci->tcpc.fwnode) {
+		dev_err(tcpci->dev, "Can't find connector node.\n");
+		return -EINVAL;
+	}
 
 	return 0;
 }
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index 7ee417a..80b2303 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -4579,6 +4579,7 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
 	else
 		port->try_role = TYPEC_NO_PREFERRED_ROLE;
 
+	port->typec_caps.fwnode = tcpc->fwnode;
 	port->typec_caps.prefer_role = tcpc->config->default_role;
 	port->typec_caps.type = tcpc->config->type;
 	port->typec_caps.data = tcpc->config->data;
diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h
index b231b93..193920a 100644
--- a/include/linux/usb/tcpm.h
+++ b/include/linux/usb/tcpm.h
@@ -110,6 +110,7 @@ enum tcpc_mux_mode {
 /**
  * struct tcpc_dev - Port configuration and callback functions
  * @config:	Pointer to port configuration
+ * @fwnode:	Pointer to port fwnode
  * @get_vbus:	Called to read current VBUS state
  * @get_current_limit:
  *		Optional; called by the tcpm core when configured as a snk
@@ -138,6 +139,7 @@ enum tcpc_mux_mode {
  */
 struct tcpc_dev {
 	const struct tcpc_config *config;
+	struct fwnode_handle *fwnode;
 
 	int (*init)(struct tcpc_dev *dev);
 	int (*get_vbus)(struct tcpc_dev *dev);
-- 
2.7.4


WARNING: multiple messages have this Message-ID (diff)
From: Jun Li <jun.li@nxp.com>
To: robh+dt@kernel.org, gregkh@linuxfoundation.org,
	heikki.krogerus@linux.intel.com, linux@roeck-us.net
Cc: jun.li@nxp.com, a.hajda@samsung.com, cw00.choi@samsung.com,
	shufan_lee@richtek.com, peter.chen@nxp.com, gsomlo@gmail.com,
	devicetree@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-imx@nxp.com
Subject: [v5,04/14] usb: typec: add fwnode to tcpc
Date: Thu,  3 May 2018 08:24:44 +0800	[thread overview]
Message-ID: <1525307094-27402-5-git-send-email-jun.li@nxp.com> (raw)

Add fwnode handle to get the fwnode so we can get typec configs
it contains.

Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
---
 drivers/staging/typec/tcpci.c | 7 +++++++
 drivers/usb/typec/tcpm.c      | 1 +
 include/linux/usb/tcpm.h      | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index 741a80a..01d14fb 100644
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/usb/pd.h>
 #include <linux/usb/tcpm.h>
@@ -474,6 +475,12 @@ static int tcpci_parse_config(struct tcpci *tcpci)
 
 	/* TODO: Populate struct tcpc_config from ACPI/device-tree */
 	tcpci->tcpc.config = &tcpci_tcpc_config;
+	tcpci->tcpc.fwnode = device_get_named_child_node(tcpci->dev,
+							 "connector");
+	if (!tcpci->tcpc.fwnode) {
+		dev_err(tcpci->dev, "Can't find connector node.\n");
+		return -EINVAL;
+	}
 
 	return 0;
 }
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index 7ee417a..80b2303 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -4579,6 +4579,7 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
 	else
 		port->try_role = TYPEC_NO_PREFERRED_ROLE;
 
+	port->typec_caps.fwnode = tcpc->fwnode;
 	port->typec_caps.prefer_role = tcpc->config->default_role;
 	port->typec_caps.type = tcpc->config->type;
 	port->typec_caps.data = tcpc->config->data;
diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h
index b231b93..193920a 100644
--- a/include/linux/usb/tcpm.h
+++ b/include/linux/usb/tcpm.h
@@ -110,6 +110,7 @@ enum tcpc_mux_mode {
 /**
  * struct tcpc_dev - Port configuration and callback functions
  * @config:	Pointer to port configuration
+ * @fwnode:	Pointer to port fwnode
  * @get_vbus:	Called to read current VBUS state
  * @get_current_limit:
  *		Optional; called by the tcpm core when configured as a snk
@@ -138,6 +139,7 @@ enum tcpc_mux_mode {
  */
 struct tcpc_dev {
 	const struct tcpc_config *config;
+	struct fwnode_handle *fwnode;
 
 	int (*init)(struct tcpc_dev *dev);
 	int (*get_vbus)(struct tcpc_dev *dev);

  parent reply	other threads:[~2018-05-03  0:41 UTC|newest]

Thread overview: 99+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-03  0:24 [PATCH v5 00/14] staging: typec: tcpci: move out of staging Li Jun
2018-05-03  0:24 ` [PATCH v5 01/14] dt-bindings: connector: add properties for typec Li Jun
2018-05-03  0:24   ` [v5,01/14] " Jun Li
2018-05-03  7:27   ` [PATCH v5 01/14] " Oliver Neukum
2018-05-03  7:27     ` [v5,01/14] " Oliver Neukum
2018-05-03  8:35     ` [PATCH v5 01/14] " Jun Li
2018-05-03  8:35       ` [v5,01/14] " Jun Li
2018-05-03  9:17       ` [PATCH v5 01/14] " Oliver Neukum
2018-05-03  9:17         ` [v5,01/14] " Oliver Neukum
2018-05-04  8:59         ` [PATCH v5 01/14] " Jun Li
2018-05-04  8:59           ` [v5,01/14] " Jun Li
2018-05-08 10:03           ` [PATCH v5 01/14] " Oliver Neukum
2018-05-08 10:03             ` [v5,01/14] " Oliver Neukum
2018-05-10  0:43             ` [PATCH v5 01/14] " Jun Li
2018-05-10  0:43               ` [v5,01/14] " Jun Li
2018-05-07 15:58   ` [PATCH v5 01/14] " Rob Herring
2018-05-07 15:58     ` [v5,01/14] " Rob Herring
2018-05-08  5:36     ` [PATCH v5 01/14] " Jun Li
2018-05-08  5:36       ` [v5,01/14] " Jun Li
2018-05-11 19:49   ` [PATCH v5 01/14] " Mats Karrman
2018-05-11 19:49     ` [v5,01/14] " Mats Karrman
2018-05-14  9:06     ` [PATCH v5 01/14] " Jun Li
2018-05-14  9:06       ` [v5,01/14] " Jun Li
2018-05-16  7:21   ` [PATCH v5 01/14] " Peter Chen
2018-05-16  7:21     ` [v5,01/14] " Peter Chen
2018-05-17 13:16     ` [PATCH v5 01/14] " Jun Li
2018-05-17 13:16       ` [v5,01/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 02/14] dt-bindings: usb: add documentation for typec port controller(TCPCI) Li Jun
2018-05-03  0:24   ` [v5,02/14] " Jun Li
2018-05-07 16:01   ` [PATCH v5 02/14] " Rob Herring
2018-05-07 16:01     ` [v5,02/14] " Rob Herring
2018-05-03  0:24 ` [PATCH v5 03/14] staging: typec: tcpci: add compatible string for nxp ptn5110 Li Jun
2018-05-03  0:24   ` [v5,03/14] " Jun Li
2018-05-11 19:51   ` [PATCH v5 03/14] " Mats Karrman
2018-05-11 19:51     ` [v5,03/14] " Mats Karrman
2018-05-14  9:15     ` [PATCH v5 03/14] " Jun Li
2018-05-14  9:15       ` [v5,03/14] " Jun Li
2018-05-03  0:24 ` Li Jun [this message]
2018-05-03  0:24   ` [v5,04/14] usb: typec: add fwnode to tcpc Jun Li
2018-05-03  0:24 ` [PATCH v5 05/14] usb: typec: add API to get typec basic port power and data config Li Jun
2018-05-03  0:24   ` [v5,05/14] " Jun Li
2018-05-11 19:55   ` [PATCH v5 05/14] " Mats Karrman
2018-05-11 19:55     ` [v5,05/14] " Mats Karrman
2018-05-14  9:36     ` [PATCH v5 05/14] " Jun Li
2018-05-14  9:36       ` [v5,05/14] " Jun Li
2018-05-15 20:52       ` [PATCH v5 05/14] " Mats Karrman
2018-05-15 20:52         ` [v5,05/14] " Mats Karrman
2018-05-16 12:25         ` [PATCH v5 05/14] " Heikki Krogerus
2018-05-16 12:25           ` [v5,05/14] " Heikki Krogerus
2018-05-16 20:55           ` [PATCH v5 05/14] " Mats Karrman
2018-05-16 20:55             ` [v5,05/14] " Mats Karrman
2018-05-17 12:35             ` [PATCH v5 05/14] " Heikki Krogerus
2018-05-17 12:35               ` [v5,05/14] " Heikki Krogerus
2018-05-17 14:05               ` [PATCH v5 05/14] " Jun Li
2018-05-17 14:05                 ` [v5,05/14] " Jun Li
2018-05-17 14:24                 ` [PATCH v5 05/14] " Heikki Krogerus
2018-05-17 14:24                   ` [v5,05/14] " Heikki Krogerus
2018-05-17 14:41                   ` [PATCH v5 05/14] " Jun Li
2018-05-17 14:41                     ` [v5,05/14] " Jun Li
2018-05-21 13:12                     ` [PATCH v5 05/14] " Heikki Krogerus
2018-05-21 13:12                       ` [v5,05/14] " Heikki Krogerus
2018-05-22 14:19                       ` [PATCH v5 05/14] " Jun Li
2018-05-22 14:19                         ` [v5,05/14] " Jun Li
2018-05-17 13:53             ` [PATCH v5 05/14] " Jun Li
2018-05-17 13:53               ` [v5,05/14] " Jun Li
2018-05-17 13:26           ` [PATCH v5 05/14] " Jun Li
2018-05-17 13:26             ` [v5,05/14] " Jun Li
2018-05-17 13:16         ` [PATCH v5 05/14] " Jun Li
2018-05-17 13:16           ` [v5,05/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 06/14] usb: typec: tcpm: support get typec and pd config from device properties Li Jun
2018-05-03  0:24   ` [v5,06/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 07/14] staging: typec: tcpci: remove unused tcpci_tcpc_config Li Jun
2018-05-03  0:24   ` [v5,07/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 08/14] staging: typec: tcpci: register port before request irq Li Jun
2018-05-03  0:24   ` [v5,08/14] " Jun Li
2018-05-03  8:29   ` [PATCH v5 08/14] " Sergei Shtylyov
2018-05-03  8:29     ` [v5,08/14] " Sergei Shtylyov
2018-05-03  8:34     ` [PATCH v5 08/14] " Sergei Shtylyov
2018-05-03  8:34       ` [v5,08/14] " Sergei Shtylyov
2018-05-03  0:24 ` [PATCH v5 09/14] staging: typec: tcpci: enable vbus detection Li Jun
2018-05-03  0:24   ` [v5,09/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 10/14] typec: tcpm: add starting value for drp toggling Li Jun
2018-05-03  0:24   ` [v5,10/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 11/14] usb: typec: tcpm: set cc for drp toggling attach Li Jun
2018-05-03  0:24   ` [v5,11/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 12/14] staging: typec: tcpci: keep the not connecting cc line open Li Jun
2018-05-03  0:24   ` [v5,12/14] " Jun Li
2018-05-16  8:35   ` [PATCH v5 12/14] " Peter Chen
2018-05-16  8:35     ` [v5,12/14] " Peter Chen
2018-05-17 13:17     ` [PATCH v5 12/14] " Jun Li
2018-05-17 13:17       ` [v5,12/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 13/14] staging: typec: tcpci: Only touch target bit when enable vconn Li Jun
2018-05-03  0:24   ` [v5,13/14] " Jun Li
2018-05-03  0:24 ` [PATCH v5 14/14] staging: typec: tcpci: move tcpci driver out of staging Li Jun
2018-05-03  0:24   ` [v5,14/14] " Jun Li
2018-05-11 21:37   ` [PATCH v5 14/14] " Mats Karrman
2018-05-11 21:37     ` [v5,14/14] " Mats Karrman
2018-05-14  9:38     ` [PATCH v5 14/14] " Jun Li
2018-05-14  9:38       ` [v5,14/14] " 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=1525307094-27402-5-git-send-email-jun.li@nxp.com \
    --to=jun.li@nxp.com \
    --cc=a.hajda@samsung.com \
    --cc=cw00.choi@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=gsomlo@gmail.com \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=linux-imx@nxp.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=peter.chen@nxp.com \
    --cc=robh+dt@kernel.org \
    --cc=shufan_lee@richtek.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.