lkml.org 
[lkml]   [2019]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 21/76] net: dsa: mv8e6xxx: fix number of internal PHYs for 88E6x90 family
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Heiner Kallweit <hkallweit1@gmail.com>

    [ Upstream commit 95150f29ae480276e76368cdf8a9524b5a96c0ca ]

    Ports 9 and 10 don't have internal PHY's but are (dependent on the
    version) SERDES/SGMII/XAUI/RXAUI ports.

    v2:
    - fix it for all 88E6x90 family members

    Fixes: bc3931557d1d ("net: dsa: mv88e6xxx: Add number of internal PHYs")
    Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/dsa/mv88e6xxx/chip.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/net/dsa/mv88e6xxx/chip.c
    +++ b/drivers/net/dsa/mv88e6xxx/chip.c
    @@ -4206,7 +4206,7 @@ static const struct mv88e6xxx_info mv88e
    .name = "Marvell 88E6190",
    .num_databases = 4096,
    .num_ports = 11, /* 10 + Z80 */
    - .num_internal_phys = 11,
    + .num_internal_phys = 9,
    .num_gpio = 16,
    .max_vid = 8191,
    .port_base_addr = 0x0,
    @@ -4229,7 +4229,7 @@ static const struct mv88e6xxx_info mv88e
    .name = "Marvell 88E6190X",
    .num_databases = 4096,
    .num_ports = 11, /* 10 + Z80 */
    - .num_internal_phys = 11,
    + .num_internal_phys = 9,
    .num_gpio = 16,
    .max_vid = 8191,
    .port_base_addr = 0x0,
    @@ -4252,7 +4252,7 @@ static const struct mv88e6xxx_info mv88e
    .name = "Marvell 88E6191",
    .num_databases = 4096,
    .num_ports = 11, /* 10 + Z80 */
    - .num_internal_phys = 11,
    + .num_internal_phys = 9,
    .max_vid = 8191,
    .port_base_addr = 0x0,
    .phy_base_addr = 0x0,
    @@ -4299,7 +4299,7 @@ static const struct mv88e6xxx_info mv88e
    .name = "Marvell 88E6290",
    .num_databases = 4096,
    .num_ports = 11, /* 10 + Z80 */
    - .num_internal_phys = 11,
    + .num_internal_phys = 9,
    .num_gpio = 16,
    .max_vid = 8191,
    .port_base_addr = 0x0,
    @@ -4461,7 +4461,7 @@ static const struct mv88e6xxx_info mv88e
    .name = "Marvell 88E6390",
    .num_databases = 4096,
    .num_ports = 11, /* 10 + Z80 */
    - .num_internal_phys = 11,
    + .num_internal_phys = 9,
    .num_gpio = 16,
    .max_vid = 8191,
    .port_base_addr = 0x0,
    @@ -4484,7 +4484,7 @@ static const struct mv88e6xxx_info mv88e
    .name = "Marvell 88E6390X",
    .num_databases = 4096,
    .num_ports = 11, /* 10 + Z80 */
    - .num_internal_phys = 11,
    + .num_internal_phys = 9,
    .num_gpio = 16,
    .max_vid = 8191,
    .port_base_addr = 0x0,

    \
     
     \ /
      Last update: 2019-03-08 13:55    [W:3.741 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site