Received: by 10.223.176.5 with SMTP id f5csp863741wra; Fri, 9 Feb 2018 08:25:00 -0800 (PST) X-Google-Smtp-Source: AH8x225H3fKyfRylqctro+fZ597thTklZYGHxzNzBhr/8RBCmt2z6EdRk0C0Mz1rZNmlitIzQ1x7 X-Received: by 10.101.78.130 with SMTP id b2mr2842189pgs.229.1518193499916; Fri, 09 Feb 2018 08:24:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518193499; cv=none; d=google.com; s=arc-20160816; b=DSAvEkiFubHaP9tUpkUwDutqEyGv7UHAVRp4HlqOA52eBcZ1XZ8dwzq0+hUiUzQeQX a0rdslPKo9Gy/+LwHpxd2irUZxQ4pbt+F00Qus9OF7pKuov3H86bq+jOkFKitineVLdz mm9VHBgwrNGruoSNkkAlD/SfDHwzIOeLXuMqfYhhI/9Qwm5Pqev1NAU9nUhbbeulWo7w +pQHsgFwW4xbznXy+7golzb2q3TNp2xoXkI0jNWaLMnCAUGpU8zOuGja2GlndQeMX7kj ZPNC+uKtwXUZ9m0qlUGSwyRbpPKbUud1PASmgqRA3xkMeg6jWY+6Ns0CqGWasHrkYhpg wdsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=cyjQ7BphoNqTvASUhNbOuQgtEl7tELhzM2qvWZ3FBcw=; b=W4e+/yKQmtXvzzdB5tUwinl9AsxI8P9ZY1FXaAXrvPywhryPGmGyE5CZxHeg7gYtZp oga894ZR3Ebk4fBKzRoWGdKlZBoUI2hhJrZDNEXcXCTQ0RQYtofHV++b9qLCS0mXyrWy ulWr1hjzOpRVLOgPH3eERyKkPsvi506A0OQ16bHCe1Yd9cDQPM7dJHZSp0qfTH3amc6a pdKLR30MRohDNStkwQd96FJCorAMb2QoX/BW1eZpK2DPrJ+5Owyy8jqN2UjHZRsvjfm9 aMd/46m91jQliY8Q5lhzRVMQiRoM42G2lQzN/XD+LoZsqAf8bMH+dXpnAzFJ18DRx1mU NEvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p189si1919383pfg.297.2018.02.09.08.24.45; Fri, 09 Feb 2018 08:24:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752506AbeBIQXn (ORCPT + 99 others); Fri, 9 Feb 2018 11:23:43 -0500 Received: from bastet.se.axis.com ([195.60.68.11]:49959 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752197AbeBIQXG (ORCPT ); Fri, 9 Feb 2018 11:23:06 -0500 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id D388A186A1; Fri, 9 Feb 2018 17:23:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id xcOlCJ4EY3Pq; Fri, 9 Feb 2018 17:23:02 +0100 (CET) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id D11E81893C; Fri, 9 Feb 2018 17:23:02 +0100 (CET) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B49A81A06D; Fri, 9 Feb 2018 17:23:02 +0100 (CET) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A9A3B1A065; Fri, 9 Feb 2018 17:23:02 +0100 (CET) Received: from thoth.se.axis.com (unknown [10.0.2.173]) by boulder02.se.axis.com (Postfix) with ESMTP; Fri, 9 Feb 2018 17:23:02 +0100 (CET) Received: from lnxartpec1.se.axis.com (lnxartpec1.se.axis.com [10.88.4.10]) by thoth.se.axis.com (Postfix) with ESMTP id 9DDE17EB; Fri, 9 Feb 2018 17:23:02 +0100 (CET) Received: by lnxartpec1.se.axis.com (Postfix, from userid 20283) id 9A0EE401B8; Fri, 9 Feb 2018 17:23:02 +0100 (CET) From: Niklas Cassel To: Giuseppe Cavallaro , Alexandre Torgue Cc: Niklas Cassel , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/3] net: stmmac: rename GMAC_INT_DEFAULT_MASK for dwmac4 Date: Fri, 9 Feb 2018 17:22:46 +0100 Message-Id: <20180209162247.3724-3-niklas.cassel@axis.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180209162247.3724-1-niklas.cassel@axis.com> References: <20180209162247.3724-1-niklas.cassel@axis.com> X-TM-AS-GCONF: 00 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org GMAC_INT_DEFAULT_MASK is written to the interrupt enable register. In previous versions of the IP (e.g. dwmac1000), this register was instead an interrupt mask register. To improve clarity and reflect reality, rename GMAC_INT_DEFAULT_MASK to GMAC_INT_DEFAULT_ENABLE. Signed-off-by: Niklas Cassel --- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h index 789dad8a07b5..7761a26ec9c5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h @@ -98,7 +98,7 @@ #define GMAC_PCS_IRQ_DEFAULT (GMAC_INT_RGSMIIS | GMAC_INT_PCS_LINK | \ GMAC_INT_PCS_ANE) -#define GMAC_INT_DEFAULT_MASK (GMAC_INT_PMT_EN | GMAC_INT_LPI_EN) +#define GMAC_INT_DEFAULT_ENABLE (GMAC_INT_PMT_EN | GMAC_INT_LPI_EN) enum dwmac4_irq_status { time_stamp_irq = 0x00001000, diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 1e0a7668b752..6badc63d8e6d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -61,8 +61,8 @@ static void dwmac4_core_init(struct mac_device_info *hw, writel(value, ioaddr + GMAC_CONFIG); - /* Mask GMAC interrupts */ - value = GMAC_INT_DEFAULT_MASK; + /* Enable GMAC interrupts */ + value = GMAC_INT_DEFAULT_ENABLE; if (hw->pmt) value |= GMAC_INT_PMT_EN; if (hw->pcs) -- 2.14.2