queue-5.0/net-dsa-mv8e6xxx-fix-number-of-internal-phys-for-88e6x90-family.patch

   1 From foo@baz Fri Mar  8 07:37:28 CET 2019
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Sat, 2 Mar 2019 10:06:05 +0100
   4 Subject: net: dsa: mv8e6xxx: fix number of internal PHYs for 88E6x90 family
   5
   6 From: Heiner Kallweit <hkallweit1@gmail.com>
   7
   8 [ Upstream commit 95150f29ae480276e76368cdf8a9524b5a96c0ca ]
   9
  10 Ports 9 and 10 don't have internal PHY's but are (dependent on the
  11 version) SERDES/SGMII/XAUI/RXAUI ports.
  12
  13 v2:
  14 - fix it for all 88E6x90 family members
  15
  16 Fixes: bc3931557d1d ("net: dsa: mv88e6xxx: Add number of internal PHYs")
  17 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  18 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  19 Signed-off-by: David S. Miller <davem@davemloft.net>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/net/dsa/mv88e6xxx/chip.c |   12 ++++++------
  23  1 file changed, 6 insertions(+), 6 deletions(-)
  24
  25 --- a/drivers/net/dsa/mv88e6xxx/chip.c
  26 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
  27 @@ -4222,7 +4222,7 @@ static const struct mv88e6xxx_info mv88e
  28                 .name = "Marvell 88E6190",
  29                 .num_databases = 4096,
  30                 .num_ports = 11,        /* 10 + Z80 */
  31 -               .num_internal_phys = 11,
  32 +               .num_internal_phys = 9,
  33                 .num_gpio = 16,
  34                 .max_vid = 8191,
  35                 .port_base_addr = 0x0,
  36 @@ -4245,7 +4245,7 @@ static const struct mv88e6xxx_info mv88e
  37                 .name = "Marvell 88E6190X",
  38                 .num_databases = 4096,
  39                 .num_ports = 11,        /* 10 + Z80 */
  40 -               .num_internal_phys = 11,
  41 +               .num_internal_phys = 9,
  42                 .num_gpio = 16,
  43                 .max_vid = 8191,
  44                 .port_base_addr = 0x0,
  45 @@ -4268,7 +4268,7 @@ static const struct mv88e6xxx_info mv88e
  46                 .name = "Marvell 88E6191",
  47                 .num_databases = 4096,
  48                 .num_ports = 11,        /* 10 + Z80 */
  49 -               .num_internal_phys = 11,
  50 +               .num_internal_phys = 9,
  51                 .max_vid = 8191,
  52                 .port_base_addr = 0x0,
  53                 .phy_base_addr = 0x0,
  54 @@ -4315,7 +4315,7 @@ static const struct mv88e6xxx_info mv88e
  55                 .name = "Marvell 88E6290",
  56                 .num_databases = 4096,
  57                 .num_ports = 11,        /* 10 + Z80 */
  58 -               .num_internal_phys = 11,
  59 +               .num_internal_phys = 9,
  60                 .num_gpio = 16,
  61                 .max_vid = 8191,
  62                 .port_base_addr = 0x0,
  63 @@ -4477,7 +4477,7 @@ static const struct mv88e6xxx_info mv88e
  64                 .name = "Marvell 88E6390",
  65                 .num_databases = 4096,
  66                 .num_ports = 11,        /* 10 + Z80 */
  67 -               .num_internal_phys = 11,
  68 +               .num_internal_phys = 9,
  69                 .num_gpio = 16,
  70                 .max_vid = 8191,
  71                 .port_base_addr = 0x0,
  72 @@ -4500,7 +4500,7 @@ static const struct mv88e6xxx_info mv88e
  73                 .name = "Marvell 88E6390X",
  74                 .num_databases = 4096,
  75                 .num_ports = 11,        /* 10 + Z80 */
  76 -               .num_internal_phys = 11,
  77 +               .num_internal_phys = 9,
  78                 .num_gpio = 16,
  79                 .max_vid = 8191,
  80                 .port_base_addr = 0x0,