OSDN Git Service

net: mvpp2: fix the synchronization module bypass macro name
authorAntoine Ténart <antoine.tenart@free-electrons.com>
Tue, 22 Aug 2017 17:08:22 +0000 (19:08 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Aug 2017 21:32:19 +0000 (14:32 -0700)
The macro defining the bit to toggle to bypass or not the
synchronization module is wrongly named. Writing 1 will disable bypass.
This patch s/MVPP22_CTRL4_SYNC_BYPASS/MVPP22_CTRL4_SYNC_BYPASS_DIS/.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Tested-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mvpp2.c

index 34c679f..03b7ced 100644 (file)
 #define MVPP22_GMAC_CTRL_4_REG                 0x90
 #define     MVPP22_CTRL4_EXT_PIN_GMII_SEL      BIT(0)
 #define     MVPP22_CTRL4_DP_CLK_SEL            BIT(5)
-#define     MVPP22_CTRL4_SYNC_BYPASS           BIT(6)
+#define     MVPP22_CTRL4_SYNC_BYPASS_DIS       BIT(6)
 #define     MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE  BIT(7)
 
 /* Per-port XGMAC registers. PPv2.2 only, only for GOP port 0,
@@ -4269,7 +4269,7 @@ static void mvpp22_port_mii_set(struct mvpp2_port *port)
        else
                val &= ~MVPP22_CTRL4_EXT_PIN_GMII_SEL;
        val &= ~MVPP22_CTRL4_DP_CLK_SEL;
-       val |= MVPP22_CTRL4_SYNC_BYPASS;
+       val |= MVPP22_CTRL4_SYNC_BYPASS_DIS;
        val |= MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE;
        writel(val, port->base + MVPP22_GMAC_CTRL_4_REG);
 }