From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-db5eur01on0059.outbound.protection.outlook.com ([104.47.2.59]:19538 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752777AbeBZMEr (ORCPT ); Mon, 26 Feb 2018 07:04:47 -0500 From: Li Jun Subject: [PATCH v2 03/12] staging: typec: tcpci: support port config passed via dt Date: Mon, 26 Feb 2018 19:49:10 +0800 Message-Id: <1519645759-12701-4-git-send-email-jun.li@nxp.com> In-Reply-To: <1519645759-12701-1-git-send-email-jun.li@nxp.com> References: <1519645759-12701-1-git-send-email-jun.li@nxp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: devicetree-owner@vger.kernel.org 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 List-ID: User can define the typec port properties in tcpci node to setup the port config. Signed-off-by: Li Jun --- Changes for v2: - Use infra APIs to get sink and source config. - Improve the error message. drivers/staging/typec/tcpci.c | 70 ++++++++++++++++++++++++++++++++++++++----- include/linux/usb/tcpm.h | 6 ++-- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c index b6abaf7..be6ed16 100644 --- a/drivers/staging/typec/tcpci.c +++ b/drivers/staging/typec/tcpci.c @@ -426,17 +426,73 @@ 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, -}; - +/* Populate struct tcpc_config from device-tree */ static int tcpci_parse_config(struct tcpci *tcpci) { + struct tcpc_config *tcfg; + struct device_node *child; + int ret = -EINVAL; + tcpci->controls_vbus = true; /* XXX */ - /* TODO: Populate struct tcpc_config from ACPI/device-tree */ - tcpci->tcpc.config = &tcpci_tcpc_config; + tcpci->tcpc.config = devm_kzalloc(tcpci->dev, sizeof(*tcfg), + GFP_KERNEL); + if (!tcpci->tcpc.config) + return -ENOMEM; + + tcfg = tcpci->tcpc.config; + + child = of_get_child_by_name(tcpci->dev->of_node, "connector"); + if (!child) { + dev_err(tcpci->dev, "failed to get connector node.\n"); + return -EINVAL; + } + + /* Get port-type */ + ret = typec_of_get_port_type(child); + if (ret < 0) { + dev_err(tcpci->dev, "failed to get correct port type.\n"); + return ret; + } + tcfg->type = ret; + + if (tcfg->type == TYPEC_PORT_UFP) + goto sink; + + tcfg->src_pdo = devm_kcalloc(tcpci->dev, PDO_MAX_OBJECTS, + sizeof(*tcfg->src_pdo), GFP_KERNEL); + if (!tcfg->src_pdo) + return -ENOMEM; + + /* Get source capability */ + ret = tcpm_of_get_src_config(child, tcfg); + if (ret <= 0) { + dev_err(tcpci->dev, "failed to get source pdo %d\n", ret); + return -EINVAL; + } + + if (tcfg->type == TYPEC_PORT_DFP) + return 0; + + /* Get the preferred power role for drp */ + ret = typec_of_get_preferred_role(child); + if (ret < 0) { + dev_err(tcpci->dev, "failed to get correct preferred role.\n"); + return ret; + } + tcfg->default_role = ret; +sink: + tcfg->snk_pdo = devm_kcalloc(tcpci->dev, PDO_MAX_OBJECTS, + sizeof(*tcfg->snk_pdo), GFP_KERNEL); + if (!tcfg->snk_pdo) + return -ENOMEM; + + /* Get power sink config */ + ret = tcpm_of_get_snk_config(child, tcfg); + if (ret < 0) { + dev_err(tcpci->dev, "failed to get sink configs %d\n", ret); + return -EINVAL; + } return 0; } diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h index 962eff1..8e9edb4 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -76,10 +76,10 @@ enum tcpm_transmit_type { * @alt_modes: List of supported alternate modes */ struct tcpc_config { - const u32 *src_pdo; + u32 *src_pdo; unsigned int nr_src_pdo; - const u32 *snk_pdo; + u32 *snk_pdo; unsigned int nr_snk_pdo; const u32 *snk_vdo; @@ -154,7 +154,7 @@ struct tcpc_mux_dev { * @mux: Pointer to multiplexer data */ struct tcpc_dev { - const struct tcpc_config *config; + struct tcpc_config *config; 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: [v2,03/12] staging: typec: tcpci: support port config passed via dt From: Jun Li Message-Id: <1519645759-12701-4-git-send-email-jun.li@nxp.com> Date: Mon, 26 Feb 2018 19:49:10 +0800 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 List-ID: VXNlciBjYW4gZGVmaW5lIHRoZSB0eXBlYyBwb3J0IHByb3BlcnRpZXMgaW4gdGNwY2kgbm9kZSB0 byBzZXR1cAp0aGUgcG9ydCBjb25maWcuCgpTaWduZWQtb2ZmLWJ5OiBMaSBKdW4gPGp1bi5saUBu eHAuY29tPgotLS0KQ2hhbmdlcyBmb3IgdjI6Ci0gVXNlIGluZnJhIEFQSXMgdG8gZ2V0IHNpbmsg YW5kIHNvdXJjZSBjb25maWcuCi0gSW1wcm92ZSB0aGUgZXJyb3IgbWVzc2FnZS4KCiBkcml2ZXJz L3N0YWdpbmcvdHlwZWMvdGNwY2kuYyB8IDcwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0KIGluY2x1ZGUvbGludXgvdXNiL3RjcG0uaCAgICAgIHwgIDYgKystLQog MiBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvdHlwZWMvdGNwY2kuYyBiL2RyaXZlcnMvc3RhZ2luZy90 eXBlYy90Y3BjaS5jCmluZGV4IGI2YWJhZjcuLmJlNmVkMTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv c3RhZ2luZy90eXBlYy90Y3BjaS5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy90eXBlYy90Y3BjaS5j CkBAIC00MjYsMTcgKzQyNiw3MyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHJlZ21hcF9jb25maWcg dGNwY2lfcmVnbWFwX2NvbmZpZyA9IHsKIAkubWF4X3JlZ2lzdGVyID0gMHg3RiwgLyogMHg4MCAu LiAweEZGIGFyZSB2ZW5kb3IgZGVmaW5lZCAqLwogfTsKIAotc3RhdGljIGNvbnN0IHN0cnVjdCB0 Y3BjX2NvbmZpZyB0Y3BjaV90Y3BjX2NvbmZpZyA9IHsKLQkudHlwZSA9IFRZUEVDX1BPUlRfREZQ LAotCS5kZWZhdWx0X3JvbGUgPSBUWVBFQ19TSU5LLAotfTsKLQorLyogUG9wdWxhdGUgc3RydWN0 IHRjcGNfY29uZmlnIGZyb20gZGV2aWNlLXRyZWUgKi8KIHN0YXRpYyBpbnQgdGNwY2lfcGFyc2Vf Y29uZmlnKHN0cnVjdCB0Y3BjaSAqdGNwY2kpCiB7CisJc3RydWN0IHRjcGNfY29uZmlnICp0Y2Zn OworCXN0cnVjdCBkZXZpY2Vfbm9kZSAqY2hpbGQ7CisJaW50IHJldCA9IC1FSU5WQUw7CisKIAl0 Y3BjaS0+Y29udHJvbHNfdmJ1cyA9IHRydWU7IC8qIFhYWCAqLwogCi0JLyogVE9ETzogUG9wdWxh dGUgc3RydWN0IHRjcGNfY29uZmlnIGZyb20gQUNQSS9kZXZpY2UtdHJlZSAqLwotCXRjcGNpLT50 Y3BjLmNvbmZpZyA9ICZ0Y3BjaV90Y3BjX2NvbmZpZzsKKwl0Y3BjaS0+dGNwYy5jb25maWcgPSBk ZXZtX2t6YWxsb2ModGNwY2ktPmRldiwgc2l6ZW9mKCp0Y2ZnKSwKKwkJCQkJICBHRlBfS0VSTkVM KTsKKwlpZiAoIXRjcGNpLT50Y3BjLmNvbmZpZykKKwkJcmV0dXJuIC1FTk9NRU07CisKKwl0Y2Zn ID0gdGNwY2ktPnRjcGMuY29uZmlnOworCisJY2hpbGQgPSBvZl9nZXRfY2hpbGRfYnlfbmFtZSh0 Y3BjaS0+ZGV2LT5vZl9ub2RlLCAiY29ubmVjdG9yIik7CisJaWYgKCFjaGlsZCkgeworCQlkZXZf ZXJyKHRjcGNpLT5kZXYsICJmYWlsZWQgdG8gZ2V0IGNvbm5lY3RvciBub2RlLlxuIik7CisJCXJl dHVybiAtRUlOVkFMOworCX0KKworCS8qIEdldCBwb3J0LXR5cGUgKi8KKwlyZXQgPSB0eXBlY19v Zl9nZXRfcG9ydF90eXBlKGNoaWxkKTsKKwlpZiAocmV0IDwgMCkgeworCQlkZXZfZXJyKHRjcGNp LT5kZXYsICJmYWlsZWQgdG8gZ2V0IGNvcnJlY3QgcG9ydCB0eXBlLlxuIik7CisJCXJldHVybiBy ZXQ7CisJfQorCXRjZmctPnR5cGUgPSByZXQ7CisKKwlpZiAodGNmZy0+dHlwZSA9PSBUWVBFQ19Q T1JUX1VGUCkKKwkJZ290byBzaW5rOworCisJdGNmZy0+c3JjX3BkbyA9IGRldm1fa2NhbGxvYyh0 Y3BjaS0+ZGV2LCBQRE9fTUFYX09CSkVDVFMsCisJCQkJICAgICBzaXplb2YoKnRjZmctPnNyY19w ZG8pLCBHRlBfS0VSTkVMKTsKKwlpZiAoIXRjZmctPnNyY19wZG8pCisJCXJldHVybiAtRU5PTUVN OworCisJLyogR2V0IHNvdXJjZSBjYXBhYmlsaXR5ICovCisJcmV0ID0gdGNwbV9vZl9nZXRfc3Jj X2NvbmZpZyhjaGlsZCwgdGNmZyk7CisJaWYgKHJldCA8PSAwKSB7CisJCWRldl9lcnIodGNwY2kt PmRldiwgImZhaWxlZCB0byBnZXQgc291cmNlIHBkbyAlZFxuIiwgcmV0KTsKKwkJcmV0dXJuIC1F SU5WQUw7CisJfQorCisJaWYgKHRjZmctPnR5cGUgPT0gVFlQRUNfUE9SVF9ERlApCisJCXJldHVy biAwOworCisJLyogR2V0IHRoZSBwcmVmZXJyZWQgcG93ZXIgcm9sZSBmb3IgZHJwICovCisJcmV0 ID0gdHlwZWNfb2ZfZ2V0X3ByZWZlcnJlZF9yb2xlKGNoaWxkKTsKKwlpZiAocmV0IDwgMCkgewor CQlkZXZfZXJyKHRjcGNpLT5kZXYsICJmYWlsZWQgdG8gZ2V0IGNvcnJlY3QgcHJlZmVycmVkIHJv bGUuXG4iKTsKKwkJcmV0dXJuIHJldDsKKwl9CisJdGNmZy0+ZGVmYXVsdF9yb2xlID0gcmV0Owor c2luazoKKwl0Y2ZnLT5zbmtfcGRvID0gZGV2bV9rY2FsbG9jKHRjcGNpLT5kZXYsIFBET19NQVhf T0JKRUNUUywKKwkJCQkgICAgIHNpemVvZigqdGNmZy0+c25rX3BkbyksIEdGUF9LRVJORUwpOwor CWlmICghdGNmZy0+c25rX3BkbykKKwkJcmV0dXJuIC1FTk9NRU07CisKKwkvKiBHZXQgcG93ZXIg c2luayBjb25maWcgKi8KKwlyZXQgPSB0Y3BtX29mX2dldF9zbmtfY29uZmlnKGNoaWxkLCB0Y2Zn KTsKKwlpZiAocmV0IDwgMCkgeworCQlkZXZfZXJyKHRjcGNpLT5kZXYsICJmYWlsZWQgdG8gZ2V0 IHNpbmsgY29uZmlncyAlZFxuIiwgcmV0KTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQogCiAJcmV0 dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L3VzYi90Y3BtLmggYi9pbmNsdWRl L2xpbnV4L3VzYi90Y3BtLmgKaW5kZXggOTYyZWZmMS4uOGU5ZWRiNCAxMDA2NDQKLS0tIGEvaW5j bHVkZS9saW51eC91c2IvdGNwbS5oCisrKyBiL2luY2x1ZGUvbGludXgvdXNiL3RjcG0uaApAQCAt NzYsMTAgKzc2LDEwIEBAIGVudW0gdGNwbV90cmFuc21pdF90eXBlIHsKICAqIEBhbHRfbW9kZXM6 CUxpc3Qgb2Ygc3VwcG9ydGVkIGFsdGVybmF0ZSBtb2RlcwogICovCiBzdHJ1Y3QgdGNwY19jb25m aWcgewotCWNvbnN0IHUzMiAqc3JjX3BkbzsKKwl1MzIgKnNyY19wZG87CiAJdW5zaWduZWQgaW50 IG5yX3NyY19wZG87CiAKLQljb25zdCB1MzIgKnNua19wZG87CisJdTMyICpzbmtfcGRvOwogCXVu c2lnbmVkIGludCBucl9zbmtfcGRvOwogCiAJY29uc3QgdTMyICpzbmtfdmRvOwpAQCAtMTU0LDcg KzE1NCw3IEBAIHN0cnVjdCB0Y3BjX211eF9kZXYgewogICogQG11eDoJUG9pbnRlciB0byBtdWx0 aXBsZXhlciBkYXRhCiAgKi8KIHN0cnVjdCB0Y3BjX2RldiB7Ci0JY29uc3Qgc3RydWN0IHRjcGNf Y29uZmlnICpjb25maWc7CisJc3RydWN0IHRjcGNfY29uZmlnICpjb25maWc7CiAKIAlpbnQgKCpp bml0KShzdHJ1Y3QgdGNwY19kZXYgKmRldik7CiAJaW50ICgqZ2V0X3ZidXMpKHN0cnVjdCB0Y3Bj X2RldiAqZGV2KTsK