From patchwork Sat Aug 13 05:05:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 9278347 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 18E7F60780 for ; Sat, 13 Aug 2016 05:11:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AF1428B3E for ; Sat, 13 Aug 2016 05:11:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1D6928B45; Sat, 13 Aug 2016 05:11:53 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 92A2828B3E for ; Sat, 13 Aug 2016 05:11:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYRCt-0000xj-Ly; Sat, 13 Aug 2016 05:10:03 +0000 Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYR8O-0005Fs-5E for linux-arm-kernel@lists.infradead.org; Sat, 13 Aug 2016 05:05:25 +0000 Received: by mail-pf0-x233.google.com with SMTP id x72so2067608pfd.2 for ; Fri, 12 Aug 2016 22:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JoPfnW5C8lrRfm5fH43uxgBn8nNq+AJJ6sYXDU8REl8=; b=MPVYjYWUXp2kZ9VsY4UPndYSlAIo5L0vDr5wQCCkLFjE11DFmMUvNe60dySP2Lw1jT iHx4aaoe9QW7bTJuCEqaEZydAU6he6UnnSwph9bP5pvjTiEFzxHtojEJMMmE4cS88iNv zmym4MvulxpxStz0sqByB8+cacPPJsMPlblVM= 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=JoPfnW5C8lrRfm5fH43uxgBn8nNq+AJJ6sYXDU8REl8=; b=ND3KKQs6rp7O4ow1PP73jTQOWPc5Ru0lQ3eizkjdHitzQBrA9Df08LARwLw9xDYIvR GoXVA5nph/XmchQn/PYcONVztXpMxjt0VnYDEWm3oW2v5y2obtOWd51bNwj9bwPMDyBA Bwochtmr2Z9UPPhJ0RoeFbzHEThVEEsW0SwLbN73ACddgaIX/ikhz81orn/MP576G1yB GcQWSQy/no3eFnY6uqwm4aZNp2eKcrIK+tjrCM8v4zYYmasIsu066gJrHtUQaGiO1SyQ zclV0v4mc//wJdQ3C0EC642HS9so7oEgVzgi3kAcC6ZtKHUGdBZYs0EtvzF+fT7MpZW6 gj2g== X-Gm-Message-State: AEkooutEcZT0c+DMN6fk8TpY6zILJZ0c+zKRDhb6EbdhWVngmdqkjVK0kYZU1BDP9gfXlrmz X-Received: by 10.98.55.1 with SMTP id e1mr33437523pfa.58.1471064703334; Fri, 12 Aug 2016 22:05:03 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id o2sm16753965pfg.10.2016.08.12.22.05.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Aug 2016 22:05:02 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH net-next v2 11/12] drivers: net: xgene: Fix backward compatibility Date: Fri, 12 Aug 2016 22:05:47 -0700 Message-Id: <1471064748-28033-12-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471064748-28033-1-git-send-email-isubramanian@apm.com> References: <1471064748-28033-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160812_220524_352168_17308706 X-CRM114-Status: GOOD ( 11.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@apm.com, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the backward compatibility on handling phy_connect(), by iterating over the phy-handle, when new DT is used with older kernel. Signed-off-by: Iyappan Subramanian --- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c index 18bb955..321fb19 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c @@ -761,18 +761,18 @@ int xgene_enet_phy_connect(struct net_device *ndev) if (dev->of_node) { for (i = 0 ; i < 2; i++) { np = of_parse_phandle(dev->of_node, "phy-handle", i); - if (np) - break; - } - if (!np) { - netdev_dbg(ndev, "No phy-handle found in DT\n"); - return -ENODEV; + if (!np) + continue; + + phy_dev = of_phy_connect(ndev, np, + &xgene_enet_adjust_link, + 0, pdata->phy_mode); + of_node_put(np); + if (phy_dev) + break; } - phy_dev = of_phy_connect(ndev, np, &xgene_enet_adjust_link, - 0, pdata->phy_mode); - of_node_put(np); if (!phy_dev) { netdev_err(ndev, "Could not connect to PHY\n"); return -ENODEV;