{"id":808595,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808595/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170901090455.32316-2-antoine.tenart@free-electrons.com>","date":"2017-09-01T09:04:52","name":"[net-next,v2,1/4] net: mvpp2: take advantage of the is_rgmii helper","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"664324b917530d8ad4ed000006d8a3100d45a3c5","submitter":{"id":61603,"url":"http://patchwork.ozlabs.org/api/1.0/people/61603/?format=json","name":"Antoine Tenart","email":"antoine.tenart@free-electrons.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170901090455.32316-2-antoine.tenart@free-electrons.com/mbox/","series":[{"id":979,"url":"http://patchwork.ozlabs.org/api/1.0/series/979/?format=json","date":"2017-09-01T09:04:53","name":"net: mvpp2: optional PHYs and GoP link irq","version":2,"mbox":"http://patchwork.ozlabs.org/series/979/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808595/checks/","tags":{},"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xkCyV3V8Tz9t2r\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri,  1 Sep 2017 19:05:54 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751662AbdIAJFE (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tFri, 1 Sep 2017 05:05:04 -0400","from mail.free-electrons.com ([62.4.15.54]:45326 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751514AbdIAJFC (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Fri, 1 Sep 2017 05:05:02 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 5E95A209AB; Fri,  1 Sep 2017 11:05:00 +0200 (CEST)","from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 3658E2099C;\n\tFri,  1 Sep 2017 11:05:00 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Antoine Tenart <antoine.tenart@free-electrons.com>","To":"davem@davemloft.net","Cc":"Antoine Tenart <antoine.tenart@free-electrons.com>, andrew@lunn.ch,\n\tgregory.clement@free-electrons.com,\n\tthomas.petazzoni@free-electrons.com, nadavh@marvell.com,\n\tlinux@armlinux.org.uk, linux-kernel@vger.kernel.org,\n\tmw@semihalf.com, stefanc@marvell.com,\n\tmiquel.raynal@free-electrons.com, netdev@vger.kernel.org","Subject":"[PATCH net-next v2 1/4] net: mvpp2: take advantage of the is_rgmii\n\thelper","Date":"Fri,  1 Sep 2017 11:04:52 +0200","Message-Id":"<20170901090455.32316-2-antoine.tenart@free-electrons.com>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170901090455.32316-1-antoine.tenart@free-electrons.com>","References":"<20170901090455.32316-1-antoine.tenart@free-electrons.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Convert all RGMII checks to use the phy_interface_mode_is_rgmii()\nhelper. This is a cosmetic patch.\n\nSigned-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>\n---\n drivers/net/ethernet/marvell/mvpp2.c | 15 +++------------\n 1 file changed, 3 insertions(+), 12 deletions(-)","diff":"diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c\nindex 9e64b1ba3d43..f93d3a332c60 100644\n--- a/drivers/net/ethernet/marvell/mvpp2.c\n+++ b/drivers/net/ethernet/marvell/mvpp2.c\n@@ -4463,10 +4463,7 @@ static void mvpp2_port_mii_gmac_configure_mode(struct mvpp2_port *port)\n \t\tval |= MVPP2_GMAC_DISABLE_PADDING;\n \t\tval &= ~MVPP2_GMAC_FLOW_CTRL_MASK;\n \t\twritel(val, port->base + MVPP2_GMAC_CTRL_2_REG);\n-\t} else if (port->phy_interface == PHY_INTERFACE_MODE_RGMII ||\n-\t\t   port->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||\n-\t\t   port->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID ||\n-\t\t   port->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) {\n+\t} else if (phy_interface_mode_is_rgmii(port->phy_interface)) {\n \t\tval = readl(port->base + MVPP22_GMAC_CTRL_4_REG);\n \t\tval |= MVPP22_CTRL4_EXT_PIN_GMII_SEL |\n \t\t       MVPP22_CTRL4_SYNC_BYPASS_DIS |\n@@ -4512,10 +4509,7 @@ static void mvpp2_port_mii_gmac_configure(struct mvpp2_port *port)\n \tval = readl(port->base + MVPP2_GMAC_CTRL_2_REG);\n \tif (port->phy_interface == PHY_INTERFACE_MODE_SGMII) {\n \t        val |= MVPP2_GMAC_INBAND_AN_MASK | MVPP2_GMAC_PCS_ENABLE_MASK;\n-\t} else if (port->phy_interface == PHY_INTERFACE_MODE_RGMII ||\n-\t\t   port->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||\n-\t\t   port->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID ||\n-\t\t   port->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) {\n+\t} else if (phy_interface_mode_is_rgmii(port->phy_interface)) {\n \t\tval &= ~MVPP2_GMAC_PCS_ENABLE_MASK;\n \t\tval |= MVPP2_GMAC_PORT_RGMII_MASK;\n \t}\n@@ -4575,10 +4569,7 @@ static void mvpp2_port_mii_set(struct mvpp2_port *port)\n \tif (port->priv->hw_version == MVPP22)\n \t\tmvpp22_port_mii_set(port);\n \n-\tif (port->phy_interface == PHY_INTERFACE_MODE_RGMII ||\n-\t    port->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||\n-\t    port->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID ||\n-\t    port->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID ||\n+\tif (phy_interface_mode_is_rgmii(port->phy_interface) ||\n \t    port->phy_interface == PHY_INTERFACE_MODE_SGMII)\n \t\tmvpp2_port_mii_gmac_configure(port);\n \telse if (port->phy_interface == PHY_INTERFACE_MODE_10GKR)\n","prefixes":["net-next","v2","1/4"]}