From patchwork Wed Feb 27 06:51:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10831289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C71715AC for ; Wed, 27 Feb 2019 06:51:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7662A2CFA3 for ; Wed, 27 Feb 2019 06:51:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AC262CFBB; Wed, 27 Feb 2019 06:51:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C48B2CFA3 for ; Wed, 27 Feb 2019 06:51:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729446AbfB0Gv4 (ORCPT ); Wed, 27 Feb 2019 01:51:56 -0500 Received: from mail-eopbgr70081.outbound.protection.outlook.com ([40.107.7.81]:60384 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729412AbfB0Gv4 (ORCPT ); Wed, 27 Feb 2019 01:51:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yiUZKMUz1Spk6zagFdbMY9OCtu6VMqEJToNJ27Pu8SI=; b=POzL5aLbduoiKX3jLsM7t9VM4pf3QgqAbPRmrwRlZMlLJmoctO5lgJgLsHoCGyBRrqj7/IzE6TZWKnNPdHUj02Hn3An9YoWjNbvSKzQ40U9frlGvqzJdtX46a8WoXCCc9w5meMaptt63QkyoMb6scU3QZC8KnS0y80Hyc5VjwxU= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB6271.eurprd04.prod.outlook.com (20.179.26.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.15; Wed, 27 Feb 2019 06:51:36 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::790f:a219:bcbd:6fd2]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::790f:a219:bcbd:6fd2%3]) with mapi id 15.20.1643.022; Wed, 27 Feb 2019 06:51:36 +0000 From: Peter Chen To: "gregkh@linuxfoundation.org" CC: "linux-usb@vger.kernel.org" , Paul Kocialkowski , Peter Chen Subject: [PATCH 4/5] usb: chipidea: Grab the (legacy) USB PHY by phandle first Thread-Topic: [PATCH 4/5] usb: chipidea: Grab the (legacy) USB PHY by phandle first Thread-Index: AQHUzmjhRDnCBITnMUSYbLO4wbcMhA== Date: Wed, 27 Feb 2019 06:51:36 +0000 Message-ID: <20190227064908.17731-5-peter.chen@nxp.com> References: <20190227064908.17731-1-peter.chen@nxp.com> In-Reply-To: <20190227064908.17731-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0PR03CA0034.apcprd03.prod.outlook.com (2603:1096:203:2f::22) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 82a377a0-4439-411c-a97c-08d69c80043a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB6271; x-ms-traffictypediagnostic: VI1PR04MB6271: x-microsoft-exchange-diagnostics: =?iso-8859-1?q?1=3BVI1PR04MB6271=3B23=3ApJ?= =?iso-8859-1?q?PVlXJDGwqfOOmRAIKR9g18oI/EX5b+T0rsr31tFgdLTsMSVmgnSq38I2P9E/?= =?iso-8859-1?q?eaki0wMLvs5X0X3hKHIf6ySTx2FNGkn5w8/HeiPK97r6b1vPFBL9a/pwF5pw?= =?iso-8859-1?q?Ri5nYLRIS+M3Cv1CR3h4+JeRANZ18SoWamS8Ul6Cap+/DxNL1zbvpqNMh55a?= =?iso-8859-1?q?or24dhoRgkO3FNRBMlyKgp+K2/oZzKB/sQEUNfbPuQ+Msb94/DuJ23honIYH?= =?iso-8859-1?q?4cfzIPo0SKCQ9aQWzzEKT3VR1BBY91/V73irwBkoOuflorwflw+fq8Dmkj+M?= =?iso-8859-1?q?YDvNmFWz2Vc7feTEjEoyxQ/VsjvLOcBciLrdd7IGAROWiRplxrZPPplgVOhC?= =?iso-8859-1?q?4Il4IwrAkmJIfMxYZcwn71WI/zDyK0zGY5L8ZZ5+DHw3ijOcqcsSH8S/qjAY?= =?iso-8859-1?q?ekwhsw3uRmzRLx6RMjtDLXyEE6kMYPE71eoOoCTgadWmcp9UyVrtgJa0DBSz?= =?iso-8859-1?q?lLitYVUon7P1rxplV8Zm/WNquf3KHfsjwlHTz30z6zKskuSyU7etp9dRx+JO?= =?iso-8859-1?q?sMJMC9dxq2JFik+ioiDazaxDbbZMKzT3jWBip1Nq/Mmx2f4JE6RV2HZWJ79R?= =?iso-8859-1?q?bTKC8Tu13KL/9ToXpIKf/MfB7IAGTma2amdrGh+PvcWbu2f4iWFc7nGZicHC?= =?iso-8859-1?q?4pjGwNVg9/FYVR982fbFssjvpqSua2uEOG13v2ZqtH+Bi3wwSuW0HjosakFt?= =?iso-8859-1?q?Wgz+7XftGhXVtwBwvVPBDCRmnKVKpYXWwWk7z3Klq5sqp5S5gOOe2FKD32+d?= =?iso-8859-1?q?tQInjOvCehD4w68MQgQXJdkOJ0R3mkcX30ihkvSiw448S3VOGJutpLUKOzUB?= =?iso-8859-1?q?wAMtznJQUMxobLX4UWCAXe3EWt1+dPcAZmzlBkgBGbJhfl27sjDslEdZjks8?= =?iso-8859-1?q?Hy/Ui0GzlRDUWZBIq7i2Eu0asH1k3H38cA955XLyxBMy3ngaZXPFKtFwZdqO?= =?iso-8859-1?q?GkZESmfw3nZphxsipa3T80zYfIpPYsJqjTWbF3QilL3hClKBgSxUe7s5DzOz?= =?iso-8859-1?q?PZqSPhSd0ZoRlmoADQ6hMGc2w65pDl5uZS8gE+UkFm/FbqECx0Mp0mYu1d8C?= =?iso-8859-1?q?MntCVQuwsrvUkHwhqlDkx67Ewm1qAK0/TXl0YgxsMsneZLSY8PizzBcsK5EX?= =?iso-8859-1?q?05bpNDR4mBJITUWiHVlW8uQnxIYflawgQrENFhFTUVbCkaazwdm4mTCJ/YX4?= =?iso-8859-1?q?9DM2QzYP+D1jn5BNFbltvaDu3G/j7KRVAe0SY5gQaRh+D5UZmIXHREQ1jyVz?= =?iso-8859-1?q?NkP0SOgfywS1dUqcTwKip/M2VmEZ/U9g+sOa6q3IluUGaC6bSQb1X/9QQzvI?= =?iso-8859-1?q?N6LlxGFOHDUY8W6WI1xDoZ?= x-microsoft-antispam-prvs: x-forefront-prvs: 0961DF5286 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(396003)(366004)(346002)(39860400002)(189003)(199004)(446003)(6486002)(6916009)(478600001)(1076003)(5660300002)(36756003)(2351001)(26005)(6512007)(106356001)(386003)(186003)(6506007)(68736007)(486006)(102836004)(5640700003)(6436002)(44832011)(105586002)(81166006)(81156014)(1730700003)(97736004)(8676002)(14454004)(54906003)(76176011)(53936002)(71200400001)(66066001)(6116002)(71190400001)(3846002)(8936002)(2501003)(2906002)(50226002)(316002)(476003)(2616005)(99286004)(25786009)(256004)(14444005)(52116002)(11346002)(7736002)(86362001)(305945005)(4326008);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB6271;H:VI1PR04MB5327.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 5SGtULq9ZP/LtWM4hSzQU/sWBvXzFB2d8U7Ofv5F5iS8RcL5i6oJrkZ/p64oePW3DVI4HYeX4h4i0T48tqY9ain/iutRdHvXbga6Lx/VHssNQVOkWBi6LscXEjsnEL2q8E9rTpBIKkwKaLjvE3D161yYWmbFTAYZ+tAjsQuJKt18p45QAaF6vkoGJpek3HScSomCYUNB0XNjjfUep1T1DxuDgcHtRjoE9MImgo0F0jRhH/H/xtYfuJoi0tSOrUKg+YQS8b4ROia7ysgIwyvV7V6clrmgsXyNS2NN8RCUtTYauVtTGTKxrsZhqaUAv6RkZdU9bT0BGdSeA7ea57wlm37RnXpluQuWkUyAVEUcz5u4vLQS636uAhGfEGBxfNRuh8zL+poGepsQqQLLNb0z+zRYsyOoTNeU7bEEVPhLhDQ= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82a377a0-4439-411c-a97c-08d69c80043a X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2019 06:51:34.3722 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6271 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paul Kocialkowski According to the chipidea driver bindings, the USB PHY is specified via the "phys" phandle node. However, this only takes effect for USB PHYs that use the common PHY framework. For legacy USB PHYs, a simple lookup based on the USB PHY type is done instead. This does not play out well when more than one USB PHY is registered, since the first registered PHY matching the type will always be returned regardless of what the driver was bound to. Fix this by looking up the PHY based on the "phys" phandle node. Although generic PHYs are rather matched by their "phys-name" and not the "phys" phandle directly, there is no helper for similar lookup on legacy PHYs and it's probably not worth the effort to add it. When no legacy USB PHY is found by phandle, fallback to grabbing any registered USB2 PHY. This ensures backward compatibility if some users were actually relying on this mechanism. Signed-off-by: Paul Kocialkowski Signed-off-by: Peter Chen --- drivers/usb/chipidea/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 7bfcbb23c2a4..016e4004fe9d 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -954,8 +954,15 @@ static int ci_hdrc_probe(struct platform_device *pdev) } else if (ci->platdata->usb_phy) { ci->usb_phy = ci->platdata->usb_phy; } else { + ci->usb_phy = devm_usb_get_phy_by_phandle(dev->parent, "phys", + 0); ci->phy = devm_phy_get(dev->parent, "usb-phy"); - ci->usb_phy = devm_usb_get_phy(dev->parent, USB_PHY_TYPE_USB2); + + /* Fallback to grabbing any registered USB2 PHY */ + if (IS_ERR(ci->usb_phy) && + PTR_ERR(ci->usb_phy) != -EPROBE_DEFER) + ci->usb_phy = devm_usb_get_phy(dev->parent, + USB_PHY_TYPE_USB2); /* if both generic PHY and USB PHY layers aren't enabled */ if (PTR_ERR(ci->phy) == -ENOSYS &&