From patchwork Tue Sep 5 18:16:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 9939445 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 E979C60350 for ; Tue, 5 Sep 2017 18:18:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2471289FA for ; Tue, 5 Sep 2017 18:18:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E111E28A01; Tue, 5 Sep 2017 18:18:30 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4CFE6289FB for ; Tue, 5 Sep 2017 18:18:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2zeKTE2sFJkzBXfU2+ui8YJXz5AgfM1InUrhfTpDv9c=; b=R4X30uXy6wIcR4We580o+sjuKo ql4wvWfFavhXxNsuNnRNZR66ieGeN4F0ps6MkFgxTjGFZCvl11YmRCNBz2yHx0xrYC7+fpqd0CT8d AhlV6UiUPiQGa+GEVg4CGdJ/CG5bSc21rCNVfHi3pCkpZhdS4xaEVyIsrjbJNf3NTKuZ+z2vrzgks a3hbq0QDCJS7QJ96kPmsa0JwB9lUFmvgzqM5/HMEyGRM2YV0Q/ulNSuBQmXv+GGQFX4ZqL6D6v07R aRaXO0LqdFePRtKSYGBTN4Pn/MkrHSjcBk7gE6KVKDdxFqggdkddCf+3xuEgK2QmOvfF0Z8hXkURS I8sfi9+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dpIPz-0002Pc-O8; Tue, 05 Sep 2017 18:17:47 +0000 Received: from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dpIPQ-0001pH-0y for linux-arm-kernel@lists.infradead.org; Tue, 05 Sep 2017 18:17:15 +0000 Received: by mail-pg0-x22d.google.com with SMTP id 63so1755745pgc.1 for ; Tue, 05 Sep 2017 11:16:51 -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=grbUuCbub/oTMHHwWts7g7KADeuwaY6FcLayG0JJZU8=; b=ZDjuYeouQ52oNXX/DkK4O6EaVvYiqWoXJe0zICWnNwRX2ICLfzY1KNdf9w5LBuZT7t tOl+f3HLljE67MfbkvCesRbVmrVWco22AuMjNq0Z/Zrmg1EVf1RlGGp8oO8EMDpF6E52 xME9WJJ4jrQPKzJX7x0fofftnnOY4z9Mc76s8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=grbUuCbub/oTMHHwWts7g7KADeuwaY6FcLayG0JJZU8=; b=R1p2qWsFu5y6XI5V3oM3Qm3O/iyvdRgDWqszXMl/moB5gi6eIzz8CeJY+CJU5yBAK9 9U5Te6GSsgiAKUldNQdaOAL13Bssl9AWcheEhPL0PVW14+zM00pdS5GRzMbLzgTzkA+l uXxu8gFHOEwYNUckSVNRy57TU7JrBexSXJTwcUDP0Zy6/1H5n5F3SluoXhxVhKc3gHek ZlwY0BVtgkoEuT2QVOlvWtXle98d5dAy62fXS2HcD7FonQhWSSgic/ilxYbFxFfM67rk DKNem67fTaShp56HUCc0JVOIyQiJnIP16fLjdxz9Qi9R6qz3Fe4at8gEzIDC/APTSdj7 LbXg== X-Gm-Message-State: AHPjjUj1lPXhzNbvMINB5mCrIxf2bdowrt+dXNW0iht28bdJr2XIhIeF fTAIg0DJSv1vm5Qa X-Google-Smtp-Source: ADKCNb78aBzK+R2ICI2uto+C8bywlr2mCMEG9edw7VnJbf/pXdTL3ULKXDlMpELih7p0kYoy8rTy0A== X-Received: by 10.101.64.10 with SMTP id f10mr4998450pgp.98.1504635411445; Tue, 05 Sep 2017 11:16:51 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id k195sm1912991pgc.4.2017.09.05.11.16.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Sep 2017 11:16:50 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 2/3] drivers: net: xgene: Configure tx/rx delay for ACPI Date: Tue, 5 Sep 2017 11:16:31 -0700 Message-Id: <1504635392-19089-3-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504635392-19089-1-git-send-email-isubramanian@apm.com> References: <1504635392-19089-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170905_111712_257988_9A383874 X-CRM114-Status: UNSURE ( 9.97 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Quan Nguyen , dnelson@redhat.com, patches@apm.com, 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 From: Quan Nguyen This patch fixes configuring tx/rx delay values for ACPI. Signed-off-by: Quan Nguyen Signed-off-by: Iyappan Subramanian --- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c index e45b587..3188f55 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c @@ -468,7 +468,6 @@ static void xgene_enet_configure_clock(struct xgene_enet_pdata *pdata) static void xgene_gmac_set_speed(struct xgene_enet_pdata *pdata) { - struct device *dev = &pdata->pdev->dev; u32 icm0, icm2, mc2; u32 intf_ctl, rgmii, value; @@ -500,10 +499,8 @@ static void xgene_gmac_set_speed(struct xgene_enet_pdata *pdata) intf_ctl |= ENET_GHD_MODE; CFG_MACMODE_SET(&icm0, 2); CFG_WAITASYNCRD_SET(&icm2, 0); - if (dev->of_node) { - CFG_TXCLK_MUXSEL0_SET(&rgmii, pdata->tx_delay); - CFG_RXCLK_MUXSEL0_SET(&rgmii, pdata->rx_delay); - } + CFG_TXCLK_MUXSEL0_SET(&rgmii, pdata->tx_delay); + CFG_RXCLK_MUXSEL0_SET(&rgmii, pdata->rx_delay); rgmii |= CFG_SPEED_1250; xgene_enet_rd_csr(pdata, DEBUG_REG_ADDR, &value);