From patchwork Tue Nov 27 06:19:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Durga Prasad Paladugu X-Patchwork-Id: 1003616 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="XdBBhwVv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 433ttM3pf7z9s29 for ; Tue, 27 Nov 2018 17:19:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DF2DFC21FD2; Tue, 27 Nov 2018 06:19:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 60C1AC21E3E; Tue, 27 Nov 2018 06:19:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 88BFAC21E3E; Tue, 27 Nov 2018 06:19:42 +0000 (UTC) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790083.outbound.protection.outlook.com [40.107.79.83]) by lists.denx.de (Postfix) with ESMTPS id C6B80C21E3A for ; Tue, 27 Nov 2018 06:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KzBiTsIWfZ46WMeAog5DE2gq+IHLRb0nvyZoPcYvLIk=; b=XdBBhwVvE7aFyEmvYMatd9EqR88SeCuixKeCV3w1phvMIQZTGOajNIGU6wSJMSdFMILamKqPTjQYV07rM5Ifz+6gQXvehkorB8dfyiEA2MjdsjLyPm5P9prQF/pGPnsmw4FKufZT3KeNKvWkEoYNOhj/0p0lGFX9UJJBNhHj3uw= Received: from BL0PR02CA0048.namprd02.prod.outlook.com (2603:10b6:207:3d::25) by SN6PR02MB4462.namprd02.prod.outlook.com (2603:10b6:805:a8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Tue, 27 Nov 2018 06:19:33 +0000 Received: from CY1NAM02FT010.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::207) by BL0PR02CA0048.outlook.office365.com (2603:10b6:207:3d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.23 via Frontend Transport; Tue, 27 Nov 2018 06:19:33 +0000 Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT010.mail.protection.outlook.com (10.152.75.50) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1339.15 via Frontend Transport; Tue, 27 Nov 2018 06:19:31 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1gRWiZ-0007Zv-GM; Mon, 26 Nov 2018 22:19:31 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1gRWiU-00028F-Cx; Mon, 26 Nov 2018 22:19:26 -0800 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id wAR6JOxX002440; Mon, 26 Nov 2018 22:19:24 -0800 Received: from [172.23.37.99] (helo=xhdsivadur40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1gRWiR-00027k-I0; Mon, 26 Nov 2018 22:19:24 -0800 From: Siva Durga Prasad Paladugu To: Date: Tue, 27 Nov 2018 11:49:10 +0530 Message-ID: <1543299551-1965-1-git-send-email-siva.durga.paladugu@xilinx.com> X-Mailer: git-send-email 2.7.4 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(136003)(396003)(376002)(346002)(2980300002)(438002)(189003)(199004)(106466001)(2351001)(6346003)(26005)(186003)(356004)(2906002)(63266004)(6666004)(50466002)(106002)(4326008)(6916009)(305945005)(5660300001)(126002)(336012)(16586007)(50226002)(9786002)(486006)(316002)(51416003)(54906003)(476003)(2616005)(426003)(478600001)(107886003)(47776003)(8936002)(36756003)(48376002)(77096007)(81156014)(81166006)(8676002)(36386004)(7696005)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR02MB4462; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; LANG:en; PTR:unknown-60-83.xilinx.com; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT010; 1:w7V+/NR6yhk8DHR9BU8FaO1NezzO+X85v4o1rgzGSRzJ0dLHFpFymMHmpe1LMX6gmwCvj5aO6kZ/lOTeqSFOjRfYlrbpCCm9TGT2KVJbz4tOR8akF6oI8KVo+smKXxyr MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60389ddd-8e84-447f-d767-08d654304b74 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:SN6PR02MB4462; X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4462; 3:MF2OUw6sugzFdRlIObvTQKV3X/9RGlsZbrxq/Kl5y6GgXOfFJ8eAJtMkEPQdT3q2cOtAJPxbCkcp7XhT5BPZPNe1xhqbJEnBRPRtRfRt0TWbRfXwYQu3JdfW3VV+u4ZjSie6lrwJ5hSkJl+Rj8r7vvJtCjs/+BnITWhLypCI3CeuTeA/kMkipAaI9Vvo39gytRFL2MWf3gwj/FTEE9wXgkXKpto6m/pIBN1PCJZyY474bJCq9RFXE0rX4P06BeByN5ZExYNgW8hjm0ITNRmcJ+B2uOx4NyANMYc9V/x+GF8gamgBxejSYE2wjC5YLxl05ax3+jXMs15QYTTvHwvsgzWhENzrtpXI35a5FtUfZpw=; 25:YK/aAEMXbiuU+zBmytT61tRj5T2Yv6tEdiC6LqJyBUI9D4X6RXoYU6QZGg78TqZfa47aN5oN959Z6k6cRkHY2v4S/uvbtFk13n6q/aVvcK11MyHNH6CvDTk5c1u24jzjOHziitJvE4GV8ex+ZjlZbEE1aEeLlUabn0TRliNIQXXCwT+tCyWQP0QPLn79UjMMVHoB6p1WFsLbEmX2giN4v0vUrDfy2sl1TSdabTOYBOlkf5tw4OfIx9hEj6Lavfw4Y6Xg8JFd0P0W2pvvhmYw+TFlYddiAY2ISSFuJIFrAujBRgwiu5VYDWV6cNNU4dDivsCOLoBHUiK9CnPuVhdpNQ== X-MS-TrafficTypeDiagnostic: SN6PR02MB4462: X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4462; 31:Us/Kx1Mo2UepObGFN/k90OGQjwJsqEx4swjFPe97Sf/bt+Ekm62RWupadzGVNAwKTAGfn3sZY/7mauT6qmO3e+PEi7CRAM+f+rvO2oImmF0ndRwNCndgGmdpg2BlKCXWqLhuixz6bDcnnwtm+pF261UyxYmM3ZjiKUseOhs0Utfce/ExLfPDOvXlrZXif/YCkm+CribywdYD4MPJmkTNMPLwzwPIqVpuv2CPV8yFrpU=; 20:FhIQBeJ6fN0K4U5rvyefJi3K/Qi6bsJ17ZKyeJX7wwO8urnCGIZkrXPnH6Ws0yOXvW5AJ39OdD9apgAU9WdQuPVQqgmzM0gcXxPGviffpaMfUjTNgwl6pQ0IW3Vs/8U5DcX/8LkqB3BtEyQbVeLlEowzE30Z+KCcf3c8hgDbUeCciKh4FB3EjWIPKDPPvSf91Di2Z6zSP2Mew8aUSkUWM7TO5c/pa1XEUqEafhjqBV/qtZ4S5wMsrn5m45v3TbtXX6bKHCTu6B2iJHhUDfQqSJWHAClIZ6a3dhCB/Gv41mfdbkg5EN1tAlzuFv+PRQrh7L69ZyhZSIQTTl5okajqpToepNYvwD8wrIeJeoMJsWUOY3b6CJZO8pXAXN0L4qLfdCV+2B94qGIaHSGVxO8zKtHY5n0W7uk9VMDhChRtlOGUBjDbBiHP5VokrZzcLJ5zv7iPhpfxKyLeyJ6H6OjM3xayQYOn6qpONlNLN42J3vxhy+wa+1o2exWfWK7wjqNT X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93004095)(3231443)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:SN6PR02MB4462; BCL:0; PCL:0; RULEID:; SRVR:SN6PR02MB4462; X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4462; 4:h6nTvdrAB387Dg6d5Dz0Y+IozRJOQMr3r5myG85VEuE1qeEtl8r9aj27nrlcOIvbZFm+juMY2BHVvkj7YRa8PAQEfa0f3W6SewzIjYBpsy+54H8m/vt/u4nGZre64NA6MRK+clgCxfvl5Gx4VvBusjlQPHIkSG3PBvtbEy7JoilkY/7TCFglakD3VNr/8fvfGuMOAqOc0aY5w7hkPl3Jpqp3rq1ID4SIe2cF0axtC2UniJGjgwqyzt2CUCDASusl/bE2U1jmi9uPPWwzk15DUw== X-Forefront-PRVS: 086943A159 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR02MB4462; 23:+ZNU6h5gXS7YzzVZ1wuwaqO75lYN1DmgWwK9HmFkZ?= eayNsECYAW4kcKeoC5gGEMb/IFyNa5ylkLGd20Hditjl3ZuyQ1CjnnQqujblzKlj3zYddH1ILf79DGdz1qmOBVvvFEzIuJK40FnInX3fq6HzT8dZJ1RvzUakERXgXOG6ggufEYI1vLfSoVzitDBvb2CDjzXh4Fh0yVB9DaRRdfJNSakNzB+d9ZJ048sd1kmFEJ6bGBbNG7yjGT+Lj4EFT06WAbhwd8OVPteFIj4iVCCof9LJR+3+Pzk1ilH/M+0cgPXhZhkp+d7F7LJ3GdU4WYjaWgVnhmr3WVl1uMFwQhJSTrVJvOQTWMml+GsGCqc0iH1X0Y9EoQKVDFYvQuhs69Aim5eN+OWYMf+MUSp32NpnWUW/lhWI6PRpLtBKvd4ArnmKrc37ir26r5fMy1zvpK/UFSDAAomHQrc30QoXE0Yb1954dYkwLVMNEM+zFj7gVFeR2n9u5p+ZE4/j3ZOUDgb+myjUAe0UVGEsQt0PVsc1H+ZkT81gWnlk/XX1tU/GbfBE9/QmUEKDwlR7DDbZoQ65ODuZJBvsx0n4miYK5DWQwKXtM/Byi8kuWNOYKkVEn0CpP/mDmEVYKhfka/dMG0DW59CjH8PFn0pP2U15+KguiIThHDiVbRKJcFolb9TG8x4/4qWQgM9SUwsJ6a1CdAeCGG1wJHvQjZdEecgADVGHqGuwoeOf0NqeQSZMh3bmzSdYLFGO/juteGH/0BIhBtDDUPBxPGhn+y9+yZK6ao7AA/qh3+OhmIyeeEo7STSFxwinnO/alsRvcKv/m3fNVo1tJ8yVzaPKHHwhEUh6Rne1a4ud+fXOsZ1JcKSqGUkAwLcL/HKDDCJFwp+rXBi6no9O/gUx0ey/uqaJeYxZLRkhGa50i9KcwZr4Ks/N2kKGMdcKNwngI/usKgk8lpa9wJWuQqI4Zuf6CM5bY798aT1sVhydO364C2gso8m7PMegOuTnEXbiX85UTAda1m0U6nV6vynyUVnrxEeCqCKkSK7UXgI3wei2Uo6fwmxUaYjLGwkKHukaCeYe0ewMeBjyLfT X-Microsoft-Antispam-Message-Info: ZQgsIoqW9h+w75asf+u765trCzAi3vOUKR47rVD/y6AXrhIl6ZYt8vuNh8V/UFQqIlAsLHLeQWQ0eUanyRdlG0xMY2QiQWCZS1UAnaOeMKt09hdgkvAvO5Lh4+uO5mEZTpk3FKJXslHHvYXKb8rgwurjbGksy6u1W5pqHp4beDWeqhCngIoUbEUvpjCiMREtFaOMxe2XXY2OJhnOlRXiTmyStcR+e+pva2miYwyBK0yx17Eg1z6akTBMkSEjPZa7WxDfauqBB77+F9FKqU8tbRi3qdYX56+rk34dtrvQlvAA6vqzJpRQygMsimGIa+ISZXJnzbrGdteqKopgnrYP3ll33E3PjsPd2nCaW5LpmoQ= X-Microsoft-Exchange-Diagnostics: 1; SN6PR02MB4462; 6:1bEyk66T9QSygEb3TG0piuYEJ2zYI3YJvIUwlH7/FL7SE/jZuO/mghktyukYqztXNUoV+rarYSWCCeVQJK3aVG2ggsM2BHH3Xj0aej2i5AecDKwNpgU21mPQ6BJTRDJlvKNESjA2KMv4rivRg9UBDhlyId6V7kDytxV5HOzoRsIVZ3H30LkmklLD8BoyWMnR93VFjvkCGpv5mRtjjt8EZ02zzhyzVld1h5KxnYNFs9nAWKFmcnjmqiG/DJX09N7tBZ7woEkNYkgtaVkynIz6O2jXduG3gywo+lQuf4Ft26hA1zaLgOEppzj72rI27wM7Xe/sIp/tSrCOEcPMptxaGSQfmU66cLyLbkxvXf/l/pGt7rshAKwtHh3KNyoP1IDDwwHJ/HcG6iTOLfX+nFYR7HSxO17U/24YaQs5SC1Ev9b8csAVIHiSlMcquL/bd0KKLvXFG4M2w5LoEB2021ku2g==; 5:JimjnDdMCXtZBxKuAdMdI/cQe8VwuWUfWp3TTgXd4d4GHFMU4rJneYgiHs9j9GpiFlIkzz3QcfIdB8bWGCN13dvoh1shNpLfp3fMkX+dqLlBYDaBmWcmh/uQIR4pBrs9Fi4xQE7/ShORL4zuu6h9VDZwLzOXqMIVkoZhHItlFmk=; 7:XzE3w2kEmm3l1G/8mGGaMR5eYlDXaTlnqoPeGwAxikq/3DoDm+c+ED3DUekIOfKeeiZ9cScx6APD/yUXOWcZfX+QkIPT0oVjJ68738J/lpHxCrOC0zYn+39rBiv+51HHv++ZXSvX2ukG46Z+8mx9cg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2018 06:19:31.9053 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60389ddd-8e84-447f-d767-08d654304b74 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB4462 Cc: joe.hershberger@ni.com, Michal Simek Subject: [U-Boot] [PATCH 1/2] net: phy: Move fixed link code to separate routine X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch moves fixed-link functionality code to a separate routine inorder to make it more modular and cleaner. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek Acked-by: Joe Hershberger --- drivers/net/phy/phy.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e837eb7..3cb2785 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -875,18 +875,18 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev) debug("%s connected to %s\n", dev->name, phydev->drv->name); } +#ifdef CONFIG_PHY_FIXED #ifdef CONFIG_DM_ETH -struct phy_device *phy_connect(struct mii_dev *bus, int addr, - struct udevice *dev, - phy_interface_t interface) +static struct phy_device *phy_connect_fixed(struct mii_dev *bus, + struct udevice *dev, + phy_interface_t interface) #else -struct phy_device *phy_connect(struct mii_dev *bus, int addr, - struct eth_device *dev, - phy_interface_t interface) +static struct phy_device *phy_connect_fixed(struct mii_dev *bus, + struct eth_device *dev, + phy_interface_t interface) #endif { struct phy_device *phydev = NULL; -#ifdef CONFIG_PHY_FIXED int sn; const char *name; @@ -900,7 +900,27 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr, } sn = fdt_next_subnode(gd->fdt_blob, sn); } + + return phydev; +} #endif + +#ifdef CONFIG_DM_ETH +struct phy_device *phy_connect(struct mii_dev *bus, int addr, + struct udevice *dev, + phy_interface_t interface) +#else +struct phy_device *phy_connect(struct mii_dev *bus, int addr, + struct eth_device *dev, + phy_interface_t interface) +#endif +{ + struct phy_device *phydev = NULL; + +#ifdef CONFIG_PHY_FIXED + phydev = phy_connect_fixed(bus, dev, interface); +#endif + if (!phydev) phydev = phy_find_by_mask(bus, 1 << addr, interface);