kernel: bump 6.1 to 6.1.89
[openwrt/staging/nbd.git] / target / linux / generic / backport-6.1 / 790-28-v6.9-net-dsa-mt7530-do-not-set-priv-p5_interface-on-mt753.patch
1 From 120581c81ad19704a9325505c83a82b7e760e96e Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
3 Date: Mon, 22 Jan 2024 08:35:57 +0300
4 Subject: [PATCH 28/48] net: dsa: mt7530: do not set priv->p5_interface on
5 mt7530_setup_port5()
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 Running mt7530_setup_port5() from mt7530_setup() used to handle all cases
11 of configuring port 5, including phylink.
12
13 Setting priv->p5_interface under mt7530_setup_port5() makes sure that
14 mt7530_setup_port5() from mt753x_phylink_mac_config() won't run.
15
16 The commit ("net: dsa: mt7530: improve code path for setting up port 5")
17 makes so that mt7530_setup_port5() from mt7530_setup() runs only on
18 non-phylink cases.
19
20 Get rid of unnecessarily setting priv->p5_interface under
21 mt7530_setup_port5() as port 5 phylink configuration will be done by
22 running mt7530_setup_port5() from mt753x_phylink_mac_config() now.
23
24 Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
25 Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
26 Link: https://lore.kernel.org/r/20240122-for-netnext-mt7530-improvements-1-v3-6-042401f2b279@arinc9.com
27 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
28 ---
29 drivers/net/dsa/mt7530.c | 2 --
30 1 file changed, 2 deletions(-)
31
32 --- a/drivers/net/dsa/mt7530.c
33 +++ b/drivers/net/dsa/mt7530.c
34 @@ -985,8 +985,6 @@ static void mt7530_setup_port5(struct ds
35 dev_dbg(ds->dev, "Setup P5, HWTRAP=0x%x, intf_sel=%s, phy-mode=%s\n",
36 val, p5_intf_modes(priv->p5_intf_sel), phy_modes(interface));
37
38 - priv->p5_interface = interface;
39 -
40 unlock_exit:
41 mutex_unlock(&priv->reg_mutex);
42 }