kernel: bump 5.10 to 5.10.92
[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 851-v5.15-0002-phy-marvell-phy-mvebu-a3700-comphy-Remove-unsupporte.patch
1 From e1dbe9ecf621b6f71f3d2df3e50731d583f3d27f Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
3 Date: Fri, 27 Aug 2021 11:27:53 +0200
4 Subject: [PATCH] phy: marvell: phy-mvebu-a3700-comphy: Remove unsupported
5 modes
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 Armada 3700 does not support RXAUI, XFI and neither SFI. Remove unused
11 macros for these unsupported modes.
12
13 Signed-off-by: Pali Rohár <pali@kernel.org>
14 Fixes: 9695375a3f4a ("phy: add A3700 COMPHY support")
15 Signed-off-by: David S. Miller <davem@davemloft.net>
16 ---
17 drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 6 ------
18 1 file changed, 6 deletions(-)
19
20 --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
21 +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
22 @@ -33,18 +33,12 @@
23 #define COMPHY_FW_MODE_USB3H 0x4
24 #define COMPHY_FW_MODE_USB3D 0x5
25 #define COMPHY_FW_MODE_PCIE 0x6
26 -#define COMPHY_FW_MODE_RXAUI 0x7
27 -#define COMPHY_FW_MODE_XFI 0x8
28 -#define COMPHY_FW_MODE_SFI 0x9
29 #define COMPHY_FW_MODE_USB3 0xa
30
31 #define COMPHY_FW_SPEED_1_25G 0 /* SGMII 1G */
32 #define COMPHY_FW_SPEED_2_5G 1
33 #define COMPHY_FW_SPEED_3_125G 2 /* 2500BASE-X */
34 #define COMPHY_FW_SPEED_5G 3
35 -#define COMPHY_FW_SPEED_5_15625G 4 /* XFI 5G */
36 -#define COMPHY_FW_SPEED_6G 5
37 -#define COMPHY_FW_SPEED_10_3125G 6 /* XFI 10G */
38 #define COMPHY_FW_SPEED_MAX 0x3F
39
40 #define COMPHY_FW_MODE(mode) ((mode) << 12)