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

Commit 06b3ccfb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'MV88E6097-fixes' 



Stefan Eichenberger says:

====================
Fix support for the MV88E6097

This patchset fixes the following two issues for the MV88E6097:
- Add missing definition of g1_irqs
- Add missing comment
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 53c4ce02 15da3cc8

drivers/net/dsa/mv88e6xxx/chip.c

+2 −0
Original line number Diff line number Diff line
@@ -3210,6 +3210,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = { 
};



static const struct mv88e6xxx_ops mv88e6097_ops = {

	/* MV88E6XXX_FAMILY_6097 */

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -3602,6 +3603,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
		.port_base_addr = 0x10,

		.global1_addr = 0x1b,

		.age_time_coeff = 15000,

		.g1_irqs = 8,

		.flags = MV88E6XXX_FLAGS_FAMILY_6097,

		.ops = &mv88e6097_ops,

	},