From patchwork Thu Apr 21 18:41:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David Rivshin (Allworx)" X-Patchwork-Id: 8903511 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DE9D1BF29F for ; Thu, 21 Apr 2016 18:42:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F233E20221 for ; Thu, 21 Apr 2016 18:42:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C930201F5 for ; Thu, 21 Apr 2016 18:42:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752383AbcDUSmX (ORCPT ); Thu, 21 Apr 2016 14:42:23 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:32965 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752118AbcDUSmV (ORCPT ); Thu, 21 Apr 2016 14:42:21 -0400 Received: by mail-qk0-f196.google.com with SMTP id q184so4424511qkf.0; Thu, 21 Apr 2016 11:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s37/eezkK8hazo0+Rc2AZ+s4pv56F2uQGWRjtPBqw8E=; b=L7Cqz81w0/u4dxCY3wePLlzazUB+IEEbQmM1JaskL0n4zWRkF35oQvRnc/q8QPm6oI fMS1hQ1OO/8/ywRVHTLVpMcOeyFCH7skdBzq3xJT4OZa3ZmBa/6hcqtAweelS+BxMIlz YySTHsmdXGviVk31yRgqPdRo9eaFDSHYgSbOSOye40tPc2niXUO9mV54auHXim0iSvG1 WCFbwVVo9zBXVtDUagmhSb0lzJL1vQDlgjr7eVAMriLKUo2rZdRHtYhIZKgsgK863iWC EcfG8jAKhxfOBequV3TEfcWWSlNOJ++FA8EUhU3QRrs68Kvq62EMob0heE/ZJ+A1IqKA GDpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s37/eezkK8hazo0+Rc2AZ+s4pv56F2uQGWRjtPBqw8E=; b=FyaaCU4N1l40lchnoDecL0T/UbrV+b2/wOMMMnnVntzftlM7MlBwe1Ex3CyTXIghll UBjgD9yz57/CHpZA1UUyfTGOA0FiY3WDCwsLHtX1TgmFlSbCwGiNdWk7xDFCad4g+ouJ VVpYbUwCSUN3qxpvKmmxYcJtpZP0z9cE6Yw7BkdEkoXHjW+1+7VDuWDok42u9zL1MMHF rOUoN0NM0mCJrojzs4wueXBHm0YMUtzpOttWUAbchA/StBj/2s8PsnQPamsbl0wdPAq8 qB4Q9p6VZPYfkTqH2Xdis6XbqeTRr1Z4hMNdoECQi/8QC8dFVnt4SJrhm59d/0kcqJe7 1e3g== X-Gm-Message-State: AOPr4FXXLTmA85Ermgu+w9yk5SxCA0clctD012IVaKeoQHuviXd2sFBWKMKn94cfvUY+oA== X-Received: by 10.55.20.83 with SMTP id e80mr1392827qkh.196.1461264140039; Thu, 21 Apr 2016 11:42:20 -0700 (PDT) Received: from drivshin-linux.crosskeys.inscitek.com ([24.213.148.66]) by smtp.gmail.com with ESMTPSA id u102sm949952qge.27.2016.04.21.11.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Apr 2016 11:42:19 -0700 (PDT) From: "David Rivshin (Allworx)" To: netdev@vger.kernel.org, linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller , Mugunthan V N , Grygorii Strashko , Andrew Goodbody , Markus Brunner , Nicolas Chauvet Subject: [PATCH net v2 3/3] drivers: net: cpsw: use of_phy_connect() in fixed-link case Date: Thu, 21 Apr 2016 14:41:06 -0400 Message-Id: <1461264066-12358-1-git-send-email-drivshin.allworx@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461261035-5578-1-git-send-email-drivshin.allworx@gmail.com> References: <1461261035-5578-1-git-send-email-drivshin.allworx@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Rivshin If a fixed-link DT subnode is used, the phy_device was looked up so that a PHY ID string could be constructed and passed to phy_connect(). This is not necessary, as the device_node can be passed directly to of_phy_connect() instead. This reuses the same codepath as if the phy-handle DT property was used. Signed-off-by: David Rivshin Tested-by: Nicolas Chauvet Reviewed-by: Grygorii Strashko --- Changes since v1 [1]: - Rebased (trivial conflict, e5a03bfd modified the deleted snprintf) - Added Tested-by from Nicolas Chauvet [1] https://patchwork.ozlabs.org/patch/560327/ drivers/net/ethernet/ti/cpsw.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 3c81413..245f919 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2038,30 +2038,21 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, "phy-handle", 0); parp = of_get_property(slave_node, "phy_id", &lenp); if (slave_data->phy_node) { dev_dbg(&pdev->dev, "slave[%d] using phy-handle=\"%s\"\n", i, slave_data->phy_node->full_name); } else if (of_phy_is_fixed_link(slave_node)) { - struct device_node *phy_node; - struct phy_device *phy_dev; - /* In the case of a fixed PHY, the DT node associated * to the PHY is the Ethernet MAC DT node. */ ret = of_phy_register_fixed_link(slave_node); if (ret) return ret; - phy_node = of_node_get(slave_node); - phy_dev = of_phy_find_device(phy_node); - if (!phy_dev) - return -ENODEV; - snprintf(slave_data->phy_id, sizeof(slave_data->phy_id), - PHY_ID_FMT, phy_dev->mdio.bus->id, - phy_dev->mdio.addr); + slave_data->phy_node = of_node_get(slave_node); } else if (parp) { u32 phyid; struct device_node *mdio_node; struct platform_device *mdio; if (lenp != (sizeof(__be32) * 2)) { dev_err(&pdev->dev, "Invalid slave[%d] phy_id property\n", i);