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: a.hajda@samsung.com, jun.li@nxp.com, cw00.choi@samsung.com,
shufan_lee@richtek.com, peter.chen@nxp.com,
devicetree@vger.kernel.org, linux-usb@vger.kernel.org,
linux-imx@nxp.com
Subject: [PATCH v7 04/14] usb: typec: add fwnode to tcpc
Date: Mon, 25 Jun 2018 16:08:36 +0800 [thread overview]
Message-ID: <1529914126-22550-5-git-send-email-jun.li@nxp.com> (raw)
In-Reply-To: <1529914126-22550-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>
Reviewed-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 dd29288..e59547a 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 8a201dd..d22b37b 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -4576,6 +4576,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
next prev parent reply other threads:[~2018-06-25 8:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 8:08 [PATCH v7 00/14] staging: typec: tcpci: move out of staging Li Jun
2018-06-25 8:08 ` [PATCH v7 01/14] dt-bindings: connector: add properties for typec Li Jun
2018-06-25 8:08 ` [PATCH v7 02/14] dt-bindings: usb: add documentation for typec port controller(TCPCI) Li Jun
2018-06-25 8:08 ` [PATCH v7 03/14] staging: typec: tcpci: add compatible string for nxp ptn5110 Li Jun
2018-06-25 8:08 ` Li Jun [this message]
2018-06-25 8:08 ` [PATCH v7 05/14] usb: typec: add API to get typec basic port power and data config Li Jun
2018-06-26 8:14 ` Heikki Krogerus
2018-06-25 8:08 ` [PATCH v7 06/14] usb: typec: tcpm: support get typec and pd config from device properties Li Jun
2018-06-25 10:45 ` Adam Thomson
2018-06-26 15:01 ` Jun Li
2018-06-25 8:08 ` [PATCH v7 07/14] staging: typec: tcpci: remove unused tcpci_tcpc_config Li Jun
2018-06-25 8:08 ` [PATCH v7 08/14] staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO() Li Jun
2018-06-25 8:08 ` [PATCH v7 09/14] staging: typec: tcpci: register port before request irq Li Jun
2018-06-25 8:08 ` [PATCH v7 10/14] staging: typec: tcpci: enable vbus detection Li Jun
2018-06-25 8:08 ` [PATCH v7 11/14] typec: tcpm: add starting value for drp toggling Li Jun
2018-06-25 8:08 ` [PATCH v7 12/14] staging: typec: tcpci: keep the disconnected cc line open Li Jun
2018-06-25 8:08 ` [PATCH v7 13/14] staging: typec: tcpci: Only touch target bit when enable vconn Li Jun
2018-06-25 8:08 ` [PATCH v7 14/14] staging: typec: tcpci: move tcpci drivers out of staging Li Jun
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=1529914126-22550-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=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 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).