kernel: 5.10: Backport Armada 3720 comphy patches from 5.15
[openwrt/staging/jow.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 diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
21 index cc534a5c4b3b..6781488cfc58 100644
22 --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
23 +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
24 @@ -33,18 +33,12 @@
25 #define COMPHY_FW_MODE_USB3H 0x4
26 #define COMPHY_FW_MODE_USB3D 0x5
27 #define COMPHY_FW_MODE_PCIE 0x6
28 -#define COMPHY_FW_MODE_RXAUI 0x7
29 -#define COMPHY_FW_MODE_XFI 0x8
30 -#define COMPHY_FW_MODE_SFI 0x9
31 #define COMPHY_FW_MODE_USB3 0xa
32
33 #define COMPHY_FW_SPEED_1_25G 0 /* SGMII 1G */
34 #define COMPHY_FW_SPEED_2_5G 1
35 #define COMPHY_FW_SPEED_3_125G 2 /* 2500BASE-X */
36 #define COMPHY_FW_SPEED_5G 3
37 -#define COMPHY_FW_SPEED_5_15625G 4 /* XFI 5G */
38 -#define COMPHY_FW_SPEED_6G 5
39 -#define COMPHY_FW_SPEED_10_3125G 6 /* XFI 10G */
40 #define COMPHY_FW_SPEED_MAX 0x3F
41
42 #define COMPHY_FW_MODE(mode) ((mode) << 12)
43 --
44 2.34.1
45