Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95150f29 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: dsa: mv8e6xxx: fix number of internal PHYs for 88E6x90 family 



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: bc393155 ("net: dsa: mv88e6xxx: Add number of internal PHYs")
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 895a5e96

drivers/net/dsa/mv88e6xxx/chip.c

+6 −6
Original line number Diff line number Diff line
@@ -4222,7 +4222,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.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,
@@ -4245,7 +4245,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.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,
@@ -4268,7 +4268,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.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,
@@ -4315,7 +4315,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.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,
@@ -4477,7 +4477,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.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,
@@ -4500,7 +4500,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.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,