diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:42:36 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-30 11:56:06 +0200 |
| commit | bb30e9762d877487defec679683a33278f0150db (patch) | |
| tree | f29d49b8605adcc113ab78395081ff7cdc9116d7 /drivers/net/dsa | |
| parent | e9d770cf1d3448eadc124b32306674ad6087d96e (diff) | |
| parent | 9d6bde853685609a631871d7c12be94fdf8d912e (diff) | |
Merge tag 'v5.15.112' into 5.15-2.2.x-imx
This is the 5.15.112 stable release
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 4 | ||||
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 2c5ae5cf0577..f951667d1d51 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -441,9 +441,9 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface) else ssc_delta = 0x87; if (priv->id == ID_MT7621) { - /* PLL frequency: 150MHz: 1.2GBit */ + /* PLL frequency: 125MHz: 1.0GBit */ if (xtal == HWTRAP_XTAL_40MHZ) - ncpo1 = 0x0780; + ncpo1 = 0x0640; if (xtal == HWTRAP_XTAL_25MHZ) ncpo1 = 0x0a00; } else { /* PLL frequency: 250MHz: 2.0Gbit */ diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 65f029a408ea..fed8a7651ab5 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4615,6 +4615,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .set_cpu_port = mv88e6095_g1_set_cpu_port, .set_egress_port = mv88e6095_g1_set_egress_port, .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, |