From patchwork Mon Jun 27 12:09:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 9200449 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0CA9260757 for ; Mon, 27 Jun 2016 12:10:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F119A28564 for ; Mon, 27 Jun 2016 12:09:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E50262857C; Mon, 27 Jun 2016 12:09:59 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 7488128564 for ; Mon, 27 Jun 2016 12:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751902AbcF0MJ5 (ORCPT ); Mon, 27 Jun 2016 08:09:57 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:51721 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751860AbcF0MJ4 (ORCPT ); Mon, 27 Jun 2016 08:09:56 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 27 Jun 2016 21:09:54 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 62BBC4CA80; Mon, 27 Jun 2016 21:09:54 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 62D40480A3; Mon, 27 Jun 2016 21:09:54 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 5CC5348014; Mon, 27 Jun 2016 21:09:54 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id XAC21207; Mon, 27 Jun 2016 21:09:54 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="213848382" Received: from mail-hk2apc01lp0212.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.212]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 27 Jun 2016 21:09:53 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ckc9JVtW0xLhsPdfiOxsuZMFV+gwgMtM1Yhjhir+T74=; b=MnsgTjG8zH7RMjA56tIl9F2gCTJAIFUrwrzFec4j2hfIsxN59sc/pUV2omCe2RE2g6Fm6hQNJqx5/yH/G5tRWnFX5bPt1TFBsmMrGp8r99+iYHpa4FJku3LTCQtHQ7WrpWNu8hTMdh++h29IVX4+UHF7xILV6bP2m0BZt3KFUEU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; Received: from localhost (211.11.155.144) by SG2PR06MB0918.apcprd06.prod.outlook.com (10.162.201.158) with Microsoft SMTP Server (TLS) id 15.1.523.12; Mon, 27 Jun 2016 12:09:52 +0000 From: Yoshihiro Shimoda To: , , CC: , , , , Yoshihiro Shimoda Subject: [PATCH 3/3] usb: renesas_usbhs: Use devm_usb_get_phy_by_phandle() Date: Mon, 27 Jun 2016 21:09:19 +0900 Message-ID: <1467029359-6812-4-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1467029359-6812-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1467029359-6812-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0019.apcprd06.prod.outlook.com (10.164.91.29) To SG2PR06MB0918.apcprd06.prod.outlook.com (10.162.201.158) X-MS-Office365-Filtering-Correlation-Id: f9e6a5e6-1d89-4e86-e835-08d39e83f1c4 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 2:2sr+lYpGzWWK14KRx7jbaDKfchf8GCrmfVB0YnhcNf+odvZdnC7wryWC5Lf3QhAkfLms2TemzkS1nb2mgqE4v3553Oqxj1MwG25iypOD1xjn9Ny5hHRndUIZZVRCRfHsFsOGqjxctFEO6WZYkM6sshQ6INnZ6/lh2tm2hHuY0XGW/4F9JpG1llQ22uo4x7Uw; 3:dDA7IGGLR0QONk79g4kdIdr9L40MXFtq7zDWgaSMoJ9RjlYILImlF+qlHnWKJIUbeVtK0wlRz3vgFgyARjdR3r1c45xsfAMbtao+kAiVGNApoq6I8Wp7odOQf8cAMAuI X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB0918; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 25:Pjmbg/6VSXgS0DPiX8IxGXatAnpzOtOALg+al8TQhfZoRi9Ubit30/OMXltVsYSxiH4HbO+h43tLho1M9W12AY9Og0LaLKnKOPN0Tyffowj5Qe0hWlLQh68cwdjtJFZrAIS42hqMSml/Snl3RIzVk+tuyIsSZOCn0bCiWWh0I+TkceaNOehXKzyhz/bzYwDe6we2qTvFebDxMq7nmtFNXIMzaBk3TuGfaUXI6dbyTSqUNVdsYwMHOxehs9y9DRjxJ56MVBSq85qb4j4hKg5l4VXcg9xOVRHOhOgEQi3tZgnsePs+TEKnmwYFRMpDPWFBTFGtSYA9NcBDL+Nqg4hOXWr+xOeT5ignIb1pyJgjIbHdt9MKnBO7USCvKlrXVr1+pW24sbWhw5zVq9ISyci7HUSEv3sO0xEbTzyRMYOipHshjMmc897PMXevjWoK/s7m8B4dbsYE+SGSSlTw+Pv2Dgvv/lox3hBm7foLd7WPBKQnWd+rghx6bSJJ0F2KYElvRWfbO7lw4apiy+pae8YxmGM5O/G3GYoiLuTkPD91B1KPRy7a1d7NNfUEJXWgt9TG5FzdeAav+EjqrTUVCNR9x/b041f1hjoD+VN/7/SjDtQx1x8ae5Ye9cr2LTEDBJiJf5CFq5nVoM0FgXwCJ1Jpt5Z5yv0MOVpdBNp5H4X0Qz5OGstnc8CC/28iBodVp4JVSB4SUO+yq7NuGYLzf4WGq9nvv94gOORJ8TTRnRMU+Dt5y9AovWoQ3WfdkA20b7Hu X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 20:+i6Tm9/dYu2DE4UwRNXnmIJBcNel952RpX1WK53ZJhuio6FmSt0cPhm3FBSxGMedjS5T4oHQkYEimQgU9LDnImlwYNxrWXq24yZHnmOTMgtX/F5HMxqh3YEQl+uACAl8e/uljQqeZarMAC53NlOf1htA4ukS0e1RgvPLDfdFyiuP7o1DR0L38txExnPKzPTUFmY4gWB99yV4TL5jfqO3KLEbXu9RmgvkvBYFfP26KV0sub5rVu8CdMcDJlkRPTndUNQ+MxZ8k3kAuQrVVKbYlh/qVkDLMAJDmLgLMp5lhXt4qNcMbufZPyDoFTf34K70jgA+OSqulD+fAbLN1yGTqpeOFb8bqKFypAaojQ9n8cKxvLP7hQg6FhjQtMptpgVyHy1RowMAFuTcTd79XGh7n9sihzkT1MA+ah8et5K1PxFvYi7VoF8GbM2AMFrvgqjAJTPFmKMyQ/GTxcVUkUkBjBXU5Q5iU7GIDM45xXpaYZG90KOfZ7xF3DWvXiOhsHIW; 4:O5xe0MXKnFg1dzpbZxFomaIdNElCc9SN0/zhKko2U6ygm+fk7u8TyKv1SbSIaxUKu2iLU/U9k2pZvkMPvtVw2byPLlJMcGahuiojssxxPtqbCiMpXrcRSzlqy5RNQvuLCtBcubLLMZDxGSx1Yy/ufk5axDSEx0UT5QhlaT6WrtoNE25+3UvdA+K1v+vrgxmm0zhG4/lZM8TZJhcWBE7ahMjL5tovRA4Nn87suduNZpjnTTu23HV/vb1qLP6VT+RDDP89cBEAKcez3VAVVhdBGcnPhvHVRVknqbhVz6rDu444VtdEdGC9vo5WTRqrZwjym2yevzPbv97WyPBOY2Se/AH4X3SzDmx7CiiiPK4h63rZ8TCNNdfMES/DCagYIZXRWzMQmsd6Vu/e60Da7UcknQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:SG2PR06MB0918; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0918; X-Forefront-PRVS: 09860C2161 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(189998001)(229853001)(81156014)(42186005)(81166006)(2950100001)(8676002)(19580405001)(19580395003)(7736002)(68736007)(305945005)(76506005)(76176999)(106356001)(2906002)(50986999)(4001430100002)(5001770100001)(50466002)(47776003)(4326007)(105586002)(101416001)(92566002)(7846002)(36756003)(66066001)(48376002)(78352004)(97736004)(6116002)(3846002)(33646002)(5003940100001)(107886002)(77096005)(50226002)(586003); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0918; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:0; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0918; 23:J/963geEJbne5aSSEvQM15CClqCa8gb+2fgEK1I7b?= =?us-ascii?Q?Babw8JPFtHZdbBKBvS1F53Xfp3SyRhGzc/qVwD+9MG1Qywx4I7ZNm2eHbT18?= =?us-ascii?Q?MiOR3UAagmp98hnI8XrwUsDkpaTclVroy5oavBhFu4faJpSVEL3YQcga0r1p?= =?us-ascii?Q?krByuXpSnadcxsxvAmWXFHjcTDK/j9h0OBeVNj2CkqEg0DbMFmzh/XAOoaS8?= =?us-ascii?Q?G/r/Q9gbzd64DMDUI2M8trcgP9QsPXBNGBH4NjU2bhAokfIvHFXR1tAF05KQ?= =?us-ascii?Q?mISEZ39SXO5sRl5Sd03OKZIsct7kpnD/i0WVxFKTN3CMZ5gcXIABIvBsHYXP?= =?us-ascii?Q?zCrWygRgqHZDbiKvJFCLz+15b/UEoe0wC6MyzXWI0Z06lShxn0GI89vVDwuf?= =?us-ascii?Q?9+yFPtFTUgt+db+UbxGQ7s/6VrsZGzWmb3lZmyycNVRuDW4DGyxBm1Na8EIw?= =?us-ascii?Q?FYpEKr87SYlAY27QB1Q0YdZ5QZhLYsPXrtwKLRwlNSAS1H/HMi3nJ42vQpV5?= =?us-ascii?Q?cX4C3qXQaRFulM7zj9zzZf1TDdvPMjIdG5IkSuEZkv2o3Rg9OEIcReUYUEFv?= =?us-ascii?Q?6conBPDPN7qH8AJEmX/Nrz+g8itkCSvmOWyETanMCI8EcUr4Ht2eehcZQiP3?= =?us-ascii?Q?MA5EYX/Ks9CDUDnXYMqxEvueJyqk4EPTP+w00WYlZNqmHlW7uybWVgZKs709?= =?us-ascii?Q?sg+10Tsv10T54I4OPMUgHAuiUD4HKYX/E9acxIz89+v1o+oGTe7ULy9lmWp0?= =?us-ascii?Q?t3Bax40w98pRVtZrjck30yS6668z8Dd4hojw36FSZHz9dl8OmxNfaA3rVK+X?= =?us-ascii?Q?lPi8YsHhFPln1JVySS6p5iX1l5ZuxkzsGwNg/AokBZ6DZ99NCXwbX2sG+hQp?= =?us-ascii?Q?0DTApGhsjJDcB6FwgU0eDTOl4b1jLGdvNvSHIPZPCvYU80Gtm8K2DnWvlHyX?= =?us-ascii?Q?LT3+BjvnZrVJs/C+N0DK9TXcjxOGvwFpYx/brRUOdvOvq64uhebL1VVPU5BV?= =?us-ascii?Q?2Hzwcb7dgabM6HiKTviRaO1bk87K9i98qr9+9jYW/IoYLP+/lLHyWFdqamvy?= =?us-ascii?Q?he/YYgy66HOtBvFdQ13NiiCLR7iFZeUg+yYsLp96dpZnqFnNTn/7mDX1q59H?= =?us-ascii?Q?fWmeQWG6V1FWHgapqmTOyH0E4Of10LMZBHOH928WJT2wzphynxWLQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 6:sKjK8PPQK+SoS6+9QA7oUZsaRYbVNcIaMN7eofJ8eFR4EgusGdRyTxHKVQANjA5rajQ6mXuGDT8jq+NsQhKyBys7/95isqi9h9kvNiW6qf+MtXTj6GyGWenP3uD70eMSS8mhEe5lFEJlj0Z1/b7VRplr24Du/t2pRvV6kKt9SLiwrMJAID+luRHrQwcoqimWxfL2+F257ojWTEf976/ajWrqcht/4+90YpwyoLhMhz1t79hgYdyk+RxdYe3fPbeWAeLuOmJLqRkvRQzJSG2gGLUSa4aes7VKyMZKnmL8YuVZjmdOOaCovcHS/D9XJhs+09QOULzz9tYzRZgCGoVS9yeNKW4CrvDhAFK7g+OeCCc=; 5:hyz1RN3uTPlXqIj5f4iQ8MohwLzqoWd2F10vt3c7DCet1Vx701aXJGNq4iuf88+zm5FIoPyqys55uC/G13FbT18ArpAEmi1AMFcYbshYEX8usjBsolFwHIMiiW1OQjaMlpY1PS98sft4iqbm460moQ==; 24:9nJ5O0t8w4fhnBkj3GwjS/H9wE1dA9O24zxJp0Oq3CmQNsAHY6gmrzJ6u7nEHftipnfPqYcyMGXGmx864DDRynH5UVDuk1xaxjVK+4p2HNw=; 7:qvUJhQw3D+WSM8ueGebmwLS876qx7qPr5zJGFd3fQ/JPLwEU08BFKkZ6LaDdAicuzUMMim4KUtTdvzOzLrBXDBTc2cELPdwtEj+PkoX8x/uTVG5dlL5bT91740dnZ0rorGFwVh2eBV8NoT5HXtQ3P3hBVUvzZuXOFdONLSEqDuoyKcoPfKsaYujo5HJk3MsgC4c4lNLLGAGXpzlUiNkLdActsHhLIa7UF1zJZu1MTIfXtkSBq/dSI8wAlWudu2I8FkbnmnVehqAwhh+PmVQqag== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 20:PiR4rqqGLX5pvGVJBZV+LOAlgQXuLVNf7ul5gE5Lzx5qocGx9CNvA7dopEv5f659JeKN7oVCXNwkH3+e5/kHMh93P744pc8/4FDPfIaiexE8VTIOZW3e3NqX6Yx/P7CsavlMxrU9SWhnpGg5w5NK/hg12SegaT5SHqi2PoxH9aY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2016 12:09:52.0417 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0918 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch uses devm_usb_get_phy_by_phandle() instead of usb_get_phy() for device tree environment. This change is not compabile with the previous code, but it is no problem because nobody calls usb_bind_phy() for this driver now. Signed-off-by: Yoshihiro Shimoda --- Documentation/devicetree/bindings/usb/renesas_usbhs.txt | 3 ++- drivers/usb/renesas_usbhs/mod_gadget.c | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt index b604056..a419aea 100644 --- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt +++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt @@ -24,8 +24,9 @@ Optional properties: - renesas,buswait: Integer to use BUSWAIT register - renesas,enable-gpio: A gpio specifier to check GPIO determining if USB function should be enabled - - phys: phandle + phy specifier pair + - phys: phandle of *Generic PHY* + phy specifier pair - phy-names: must be "usb" + - usb-phy: phandle of usb phy - dmas: Must contain a list of references to DMA specifiers. - dma-names : named "ch%d", where %d is the channel number ranging from zero to the number of channels (DnFIFOs) minus one. diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c index 6e60297..ba1da69 100644 --- a/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/drivers/usb/renesas_usbhs/mod_gadget.c @@ -1071,7 +1071,12 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv) goto usbhs_mod_gadget_probe_err_gpriv; } - gpriv->transceiver = usb_get_phy(USB_PHY_TYPE_UNDEFINED); + gpriv->transceiver = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); + if (PTR_ERR(gpriv->transceiver) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto err_add_udc; + } + dev_info(dev, "%stransceiver found\n", !IS_ERR_OR_NULL(gpriv->transceiver) ? "" : "no ");