target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch

   1 From: Stas Sergeev <stsp@list.ru>
   2 Date: Wed, 2 Dec 2015 20:33:56 +0300
   3 Subject: [PATCH] mvneta: consolidate autoneg enabling
   4
   5 This moves autoneg-related bit manipulations to the single place.
   6
   7 CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   8 CC: netdev@vger.kernel.org
   9 CC: linux-kernel@vger.kernel.org
  10
  11 Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14
  15 --- a/drivers/net/ethernet/marvell/mvneta.c
  16 +++ b/drivers/net/ethernet/marvell/mvneta.c
  17 @@ -1067,15 +1067,28 @@ static void mvneta_defaults_set(struct m
  18                        MVNETA_GMAC_AN_SPEED_EN |
  19                        MVNETA_GMAC_AN_DUPLEX_EN;
  20                 mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
  21 +
  22                 val = mvreg_read(pp, MVNETA_GMAC_CLOCK_DIVIDER);
  23                 val |= MVNETA_GMAC_1MS_CLOCK_ENABLE;
  24                 mvreg_write(pp, MVNETA_GMAC_CLOCK_DIVIDER, val);
  25 +
  26 +               val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
  27 +               val |= MVNETA_GMAC2_INBAND_AN_ENABLE;
  28 +               mvreg_write(pp, MVNETA_GMAC_CTRL_2, val);
  29         } else {
  30                 val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
  31                 val &= ~(MVNETA_GMAC_INBAND_AN_ENABLE |
  32                        MVNETA_GMAC_AN_SPEED_EN |
  33                        MVNETA_GMAC_AN_DUPLEX_EN);
  34                 mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
  35 +
  36 +               val = mvreg_read(pp, MVNETA_GMAC_CLOCK_DIVIDER);
  37 +               val &= ~MVNETA_GMAC_1MS_CLOCK_ENABLE;
  38 +               mvreg_write(pp, MVNETA_GMAC_CLOCK_DIVIDER, val);
  39 +
  40 +               val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
  41 +               val &= ~MVNETA_GMAC2_INBAND_AN_ENABLE;
  42 +               mvreg_write(pp, MVNETA_GMAC_CTRL_2, val);
  43         }
  44
  45         mvneta_set_ucast_table(pp, -1);
  46 @@ -3230,9 +3243,6 @@ static int mvneta_port_power_up(struct m
  47                 return -EINVAL;
  48         }
  49
  50 -       if (pp->use_inband_status)
  51 -               ctrl |= MVNETA_GMAC2_INBAND_AN_ENABLE;
  52 -
  53         /* Cancel Port Reset */
  54         ctrl &= ~MVNETA_GMAC2_PORT_RESET;
  55         mvreg_write(pp, MVNETA_GMAC_CTRL_2, ctrl);