diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-11-28 11:58:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-28 11:58:57 -0500 |
| commit | 06b3ccfbb71ed585a00c9d643f2b07ccc7fcc6ba (patch) | |
| tree | 40b338866b98d1f5c023a7cc26106c0941033e5a | |
| parent | Merge branch 'bpf-misc-next' (diff) | |
| parent | net: dsa: mv88e6xxx: add missing comment for MV88E6097 (diff) | |
| download | linux-dev-06b3ccfbb71ed585a00c9d643f2b07ccc7fcc6ba.tar.xz linux-dev-06b3ccfbb71ed585a00c9d643f2b07ccc7fcc6ba.zip | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index b14b3d5099c8..68eb8fccfb9b 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -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, }, |