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: [v6,10/13] usb: dwc3: Registering a role switch in the DRD code. From: Yu Chen Message-Id: <20190420064019.57522-11-chenyu56@huawei.com> Date: Sat, 20 Apr 2019 14:40:16 +0800 To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Yu Chen , Jun Li , Valentin Schneider , Felipe Balbi , Greg Kroah-Hartman , Heikki Krogerus List-ID: VGhlIFR5cGUtQyBkcml2ZXJzIHVzZSBVU0Igcm9sZSBzd2l0Y2ggQVBJIHRvIGluZm9ybSB0aGUK c3lzdGVtIGFib3V0IHRoZSBuZWdvdGlhdGVkIGRhdGEgcm9sZSwgc28gcmVnaXN0ZXJpbmcgYSBy b2xlCnN3aXRjaCBpbiB0aGUgRFJEIGNvZGUgaW4gb3JkZXIgdG8gc3VwcG9ydCBwbGF0Zm9ybXMg d2l0aApVU0IgVHlwZS1DIGNvbm5lY3RvcnMuCgpDYzogSnVuIExpIDxsaWp1bi5rZXJuZWxAZ21h aWwuY29tPgpDYzogVmFsZW50aW4gU2NobmVpZGVyIDx2YWxlbnRpbi5zY2huZWlkZXJAYXJtLmNv bT4KQ2M6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgpDYzogRmVsaXBlIEJh bGJpIDxiYWxiaUBrZXJuZWwub3JnPgpDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGlu dXhmb3VuZGF0aW9uLm9yZz4KQ2M6IEhlaWtraSBLcm9nZXJ1cyA8aGVpa2tpLmtyb2dlcnVzQGxp bnV4LmludGVsLmNvbT4KU3VnZ2VzdGVkLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9n ZXJ1c0BsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFl1IENoZW4gPGNoZW55dTU2QGh1 YXdlaS5jb20+Ci0tLQp2MjoKKiBBc3NpZ24gZndub2RlIGluIGR3YzNfcm9sZV9zd2l0Y2guCnYz OgoqIEFkZCBkZWZhdWx0IG1vZGUgcHJvcGVydHkgZm9yIHVzYiByb2xlIHN3aXRjaC4KKiBBZGQg c2VsZWN0IFVTQl9ST0xFX1NXSVRDSCBmb3IgVVNCX0RXQzNfRFVBTF9ST0xFIGluIEtjb25maWcu CiogRG8gdXNiX3JvbGVfc3dpdGNoX3JlZ2lzdGVyIG9ubHkgaWYgcHJvcGVydHkgInVzYi1yb2xl LXN3aXRjaCIKKiBwcmVzZW50Lgp2NDoKKiBBZGQgZGVzY3JpcHRpb24gZm9yICdyb2xlX3N3JyBh bmQgJ3JvbGVfc3dpdGNoX2RlZmF1bHRfbW9kZScuCnY1OgoqIEluaXQgZHdjMyBtb2RlIGZvciB1 c2Jfcm9sZV9zd2l0Y2ggYnJhbmNoLgp2NjoKKiBGb2xkIGEgZml4IG9mIGR3YzNfdXNiX3JvbGVf c3dpdGNoX2dldCBpbiBmcm9tIEpvaG4gU3R1bHR6CiAgPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+ Ci0tLQotLS0KIGRyaXZlcnMvdXNiL2R3YzMvS2NvbmZpZyB8ICAxICsKIGRyaXZlcnMvdXNiL2R3 YzMvY29yZS5oICB8ICA2ICsrKysKIGRyaXZlcnMvdXNiL2R3YzMvZHJkLmMgICB8IDc4ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMyBmaWxlcyBjaGFu Z2VkLCA4NCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy91c2IvZHdjMy9LY29uZmlnIGIvZHJpdmVycy91c2IvZHdjMy9LY29uZmlnCmluZGV4IDJiMTQ5 NDQ2MGQwYy4uNjYxYjFkMmVmYzhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9kd2MzL0tjb25m aWcKKysrIGIvZHJpdmVycy91c2IvZHdjMy9LY29uZmlnCkBAIC00NCw2ICs0NCw3IEBAIGNvbmZp ZyBVU0JfRFdDM19EVUFMX1JPTEUKIAlib29sICJEdWFsIFJvbGUgbW9kZSIKIAlkZXBlbmRzIG9u ICgoVVNCPXkgfHwgVVNCPVVTQl9EV0MzKSAmJiAoVVNCX0dBREdFVD15IHx8IFVTQl9HQURHRVQ9 VVNCX0RXQzMpKQogCWRlcGVuZHMgb24gKEVYVENPTj15IHx8IEVYVENPTj1VU0JfRFdDMykKKwlz ZWxlY3QgVVNCX1JPTEVfU1dJVENICiAJaGVscAogCSAgVGhpcyBpcyB0aGUgZGVmYXVsdCBtb2Rl IG9mIHdvcmtpbmcgb2YgRFdDMyBjb250cm9sbGVyIHdoZXJlCiAJICBib3RoIGhvc3QgYW5kIGdh ZGdldCBmZWF0dXJlcyBhcmUgZW5hYmxlZC4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2R3YzMv Y29yZS5oIGIvZHJpdmVycy91c2IvZHdjMy9jb3JlLmgKaW5kZXggNmEwNTBkNjYzZWM3Li5lNmQ0 MGY3OWZhYTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2R3YzMvY29yZS5oCisrKyBiL2RyaXZl cnMvdXNiL2R3YzMvY29yZS5oCkBAIC0yNSw2ICsyNSw3IEBACiAjaW5jbHVkZSA8bGludXgvdXNi L2NoOS5oPgogI2luY2x1ZGUgPGxpbnV4L3VzYi9nYWRnZXQuaD4KICNpbmNsdWRlIDxsaW51eC91 c2Ivb3RnLmg+CisjaW5jbHVkZSA8bGludXgvdXNiL3JvbGUuaD4KICNpbmNsdWRlIDxsaW51eC91 bHBpL2ludGVyZmFjZS5oPgogCiAjaW5jbHVkZSA8bGludXgvcGh5L3BoeS5oPgpAQCAtOTU4LDYg Kzk1OSw5IEBAIHN0cnVjdCBkd2MzX3NjcmF0Y2hwYWRfYXJyYXkgewogICogQGhzcGh5X21vZGU6 IFVUTUkgcGh5IG1vZGUsIG9uZSBvZiBmb2xsb3dpbmc6CiAgKgkJLSBVU0JQSFlfSU5URVJGQUNF X01PREVfVVRNSQogICoJCS0gVVNCUEhZX0lOVEVSRkFDRV9NT0RFX1VUTUlXCisgKiByb2xlX3N3 OiB1c2Jfcm9sZV9zd2l0Y2ggaGFuZGxlCisgKiByb2xlX3N3aXRjaF9kZWZhdWx0X21vZGU6IGRl ZmF1bHQgb3BlcmF0aW9uIG1vZGUgb2YgY29udHJvbGxlciB3aGlsZQorICoJCQl1c2Igcm9sZSBp cyBVU0JfUk9MRV9OT05FLgogICogQHVzYjJfcGh5OiBwb2ludGVyIHRvIFVTQjIgUEhZCiAgKiBA dXNiM19waHk6IHBvaW50ZXIgdG8gVVNCMyBQSFkKICAqIEB1c2IyX2dlbmVyaWNfcGh5OiBwb2lu dGVyIHRvIFVTQjIgUEhZCkBAIC0xMDkxLDYgKzEwOTUsOCBAQCBzdHJ1Y3QgZHdjMyB7CiAJc3Ry dWN0IGV4dGNvbl9kZXYJKmVkZXY7CiAJc3RydWN0IG5vdGlmaWVyX2Jsb2NrCWVkZXZfbmI7CiAJ ZW51bSB1c2JfcGh5X2ludGVyZmFjZQloc3BoeV9tb2RlOworCXN0cnVjdCB1c2Jfcm9sZV9zd2l0 Y2gJKnJvbGVfc3c7CisJZW51bSB1c2JfZHJfbW9kZQlyb2xlX3N3aXRjaF9kZWZhdWx0X21vZGU7 CiAKIAl1MzIJCQlmbGFkajsKIAl1MzIJCQlpcnFfZ2FkZ2V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy91c2IvZHdjMy9kcmQuYyBiL2RyaXZlcnMvdXNiL2R3YzMvZHJkLmMKaW5kZXggNzI2MTAwZDFh YzBkLi40ZWYzZGQ5YWFlNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2R3YzMvZHJkLmMKKysr IGIvZHJpdmVycy91c2IvZHdjMy9kcmQuYwpAQCAtNDc5LDYgKzQ3OSw1OCBAQCBzdGF0aWMgc3Ry dWN0IGV4dGNvbl9kZXYgKmR3YzNfZ2V0X2V4dGNvbihzdHJ1Y3QgZHdjMyAqZHdjKQogCXJldHVy biBlZGV2OwogfQogCitzdGF0aWMgaW50IGR3YzNfdXNiX3JvbGVfc3dpdGNoX3NldChzdHJ1Y3Qg ZGV2aWNlICpkZXYsIGVudW0gdXNiX3JvbGUgcm9sZSkKK3sKKwlzdHJ1Y3QgZHdjMyAqZHdjID0g ZGV2X2dldF9kcnZkYXRhKGRldik7CisJdTMyIG1vZGU7CisKKwlzd2l0Y2ggKHJvbGUpIHsKKwlj YXNlIFVTQl9ST0xFX0hPU1Q6CisJCW1vZGUgPSBEV0MzX0dDVExfUFJUQ0FQX0hPU1Q7CisJCWJy ZWFrOworCWNhc2UgVVNCX1JPTEVfREVWSUNFOgorCQltb2RlID0gRFdDM19HQ1RMX1BSVENBUF9E RVZJQ0U7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCWlmIChkd2MtPnJvbGVfc3dpdGNoX2RlZmF1 bHRfbW9kZSA9PSBVU0JfRFJfTU9ERV9IT1NUKQorCQkJbW9kZSA9IERXQzNfR0NUTF9QUlRDQVBf SE9TVDsKKwkJZWxzZQorCQkJbW9kZSA9IERXQzNfR0NUTF9QUlRDQVBfREVWSUNFOworCQlicmVh azsKKwl9CisKKwlkd2MzX3NldF9tb2RlKGR3YywgbW9kZSk7CisJcmV0dXJuIDA7Cit9CisKK3N0 YXRpYyBlbnVtIHVzYl9yb2xlIGR3YzNfdXNiX3JvbGVfc3dpdGNoX2dldChzdHJ1Y3QgZGV2aWNl ICpkZXYpCit7CisJc3RydWN0IGR3YzMgKmR3YyA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOworCXVu c2lnbmVkIGxvbmcgZmxhZ3M7CisJZW51bSB1c2Jfcm9sZSByb2xlOworCisJc3Bpbl9sb2NrX2ly cXNhdmUoJmR3Yy0+bG9jaywgZmxhZ3MpOworCXN3aXRjaCAoZHdjLT5jdXJyZW50X2RyX3JvbGUp IHsKKwljYXNlIERXQzNfR0NUTF9QUlRDQVBfSE9TVDoKKwkJcm9sZSA9IFVTQl9ST0xFX0hPU1Q7 CisJCWJyZWFrOworCWNhc2UgRFdDM19HQ1RMX1BSVENBUF9ERVZJQ0U6CisJCXJvbGUgPSBVU0Jf Uk9MRV9ERVZJQ0U7CisJCWJyZWFrOworCWNhc2UgRFdDM19HQ1RMX1BSVENBUF9PVEc6CisJCXJv bGUgPSBkd2MtPmN1cnJlbnRfb3RnX3JvbGU7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCWlmIChk d2MtPnJvbGVfc3dpdGNoX2RlZmF1bHRfbW9kZSA9PSBVU0JfRFJfTU9ERV9IT1NUKQorCQkJcm9s ZSA9IFVTQl9ST0xFX0hPU1Q7CisJCWVsc2UKKwkJCXJvbGUgPSBVU0JfUk9MRV9ERVZJQ0U7CisJ CWJyZWFrOworCX0KKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkd2MtPmxvY2ssIGZsYWdzKTsK KwlyZXR1cm4gcm9sZTsKK30KKwogaW50IGR3YzNfZHJkX2luaXQoc3RydWN0IGR3YzMgKmR3YykK IHsKIAlpbnQgcmV0LCBpcnE7CkBAIC00ODcsNyArNTM5LDI4IEBAIGludCBkd2MzX2RyZF9pbml0 KHN0cnVjdCBkd2MzICpkd2MpCiAJaWYgKElTX0VSUihkd2MtPmVkZXYpKQogCQlyZXR1cm4gUFRS X0VSUihkd2MtPmVkZXYpOwogCi0JaWYgKGR3Yy0+ZWRldikgeworCWlmIChkZXZpY2VfcHJvcGVy dHlfcmVhZF9ib29sKGR3Yy0+ZGV2LCAidXNiLXJvbGUtc3dpdGNoIikpIHsKKwkJc3RydWN0IHVz Yl9yb2xlX3N3aXRjaF9kZXNjIGR3YzNfcm9sZV9zd2l0Y2ggPSB7MH07CisJCXUzMiBtb2RlOwor CisJCWlmIChkZXZpY2VfcHJvcGVydHlfcmVhZF9ib29sKGR3Yy0+ZGV2LAorCQkJCSJyb2xlLXN3 aXRjaC1kZWZhdWx0LWhvc3QiKSkgeworCQkJZHdjLT5yb2xlX3N3aXRjaF9kZWZhdWx0X21vZGUg PSBVU0JfRFJfTU9ERV9IT1NUOworCQkJbW9kZSA9IERXQzNfR0NUTF9QUlRDQVBfSE9TVDsKKwkJ fSBlbHNlIHsKKwkJCWR3Yy0+cm9sZV9zd2l0Y2hfZGVmYXVsdF9tb2RlID0gVVNCX0RSX01PREVf UEVSSVBIRVJBTDsKKwkJCW1vZGUgPSBEV0MzX0dDVExfUFJUQ0FQX0RFVklDRTsKKwkJfQorCQlk d2MzX3JvbGVfc3dpdGNoLmZ3bm9kZSA9IGRldl9md25vZGUoZHdjLT5kZXYpOworCQlkd2MzX3Jv bGVfc3dpdGNoLnNldCA9IGR3YzNfdXNiX3JvbGVfc3dpdGNoX3NldDsKKwkJZHdjM19yb2xlX3N3 aXRjaC5nZXQgPSBkd2MzX3VzYl9yb2xlX3N3aXRjaF9nZXQ7CisJCWR3Yy0+cm9sZV9zdyA9IHVz Yl9yb2xlX3N3aXRjaF9yZWdpc3Rlcihkd2MtPmRldiwKKwkJCQkJCQkmZHdjM19yb2xlX3N3aXRj aCk7CisJCWlmIChJU19FUlIoZHdjLT5yb2xlX3N3KSkKKwkJCXJldHVybiBQVFJfRVJSKGR3Yy0+ cm9sZV9zdyk7CisKKwkJZHdjM19zZXRfbW9kZShkd2MsIG1vZGUpOworCX0gZWxzZSBpZiAoZHdj LT5lZGV2KSB7CiAJCWR3Yy0+ZWRldl9uYi5ub3RpZmllcl9jYWxsID0gZHdjM19kcmRfbm90aWZp ZXI7CiAJCXJldCA9IGV4dGNvbl9yZWdpc3Rlcl9ub3RpZmllcihkd2MtPmVkZXYsIEVYVENPTl9V U0JfSE9TVCwKIAkJCQkJICAgICAgICZkd2MtPmVkZXZfbmIpOwpAQCAtNTM0LDYgKzYwNyw5IEBA IHZvaWQgZHdjM19kcmRfZXhpdChzdHJ1Y3QgZHdjMyAqZHdjKQogewogCXVuc2lnbmVkIGxvbmcg ZmxhZ3M7CiAKKwlpZiAoZHdjLT5yb2xlX3N3KQorCQl1c2Jfcm9sZV9zd2l0Y2hfdW5yZWdpc3Rl cihkd2MtPnJvbGVfc3cpOworCiAJaWYgKGR3Yy0+ZWRldikKIAkJZXh0Y29uX3VucmVnaXN0ZXJf bm90aWZpZXIoZHdjLT5lZGV2LCBFWFRDT05fVVNCX0hPU1QsCiAJCQkJCSAgICZkd2MtPmVkZXZf bmIpOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86BE3C282E2 for ; Sat, 20 Apr 2019 06:41:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 531562186A for ; Sat, 20 Apr 2019 06:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728210AbfDTGlf (ORCPT ); Sat, 20 Apr 2019 02:41:35 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:6670 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727975AbfDTGkl (ORCPT ); Sat, 20 Apr 2019 02:40:41 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 6057E6DC528D6C601AE0; Sat, 20 Apr 2019 14:40:39 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.408.0; Sat, 20 Apr 2019 14:40:32 +0800 From: Yu Chen To: , , CC: , , , , , , , , , , , , , , Yu Chen , Jun Li , Valentin Schneider , Felipe Balbi , Greg Kroah-Hartman , Heikki Krogerus Subject: [PATCH v6 10/13] usb: dwc3: Registering a role switch in the DRD code. Date: Sat, 20 Apr 2019 14:40:16 +0800 Message-ID: <20190420064019.57522-11-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190420064019.57522-1-chenyu56@huawei.com> References: <20190420064019.57522-1-chenyu56@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190420064016.vpdqbCKFsEUktMiFQfikWdGkAWTWci8jpM0D1m7mS2Y@z> The Type-C drivers use USB role switch API to inform the system about the negotiated data role, so registering a role switch in the DRD code in order to support platforms with USB Type-C connectors. Cc: Jun Li Cc: Valentin Schneider Cc: John Stultz Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: Heikki Krogerus Suggested-by: Heikki Krogerus Signed-off-by: Yu Chen --- v2: * Assign fwnode in dwc3_role_switch. v3: * Add default mode property for usb role switch. * Add select USB_ROLE_SWITCH for USB_DWC3_DUAL_ROLE in Kconfig. * Do usb_role_switch_register only if property "usb-role-switch" * present. v4: * Add description for 'role_sw' and 'role_switch_default_mode'. v5: * Init dwc3 mode for usb_role_switch branch. v6: * Fold a fix of dwc3_usb_role_switch_get in from John Stultz --- --- drivers/usb/dwc3/Kconfig | 1 + drivers/usb/dwc3/core.h | 6 ++++ drivers/usb/dwc3/drd.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 2b1494460d0c..661b1d2efc8b 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -44,6 +44,7 @@ config USB_DWC3_DUAL_ROLE bool "Dual Role mode" depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3)) depends on (EXTCON=y || EXTCON=USB_DWC3) + select USB_ROLE_SWITCH help This is the default mode of working of DWC3 controller where both host and gadget features are enabled. diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 6a050d663ec7..e6d40f79faa7 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -958,6 +959,9 @@ struct dwc3_scratchpad_array { * @hsphy_mode: UTMI phy mode, one of following: * - USBPHY_INTERFACE_MODE_UTMI * - USBPHY_INTERFACE_MODE_UTMIW + * role_sw: usb_role_switch handle + * role_switch_default_mode: default operation mode of controller while + * usb role is USB_ROLE_NONE. * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY @@ -1091,6 +1095,8 @@ struct dwc3 { struct extcon_dev *edev; struct notifier_block edev_nb; enum usb_phy_interface hsphy_mode; + struct usb_role_switch *role_sw; + enum usb_dr_mode role_switch_default_mode; u32 fladj; u32 irq_gadget; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 726100d1ac0d..4ef3dd9aae66 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -479,6 +479,58 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) return edev; } +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + u32 mode; + + switch (role) { + case USB_ROLE_HOST: + mode = DWC3_GCTL_PRTCAP_HOST; + break; + case USB_ROLE_DEVICE: + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + default: + if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) + mode = DWC3_GCTL_PRTCAP_HOST; + else + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + } + + dwc3_set_mode(dwc, mode); + return 0; +} + +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + unsigned long flags; + enum usb_role role; + + spin_lock_irqsave(&dwc->lock, flags); + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_HOST: + role = USB_ROLE_HOST; + break; + case DWC3_GCTL_PRTCAP_DEVICE: + role = USB_ROLE_DEVICE; + break; + case DWC3_GCTL_PRTCAP_OTG: + role = dwc->current_otg_role; + break; + default: + if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) + role = USB_ROLE_HOST; + else + role = USB_ROLE_DEVICE; + break; + } + spin_unlock_irqrestore(&dwc->lock, flags); + return role; +} + int dwc3_drd_init(struct dwc3 *dwc) { int ret, irq; @@ -487,7 +539,28 @@ int dwc3_drd_init(struct dwc3 *dwc) if (IS_ERR(dwc->edev)) return PTR_ERR(dwc->edev); - if (dwc->edev) { + if (device_property_read_bool(dwc->dev, "usb-role-switch")) { + struct usb_role_switch_desc dwc3_role_switch = {0}; + u32 mode; + + if (device_property_read_bool(dwc->dev, + "role-switch-default-host")) { + dwc->role_switch_default_mode = USB_DR_MODE_HOST; + mode = DWC3_GCTL_PRTCAP_HOST; + } else { + dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL; + mode = DWC3_GCTL_PRTCAP_DEVICE; + } + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); + dwc3_role_switch.set = dwc3_usb_role_switch_set; + dwc3_role_switch.get = dwc3_usb_role_switch_get; + dwc->role_sw = usb_role_switch_register(dwc->dev, + &dwc3_role_switch); + if (IS_ERR(dwc->role_sw)) + return PTR_ERR(dwc->role_sw); + + dwc3_set_mode(dwc, mode); + } else if (dwc->edev) { dwc->edev_nb.notifier_call = dwc3_drd_notifier; ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); @@ -534,6 +607,9 @@ void dwc3_drd_exit(struct dwc3 *dwc) { unsigned long flags; + if (dwc->role_sw) + usb_role_switch_unregister(dwc->role_sw); + if (dwc->edev) extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); -- 2.15.0-rc2