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: [v4,04/13] usb: typec: add fwnode to tcpc From: Jun Li Message-Id: <1522253178-32414-5-git-send-email-jun.li@nxp.com> Date: Thu, 29 Mar 2018 00:06:09 +0800 To: robh+dt@kernel.org, gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, linux@roeck-us.net Cc: a.hajda@samsung.com, shufan_lee@richtek.com, peter.chen@nxp.com, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-imx@nxp.com, jun.li@nxp.com, devel@driverdev.osuosl.org List-ID: QWRkIGZ3bm9kZSBoYW5kbGUgdG8gZ2V0IHRoZSBmd25vZGUgc28gd2UgY2FuIGdldCB0eXBlYyBj b25maWdzCml0IGNvbnRhaW5zLgoKU3VnZ2VzdGVkLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtr aS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IExpIEp1biA8anVuLmxp QG54cC5jb20+Ci0tLQogZHJpdmVycy9zdGFnaW5nL3R5cGVjL3RjcGNpLmMgfCAxNCArKysrKysr LS0tLS0tLQogZHJpdmVycy91c2IvdHlwZWMvdGNwbS5jICAgICAgfCAgMSArCiBpbmNsdWRlL2xp bnV4L3VzYi90Y3BtLmggICAgICB8ICAyICsrCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlv bnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL3R5cGVj L3RjcGNpLmMgYi9kcml2ZXJzL3N0YWdpbmcvdHlwZWMvdGNwY2kuYwppbmRleCBlZDc2MzI3Li40 ZjdhZDEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvdHlwZWMvdGNwY2kuYworKysgYi9k cml2ZXJzL3N0YWdpbmcvdHlwZWMvdGNwY2kuYwpAQCAtMTAsNiArMTAsNyBAQAogI2luY2x1ZGUg PGxpbnV4L21vZHVsZS5oPgogI2luY2x1ZGUgPGxpbnV4L2kyYy5oPgogI2luY2x1ZGUgPGxpbnV4 L2ludGVycnVwdC5oPgorI2luY2x1ZGUgPGxpbnV4L3Byb3BlcnR5Lmg+CiAjaW5jbHVkZSA8bGlu dXgvcmVnbWFwLmg+CiAjaW5jbHVkZSA8bGludXgvdXNiL3BkLmg+CiAjaW5jbHVkZSA8bGludXgv dXNiL3RjcG0uaD4KQEAgLTQ2MywxNyArNDY0LDE2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcmVn bWFwX2NvbmZpZyB0Y3BjaV9yZWdtYXBfY29uZmlnID0gewogCS5tYXhfcmVnaXN0ZXIgPSAweDdG LCAvKiAweDgwIC4uIDB4RkYgYXJlIHZlbmRvciBkZWZpbmVkICovCiB9OwogCi1zdGF0aWMgY29u c3Qgc3RydWN0IHRjcGNfY29uZmlnIHRjcGNpX3RjcGNfY29uZmlnID0gewotCS50eXBlID0gVFlQ RUNfUE9SVF9ERlAsCi0JLmRlZmF1bHRfcm9sZSA9IFRZUEVDX1NJTkssCi19OwotCiBzdGF0aWMg aW50IHRjcGNpX3BhcnNlX2NvbmZpZyhzdHJ1Y3QgdGNwY2kgKnRjcGNpKQogewogCXRjcGNpLT5j b250cm9sc192YnVzID0gdHJ1ZTsgLyogWFhYICovCiAKLQkvKiBUT0RPOiBQb3B1bGF0ZSBzdHJ1 Y3QgdGNwY19jb25maWcgZnJvbSBBQ1BJL2RldmljZS10cmVlICovCi0JdGNwY2ktPnRjcGMuY29u ZmlnID0gJnRjcGNpX3RjcGNfY29uZmlnOworCXRjcGNpLT50Y3BjLmZ3bm9kZSA9IGRldmljZV9n ZXRfbmFtZWRfY2hpbGRfbm9kZSh0Y3BjaS0+ZGV2LAorCQkJCQkJCSAiY29ubmVjdG9yIik7CisJ aWYgKCF0Y3BjaS0+dGNwYy5md25vZGUpIHsKKwkJZGV2X2Vycih0Y3BjaS0+ZGV2LCAiQ2FuJ3Qg ZmluZCBjb25uZWN0b3Igbm9kZS5cbiIpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CiAKIAlyZXR1 cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0uYyBiL2RyaXZlcnMv dXNiL3R5cGVjL3RjcG0uYwppbmRleCBhN2I4MmQ5Li5iZTliMDA5IDEwMDY0NAotLS0gYS9kcml2 ZXJzL3VzYi90eXBlYy90Y3BtLmMKKysrIGIvZHJpdmVycy91c2IvdHlwZWMvdGNwbS5jCkBAIC0z NzA5LDYgKzM3MDksNyBAQCBzdHJ1Y3QgdGNwbV9wb3J0ICp0Y3BtX3JlZ2lzdGVyX3BvcnQoc3Ry dWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgdGNwY19kZXYgKnRjcGMpCiAJZWxzZQogCQlwb3J0LT50 cnlfcm9sZSA9IFRZUEVDX05PX1BSRUZFUlJFRF9ST0xFOwogCisJcG9ydC0+dHlwZWNfY2Fwcy5m d25vZGUgPSB0Y3BjLT5md25vZGU7CiAJcG9ydC0+dHlwZWNfY2Fwcy5wcmVmZXJfcm9sZSA9IHRj cGMtPmNvbmZpZy0+ZGVmYXVsdF9yb2xlOwogCXBvcnQtPnR5cGVjX2NhcHMudHlwZSA9IHRjcGMt PmNvbmZpZy0+dHlwZTsKIAlwb3J0LT50eXBlY19jYXBzLmRhdGEgPSB0Y3BjLT5jb25maWctPmRh dGE7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L3VzYi90Y3BtLmggYi9pbmNsdWRlL2xpbnV4 L3VzYi90Y3BtLmgKaW5kZXggZjBkODM5ZC4uZTJlMmRiMyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9s aW51eC91c2IvdGNwbS5oCisrKyBiL2luY2x1ZGUvbGludXgvdXNiL3RjcG0uaApAQCAtMTE1LDYg KzExNSw3IEBAIGVudW0gdGNwY19tdXhfbW9kZSB7CiAvKioKICAqIHN0cnVjdCB0Y3BjX2RldiAt IFBvcnQgY29uZmlndXJhdGlvbiBhbmQgY2FsbGJhY2sgZnVuY3Rpb25zCiAgKiBAY29uZmlnOglQ b2ludGVyIHRvIHBvcnQgY29uZmlndXJhdGlvbgorICogQGZ3bm9kZToJUG9pbnRlciB0byBwb3J0 IGZ3bm9kZQogICogQGdldF92YnVzOglDYWxsZWQgdG8gcmVhZCBjdXJyZW50IFZCVVMgc3RhdGUK ICAqIEBnZXRfY3VycmVudF9saW1pdDoKICAqCQlPcHRpb25hbDsgY2FsbGVkIGJ5IHRoZSB0Y3Bt IGNvcmUgd2hlbiBjb25maWd1cmVkIGFzIGEgc25rCkBAIC0xNDMsNiArMTQ0LDcgQEAgZW51bSB0 Y3BjX211eF9tb2RlIHsKICAqLwogc3RydWN0IHRjcGNfZGV2IHsKIAljb25zdCBzdHJ1Y3QgdGNw Y19jb25maWcgKmNvbmZpZzsKKwlzdHJ1Y3QgZndub2RlX2hhbmRsZSAqZndub2RlOwogCiAJaW50 ICgqaW5pdCkoc3RydWN0IHRjcGNfZGV2ICpkZXYpOwogCWludCAoKmdldF92YnVzKShzdHJ1Y3Qg dGNwY19kZXYgKmRldik7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Li Jun Subject: [PATCH v4 04/13] usb: typec: add fwnode to tcpc Date: Thu, 29 Mar 2018 00:06:09 +0800 Message-ID: <1522253178-32414-5-git-send-email-jun.li@nxp.com> References: <1522253178-32414-1-git-send-email-jun.li@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1522253178-32414-1-git-send-email-jun.li@nxp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: robh+dt@kernel.org, gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, linux@roeck-us.net Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, peter.chen@nxp.com, linux-usb@vger.kernel.org, a.hajda@samsung.com, linux-imx@nxp.com, jun.li@nxp.com, shufan_lee@richtek.com List-Id: devicetree@vger.kernel.org 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 | 14 +++++++------- drivers/usb/typec/tcpm.c | 1 + include/linux/usb/tcpm.h | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c index ed76327..4f7ad10 100644 --- a/drivers/staging/typec/tcpci.c +++ b/drivers/staging/typec/tcpci.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -463,17 +464,16 @@ static const struct regmap_config tcpci_regmap_config = { .max_register = 0x7F, /* 0x80 .. 0xFF are vendor defined */ }; -static const struct tcpc_config tcpci_tcpc_config = { - .type = TYPEC_PORT_DFP, - .default_role = TYPEC_SINK, -}; - static int tcpci_parse_config(struct tcpci *tcpci) { tcpci->controls_vbus = true; /* XXX */ - /* 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 a7b82d9..be9b009 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -3709,6 +3709,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 f0d839d..e2e2db3 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -115,6 +115,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 @@ -143,6 +144,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