From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753873AbcITDwu (ORCPT ); Mon, 19 Sep 2016 23:52:50 -0400 Received: from mail-by2nam03on0052.outbound.protection.outlook.com ([104.47.42.52]:31376 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752654AbcITDwr (ORCPT ); Mon, 19 Sep 2016 23:52:47 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Peter Chen To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , Peter Chen Subject: [PATCH v7 5/8] usb: chipidea: let chipidea core device of_node equal's glue layer device of_node Date: Tue, 20 Sep 2016 11:36:44 +0800 Message-ID: <1474342607-27512-6-git-send-email-peter.chen@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474342607-27512-1-git-send-email-peter.chen@nxp.com> References: <1474342607-27512-1-git-send-email-peter.chen@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131188162582782902;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(48376002)(4326007)(68736007)(2906002)(97736004)(8936002)(626004)(76176999)(81166006)(5001770100001)(2201001)(86362001)(104016004)(5660300001)(50466002)(586003)(7846002)(2950100001)(7416002)(50226002)(47776003)(229853001)(77096005)(107886002)(5003940100001)(189998001)(356003)(305945005)(19580405001)(19580395003)(92566002)(50986999)(8666005)(85426001)(81156014)(87936001)(33646002)(106466001)(36756003)(105606002)(8676002)(2171001)(11100500001)(4001430100002)(7059030)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR03MB2442;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD013;1:R8i/oVubRYEg2joubsBPsG8QxTTuEYecdxJRkdjSXH9sBDnefFA6PzKh4RPtfe7pmk03Zyrb1D4/Rsz95uxzBZegYMGe2XYwuTOqyoVIKPoBxVzXLfIONhM9B446tOcqiEEvlhCx5Imb489cOfNHwyegNHy7w+5Vpt+uYkdPDSmBNwtjhyWGTs22iQHvfT6RP2BgeTxrdEsqeApStUVHFhHN8Jg3vi3p5v2McyxXwHP14fK1lJxtMZ7hqrUjU2lziSpOOM39N5AiQucA1cRJUBdeF3T+rS3d/RnXmNs/A7qNqFOdlQVPUtLkBuDxqaGJXLbmVV/y+wuKmzWAZXvnoiWg9u6qXU29L95Smh0iGgkc3M80tSrT9szz0+LUDEJXGq0WK0Xt2z+9/jzqIB1Zu5cGzqlJl8UjywLt/4JJ7nQfNU81D68UNz8EtQ29nke4ZQLMbcEKBjTs6n3wA8/7zW8zGilQHyqu4pJdQo977VgxpWLn1xECU6VTzuI4GqmAdVjMLhGbhN1NH3purUMwkhCPGU6BfV9WiPeShwlE4DjiNN0WV8tA1Kt5gfmeCOpsvfdMdmuAGeXD1YBX6Cis+ssDB/yAwum+BMeh8PkxMnuSYu52nhJEAizebrhutl8DYy0SjmsPHvxZXtks13m9rQIsOCwQvCS1TLW2FNxSGjqpQ0ulWdmB9SfcQEmQgccX7y2k4WgydRTwvykKdPYpAyrqpA1BxkAx4DmMz55Xp6TS+aDTieTu+t+wf6hwVksnDlSrLX29SSYqM7PTJPEUMw== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 81d3ffc6-a9db-4831-4258-08d3e10777f0 X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2442;2:K/J1a/YAZccyDmgBDAZHTyADIKo5FHnM1yF2E4AAqI3DY+PuC5LMht0PhSKIGgXdPqLFZhz+dJFm1dnYxRBNTZAl07W0UV5GIxFMSN8Qg8PPaEMibqr8+/9uGQeUlkouLK0HblDdgNedNI3VvN57vxHlr/RJhDH7RioJ+fjWhtlRNZd6SXc5ParLwjjyXXS+;3:DhYH9uBdcPTrMFaMp+upc8gsK0AKSeb+udIRHcDsH/tPSVVICJOkurWX5g2/YRWtqbiy87XOkxoVI2tFrycrbavqCzMV4djO7uK18w9f68lV9S6Bk79clM5Ob7R+QKM39VUqV7SfKl/mop6RjaIDeXooB7Vv4PKAuRUs+FlBNOBq1fkkW89JQEDSMS6DnIX2YLNUpre2PJai6G/kFgoEJTsh8SGuQoKZDvL0YcLyFbQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR03MB2442; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2442;25:HHsKHWfK9c2pxzKziHVRXGe9g7BAuZDGenEQfIlqXfA3nzBYZ2V93lrUSNn/U5rxw85fC2KRcB2Ae5LKQPhpYczMCoju5jEYMN2s7fc7NvSRMW+YX2XAg7uSniSsGHzkDttH0G/rjChJKOINInva9yI+Z2ASTl1vTzFsvc2XYOJ0JGA15muGagxTHXNskZ4TrEsED73HcBGnZyrJXK+RNBBQjMI4aSYGCA2w6foMHyt6BxT1GQaBrZIjG/ZqpmNcM6zqiZ92gl2RdOzWqCOZAYnEq0c8nx0KjkNdCUZWQC4Gmpqh3V/8HiUFxqyivrWpOZHCZokn1R7iok6aH2Bcz6uxteu9R0M5aMEIAiBg3xsQn8wnR9MLecDGSaxhHXU6VBWjCqa+1qmJZAUyi4sHQS08haz/W+Iy0uN9pjSLdKKD6w0kTuIJuKsKpOR3IjbzaNHods+mcQYK4lciEAK1BbCsdFQKuwUnTmDkS0izwuzSZwJ3mDWVT8jxn0sLLgZb4E2BkUZqo5sXJ8q/40A4nSM8Dhp9/JJQQ6v3PJxBJFrHxD4F9UEQRfVuy1gy8vdP1zdRuBJ9w0tN4QYpf1EoEJv7OAFK21xDhn6qEPNwfjk2ead0jAyBvju2BbI3Oz43t+hxIBbmZZuKyAzv5OA0LqHOMXzfrlKstwRLoh8LX1ErPLH4isWbdUqP9PAOXAyU3gj+QKbgDJJKHwkMxAMDmRAwsLNIPD2bXnKCAbFxwNQ= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2442;31:mBE6GtXvVD5z49ETRJPaBPvUoo48fpj1ZAKpbd+ReRha9Tz/uDCSiNuaLzxbIVqlE2a064wT6ammc7WmBSJEe0xBM19GgKHjH0ul2JY+7F1kpc/DCv2tlvfEXHvGlekbW4+jyH/WgZkJJkjQl3Ps0xK40ArSHoVRfmDnJmIX/JZ60dx85n9emkwueWMxN1Hjnsf5ky31MPCkKYGypuj0Vec6sMT/98qMEwun/lyG40o=;4:0fudcqmFLlsP1nLUFytHy4iSwC59cT8ICO+c6Gjv8PIJ1r+aNEWIQ+JZTLMUgHol2mPUgsTpPko8cOGENBcMFndDkSFqkG+U5UP7HV7pf2jezd08Hdzr8sY81E8UUh418Sd+GmGjIrVAd6p69lK74tNZ6zXJE5b8JQPF7ykhs6egr5DUz9DYCemESjNUDdEaMA6lkYDisvecSDKnl4RX8+nwZuqKS986AUmlG3jUHXC0HHmXTDErcjtVQ1Axivu1F+VfihE4TeOPGGpmV7gu+SkbVBQKbHTPCts8EHs/Onlv3U4lTAWGqarcmfek/tkc1AxrKc13VnDBBqJ8C6HlZVnnKP/kOmSCCZPbgfdPvwtc1yqaVn1VOX+27SCLwJ9k2Z4VcdUckQp1yZD9K6HxcJzKMFsp95SvadfVouamvM8BB9eLw1citih6p6fNjk6nCc0g7n2HHSaNf7awLmHv/1v+PkLChtWSQeJgEiuETZzXY2KCNllzwk5KlTOPlt+S1OBEx8NPw9ADlBmLXleLdY/kcTeDMoXMQ5GCKYBAanU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(13015025)(13023025)(13017025)(13024025)(13018025)(5005006)(8121501046)(10201501046)(3002001)(6055026);SRVR:DM5PR03MB2442;BCL:0;PCL:0;RULEID:(400006);SRVR:DM5PR03MB2442; X-Forefront-PRVS: 0071BFA85B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2442;23:2+7FQ0EQFKtTwiCIzz4Q/5OBh2ih6xt/C66ITJfNC?= =?us-ascii?Q?dgQxiFQ4i6gkhaj80TGvup+PbCMg6g278XDlS9CtWOd5X+JFF0ZGiB/lrXX0?= =?us-ascii?Q?66QSoDL8KvevRE5eiGYMa5uDOJ8i/DqIjeOeMu4dOa705dzfO84SdzEqSdkB?= =?us-ascii?Q?R6o3CrtLnOwICPd/rl9mCC5l/OyLRh5ZZSF4yxcH53BVK/O5rDQE6mFIasPb?= =?us-ascii?Q?LjK3l5bSI4c9XPN4xXNWO400vn+ntI58en65msyDD7h313jeTO1C/9gHD7Nx?= =?us-ascii?Q?k+jRzVQEtcCv2yUUsIROLe/8ErIBwB2NDX6gIJ4JOC0mCBflvG1iDUERBbXI?= =?us-ascii?Q?S7LSov7kgMR6PYKT51FtFIzLkpOgct+LUsC0xsOTP6/o/rJC0eyPotwNSDVP?= =?us-ascii?Q?/2XdrrcNCVuvr89C5CYfID/57diwdUT2EeRK7Ai7t3Xjt6gnzTZd5+gwlcKN?= =?us-ascii?Q?SKsXbTySZjVvKTFuMyEpCzWExRPN6DprCUSP+UnNH3TZBtej9KCCP5cZ3agj?= =?us-ascii?Q?HvKcaAv6WQGDoAMq2Brlckt72FWMzj9XWuXdmPWHXoMmA8lWgvLEi0+FqUjc?= =?us-ascii?Q?IPyf1alMOseXysG/BEUukSgOuFOpMX/KpKX5Fl7zdhlr0SwqBEDLZYnsf6k+?= =?us-ascii?Q?nCVn+jtZHFnQb7qOAWLodNVIBXEoJM8VDiUII3Z2kblgJ/I0RpPcU7ycNS2N?= =?us-ascii?Q?b/pNwtDIpiKtNOkMEXl3kFqV5WNeVz/0fL+X4WRw2toQ6EHS8Ir46Biu8I/V?= =?us-ascii?Q?OhRRt6+BxGcCIZh4Cpox2hMmyjl05JM7HEx0Y6TLWIWnELWHOTIA62Sn5KHm?= =?us-ascii?Q?GtkOCstUl4Ie+8KAihz8IqlRY6DLYnnhwN1U1ZPUngbh4FTBVT7yL/w7tcgY?= =?us-ascii?Q?7qTDHsxPJ5YUVCUbhDuj91ws3dECDXJKUzrD5Kc9J2ZryL8no4VqBlxJQ0OU?= =?us-ascii?Q?HzuKzfhBFW6NAUinIeofWv4zPN38h168tJnso6xNO9KwKgN/mye/z06zgQ38?= =?us-ascii?Q?x1yTXHG9LvdB7hch68DzUc8ywun1KGXYOhMWm6w7oF3MgjDsU26H3lPT6L/Y?= =?us-ascii?Q?nk9D8InONduEmWHORQSpGz4VKrbOayPh/IElXIMoS63buHg5E0U5eXtlORzS?= =?us-ascii?Q?Zqt95kaGHqquMrE8VSWnd8n9CpScJfv4qj3g/E6zMg4Rj/mWrtUU51BNrH/S?= =?us-ascii?Q?15R0t60giGtIPON/EVmLLXnE6bkLGJeeOPJhZwB1uifDLMpliBsu/NOiaUdK?= =?us-ascii?Q?3yNdHVDj+nAdwNKXeJPbm9OJZuLrO/gMDY3CPp6L+gNelDRvVbcXMw1KUnLT?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2442;6:5ymvwnAGtcdPrJsedyCOgmzvw5QmdDFf99eooKGT6y2rSwBRJP3lmHU6blrYCc/bJ4sgrJzDSWgtmoJx4guHd16bw2hWz0ZpU7X0AsPOEa082RAenic0WKOCfph72mDIevKEiAI5Up52ozmKKs5HCyOWJaLGkJCinSvaRGivkm/KvvyYZz3IdvffPabSn3jkim3Mjvqz1Epy75G7n20wwCqDTGKQMP2qpi4ULwYoBox5NZjEyw8RFtZz3x/K+UJbgMF1YKoMtHYEnfA73wPG2SnXDsqnXresmySYGeqQhmY=;5:rBkt7ISl2EKklDUfw4vPOk4IWaGsiSRixPmflb/KYx8lEadgywkRbdrRs1oT1jaH1t3DXLX86ejZZLAMOAmbFCq2w6Tiw2r7AFm7hGd+ItVXqhSJOYBPQAIfwAdqWrBYNsn9k8+fMU1cLhTZqg3yT8gRT7VlADxQ9o1pXNlRpzU=;24:qxFlV8ft7Q1GHKA31Brj368aMHGr+WfOsTgNCJ0XGzmpgGHDEFPvKxB9YZYHgbHwbXij/G0YdhosYtWMTY+VuszZS0vfsZ5EsSPwIdzrwkY=;7:W3QZeBdENa+VOUNlqC15jXAhMRbE86ZeoGwF1vKgZ6j26HNO1WmqSaDE/STmR/qCijeQVWPgCGfG/X5dKqf/fQBTKNIED8YIXb7gG/OplttkyEkl8wQqiujy0TdV2MsTCxKfPO6c+jMId69DKD8MmWi1WdiJbnkjg2sZMv8p8lzmOe3+1UHlitS8ia70cJVQgJ98HKDykgg2MzDA0eoS2RBwM7pVYYGr31+/89K/7JquUR7T703kBOHNonm2hHZaOgmrP44nUpa+uO/rMg/IjJRYVtz2cZ9D5eIXP5tBRJ4UtyX2t4f4LQ2qekKt/bJX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2016 03:37:37.9818 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2442 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Chen At device tree, we have no device node for chipidea core, the glue layer's node is the parent node for host and udc device. But in related driver, the parent device is chipidea core. So, in order to let the common driver get parent's node, we let the core's device node equals glue layer device node. Signed-off-by: Peter Chen Tested-by: Maciej S. Szmigiero Tested-by Joshua Clayton --- drivers/usb/chipidea/core.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 69426e6..6839e19 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -927,6 +927,16 @@ static int ci_hdrc_probe(struct platform_device *pdev) return -ENODEV; } + /* + * At device tree, we have no device node for chipidea core, + * the glue layer's node is the parent node for host and udc + * device. But in related driver, the parent device is chipidea + * core. So, in order to let the common driver get parent's node, + * we let the core's device node equals glue layer's node. + */ + if (dev->parent && dev->parent->of_node) + dev->of_node = dev->parent->of_node; + if (ci->platdata->phy) { ci->phy = ci->platdata->phy; } else if (ci->platdata->usb_phy) { @@ -937,11 +947,15 @@ static int ci_hdrc_probe(struct platform_device *pdev) /* if both generic PHY and USB PHY layers aren't enabled */ if (PTR_ERR(ci->phy) == -ENOSYS && - PTR_ERR(ci->usb_phy) == -ENXIO) - return -ENXIO; + PTR_ERR(ci->usb_phy) == -ENXIO) { + ret = -ENXIO; + goto clear_of_node; + } - if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy)) - return -EPROBE_DEFER; + if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy)) { + ret = -EPROBE_DEFER; + goto clear_of_node; + } if (IS_ERR(ci->phy)) ci->phy = NULL; @@ -952,7 +966,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) ret = ci_usb_phy_init(ci); if (ret) { dev_err(dev, "unable to init phy: %d\n", ret); - return ret; + goto clear_of_node; } ci->hw_bank.phys = res->start; @@ -1058,6 +1072,8 @@ stop: ci_role_destroy(ci); deinit_phy: ci_usb_phy_exit(ci); +clear_of_node: + dev->of_node = NULL; return ret; } @@ -1076,6 +1092,7 @@ static int ci_hdrc_remove(struct platform_device *pdev) ci_extcon_unregister(ci); ci_role_destroy(ci); ci_hdrc_enter_lpm(ci, true); + ci->dev->of_node = NULL; ci_usb_phy_exit(ci); return 0; -- 2.7.4