From patchwork Mon Jan 12 19:16:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 428086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A9BC11401F0 for ; Tue, 13 Jan 2015 06:21:02 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 33318284830; Mon, 12 Jan 2015 20:17:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 06B612845F9 for ; Mon, 12 Jan 2015 20:17:08 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-we0-f174.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 12 Jan 2015 20:16:50 +0100 (CET) Received: by mail-we0-f174.google.com with SMTP id k48so20898353wev.5 for ; Mon, 12 Jan 2015 11:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=Fr41nw9sh6Yjx4xHZDQFJ3eU7P28holT7HFdS9cWy/s=; b=L+7elr29cnt9fvxPhCywWycU29jNraWWxpGZleGXCWuL6cBstGsYDslzJvIqV6825I qE7AsunwGO94VCx0nvoIXQMUSvITODhJilUyBgqmGwaDAPtShvF2zrxU2Wl3S4gvNr3l PSCtl2BcCzl+1q+RLilr3RQEgcJiS15pxL7RzbRtGq/TgqLkQlzy9dh2waE/iSGc6wGx OfWHkPeiWfeMhKT29xMZ8jEJoJjWESvRzF5BBIhcHaJ9YvLrHmeMqUWP2LRsTKyPffy9 0Su5BXdovGd0qioXAh1XW4YgalwWmEXptgdthPdSmvFnhlrDcOBOHl/QIiBKSiKBurF0 tI9Q== X-Received: by 10.194.58.37 with SMTP id n5mr32592293wjq.14.1421090337927; Mon, 12 Jan 2015 11:18:57 -0800 (PST) Received: from ?IPv6:2003:63:234d:1800:1884:41a9:65a8:64a8? (p20030063234D1800188441A965A864A8.dip0.t-ipconnect.de. [2003:63:234d:1800:1884:41a9:65a8:64a8]) by mx.google.com with ESMTPSA id n5sm11379058wic.6.2015.01.12.11.18.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jan 2015 11:18:57 -0800 (PST) Message-ID: <54B41DA0.5080903@gmail.com> Date: Mon, 12 Jan 2015 20:16:48 +0100 From: Heiner Kallweit User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Felix Fietkau Cc: OpenWrt Development List Subject: [OpenWrt-Devel] [PATCH 2/6] ar8216: replace ar8xxx_rmw with ar8xxx_reg_set where appropriate X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Replace ar8xxx_rmw with ar8xxx_reg_set where appropriate. Signed-off-by: Heiner Kallweit --- target/linux/generic/files/drivers/net/phy/ar8216.c | 13 +++++-------- target/linux/generic/files/drivers/net/phy/ar8327.c | 6 ++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 906dc7a..76dfcf4 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -742,12 +742,11 @@ ar8236_init_globals(struct ar8xxx_priv *priv) AR8316_GCTRL_MTU, 9018 + 8 + 2); /* enable cpu port to receive arp frames */ - ar8xxx_rmw(priv, AR8216_REG_ATU_CTRL, - AR8236_ATU_CTRL_RES, AR8236_ATU_CTRL_RES); + ar8xxx_reg_set(priv, AR8216_REG_ATU_CTRL, + AR8236_ATU_CTRL_RES); /* enable cpu port to receive multicast and broadcast frames */ - ar8xxx_rmw(priv, AR8216_REG_FLOOD_MASK, - AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN, + ar8xxx_reg_set(priv, AR8216_REG_FLOOD_MASK, AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN); /* Enable MIB counters */ @@ -979,13 +978,11 @@ ar8216_set_mirror_regs(struct ar8xxx_priv *priv) (priv->monitor_port << AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S)); if (priv->mirror_rx) - ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(priv->source_port), - AR8216_PORT_CTRL_MIRROR_RX, + ar8xxx_reg_set(priv, AR8216_REG_PORT_CTRL(priv->source_port), AR8216_PORT_CTRL_MIRROR_RX); if (priv->mirror_tx) - ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(priv->source_port), - AR8216_PORT_CTRL_MIRROR_TX, + ar8xxx_reg_set(priv, AR8216_REG_PORT_CTRL(priv->source_port), AR8216_PORT_CTRL_MIRROR_TX); } diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.c b/target/linux/generic/files/drivers/net/phy/ar8327.c index 38c11cb..b69c33b 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8327.c +++ b/target/linux/generic/files/drivers/net/phy/ar8327.c @@ -886,13 +886,11 @@ ar8327_set_mirror_regs(struct ar8xxx_priv *priv) (priv->monitor_port << AR8327_FWD_CTRL0_MIRROR_PORT_S)); if (priv->mirror_rx) - ar8xxx_rmw(priv, AR8327_REG_PORT_LOOKUP(priv->source_port), - AR8327_PORT_LOOKUP_ING_MIRROR_EN, + ar8xxx_reg_set(priv, AR8327_REG_PORT_LOOKUP(priv->source_port), AR8327_PORT_LOOKUP_ING_MIRROR_EN); if (priv->mirror_tx) - ar8xxx_rmw(priv, AR8327_REG_PORT_HOL_CTRL1(priv->source_port), - AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN, + ar8xxx_reg_set(priv, AR8327_REG_PORT_HOL_CTRL1(priv->source_port), AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN); }