From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr10049.outbound.protection.outlook.com ([40.107.1.49]:21440 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751747AbeECAld (ORCPT ); Wed, 2 May 2018 20:41:33 -0400 From: Li Jun Subject: [PATCH v5 04/14] usb: typec: add fwnode to tcpc Date: Thu, 3 May 2018 08:24:44 +0800 Message-Id: <1525307094-27402-5-git-send-email-jun.li@nxp.com> In-Reply-To: <1525307094-27402-1-git-send-email-jun.li@nxp.com> References: <1525307094-27402-1-git-send-email-jun.li@nxp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: devicetree-owner@vger.kernel.org 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 List-ID: Add fwnode handle to get the fwnode so we can get typec configs it contains. Suggested-by: Heikki Krogerus Signed-off-by: Li Jun --- 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 #include #include +#include #include #include #include @@ -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 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,04/14] usb: typec: add fwnode to tcpc From: Jun Li Message-Id: <1525307094-27402-5-git-send-email-jun.li@nxp.com> Date: Thu, 3 May 2018 08:24:44 +0800 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 List-ID: QWRkIGZ3bm9kZSBoYW5kbGUgdG8gZ2V0IHRoZSBmd25vZGUgc28gd2UgY2FuIGdldCB0eXBlYyBj b25maWdzCml0IGNvbnRhaW5zLgoKU3VnZ2VzdGVkLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtr aS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IExpIEp1biA8anVuLmxp QG54cC5jb20+Ci0tLQogZHJpdmVycy9zdGFnaW5nL3R5cGVjL3RjcGNpLmMgfCA3ICsrKysrKysK IGRyaXZlcnMvdXNiL3R5cGVjL3RjcG0uYyAgICAgIHwgMSArCiBpbmNsdWRlL2xpbnV4L3VzYi90 Y3BtLmggICAgICB8IDIgKysKIDMgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy90eXBlYy90Y3BjaS5jIGIvZHJpdmVycy9zdGFnaW5n L3R5cGVjL3RjcGNpLmMKaW5kZXggNzQxYTgwYS4uMDFkMTRmYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9zdGFnaW5nL3R5cGVjL3RjcGNpLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL3R5cGVjL3RjcGNp LmMKQEAgLTEwLDYgKzEwLDcgQEAKICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KICNpbmNsdWRl IDxsaW51eC9pMmMuaD4KICNpbmNsdWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4KKyNpbmNsdWRlIDxs aW51eC9wcm9wZXJ0eS5oPgogI2luY2x1ZGUgPGxpbnV4L3JlZ21hcC5oPgogI2luY2x1ZGUgPGxp bnV4L3VzYi9wZC5oPgogI2luY2x1ZGUgPGxpbnV4L3VzYi90Y3BtLmg+CkBAIC00NzQsNiArNDc1 LDEyIEBAIHN0YXRpYyBpbnQgdGNwY2lfcGFyc2VfY29uZmlnKHN0cnVjdCB0Y3BjaSAqdGNwY2kp CiAKIAkvKiBUT0RPOiBQb3B1bGF0ZSBzdHJ1Y3QgdGNwY19jb25maWcgZnJvbSBBQ1BJL2Rldmlj ZS10cmVlICovCiAJdGNwY2ktPnRjcGMuY29uZmlnID0gJnRjcGNpX3RjcGNfY29uZmlnOworCXRj cGNpLT50Y3BjLmZ3bm9kZSA9IGRldmljZV9nZXRfbmFtZWRfY2hpbGRfbm9kZSh0Y3BjaS0+ZGV2 LAorCQkJCQkJCSAiY29ubmVjdG9yIik7CisJaWYgKCF0Y3BjaS0+dGNwYy5md25vZGUpIHsKKwkJ ZGV2X2Vycih0Y3BjaS0+ZGV2LCAiQ2FuJ3QgZmluZCBjb25uZWN0b3Igbm9kZS5cbiIpOworCQly ZXR1cm4gLUVJTlZBTDsKKwl9CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv dXNiL3R5cGVjL3RjcG0uYyBiL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0uYwppbmRleCA3ZWU0MTdh Li44MGIyMzAzIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi90eXBlYy90Y3BtLmMKKysrIGIvZHJp dmVycy91c2IvdHlwZWMvdGNwbS5jCkBAIC00NTc5LDYgKzQ1NzksNyBAQCBzdHJ1Y3QgdGNwbV9w b3J0ICp0Y3BtX3JlZ2lzdGVyX3BvcnQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgdGNwY19k ZXYgKnRjcGMpCiAJZWxzZQogCQlwb3J0LT50cnlfcm9sZSA9IFRZUEVDX05PX1BSRUZFUlJFRF9S T0xFOwogCisJcG9ydC0+dHlwZWNfY2Fwcy5md25vZGUgPSB0Y3BjLT5md25vZGU7CiAJcG9ydC0+ dHlwZWNfY2Fwcy5wcmVmZXJfcm9sZSA9IHRjcGMtPmNvbmZpZy0+ZGVmYXVsdF9yb2xlOwogCXBv cnQtPnR5cGVjX2NhcHMudHlwZSA9IHRjcGMtPmNvbmZpZy0+dHlwZTsKIAlwb3J0LT50eXBlY19j YXBzLmRhdGEgPSB0Y3BjLT5jb25maWctPmRhdGE7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4 L3VzYi90Y3BtLmggYi9pbmNsdWRlL2xpbnV4L3VzYi90Y3BtLmgKaW5kZXggYjIzMWI5My4uMTkz OTIwYSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC91c2IvdGNwbS5oCisrKyBiL2luY2x1ZGUv bGludXgvdXNiL3RjcG0uaApAQCAtMTEwLDYgKzExMCw3IEBAIGVudW0gdGNwY19tdXhfbW9kZSB7 CiAvKioKICAqIHN0cnVjdCB0Y3BjX2RldiAtIFBvcnQgY29uZmlndXJhdGlvbiBhbmQgY2FsbGJh Y2sgZnVuY3Rpb25zCiAgKiBAY29uZmlnOglQb2ludGVyIHRvIHBvcnQgY29uZmlndXJhdGlvbgor ICogQGZ3bm9kZToJUG9pbnRlciB0byBwb3J0IGZ3bm9kZQogICogQGdldF92YnVzOglDYWxsZWQg dG8gcmVhZCBjdXJyZW50IFZCVVMgc3RhdGUKICAqIEBnZXRfY3VycmVudF9saW1pdDoKICAqCQlP cHRpb25hbDsgY2FsbGVkIGJ5IHRoZSB0Y3BtIGNvcmUgd2hlbiBjb25maWd1cmVkIGFzIGEgc25r CkBAIC0xMzgsNiArMTM5LDcgQEAgZW51bSB0Y3BjX211eF9tb2RlIHsKICAqLwogc3RydWN0IHRj cGNfZGV2IHsKIAljb25zdCBzdHJ1Y3QgdGNwY19jb25maWcgKmNvbmZpZzsKKwlzdHJ1Y3QgZndu b2RlX2hhbmRsZSAqZndub2RlOwogCiAJaW50ICgqaW5pdCkoc3RydWN0IHRjcGNfZGV2ICpkZXYp OwogCWludCAoKmdldF92YnVzKShzdHJ1Y3QgdGNwY19kZXYgKmRldik7Cg==