fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
From 4e0243e7128c9b25ea2739136076a95d6adaba5e Mon Sep 17 00:00:00 2001
|
|
From: Frank <Frank.Sae@motor-comm.com>
|
|
Date: Fri, 4 Nov 2022 16:44:41 +0800
|
|
Subject: [PATCH] net: phy: fix yt8521 duplicated argument to & or |
|
|
|
|
cocci warnings: (new ones prefixed by >>)
|
|
>> drivers/net/phy/motorcomm.c:1122:8-35: duplicated argument to & or |
|
|
drivers/net/phy/motorcomm.c:1126:8-35: duplicated argument to & or |
|
|
drivers/net/phy/motorcomm.c:1130:8-34: duplicated argument to & or |
|
|
drivers/net/phy/motorcomm.c:1134:8-34: duplicated argument to & or |
|
|
|
|
The second YT8521_RC1R_GE_TX_DELAY_xx should be YT8521_RC1R_FE_TX_DELAY_xx.
|
|
|
|
Fixes: 70479a40954c ("net: phy: Add driver for Motorcomm yt8521 gigabit ethernet phy")
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
|
|
Signed-off-by: Frank <Frank.Sae@motor-comm.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/motorcomm.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/motorcomm.c
|
|
+++ b/drivers/net/phy/motorcomm.c
|
|
@@ -1119,19 +1119,19 @@ static int yt8521_config_init(struct phy
|
|
|
|
switch (phydev->interface) {
|
|
case PHY_INTERFACE_MODE_RGMII:
|
|
- val = YT8521_RC1R_GE_TX_DELAY_DIS | YT8521_RC1R_GE_TX_DELAY_DIS;
|
|
+ val = YT8521_RC1R_GE_TX_DELAY_DIS | YT8521_RC1R_FE_TX_DELAY_DIS;
|
|
val |= YT8521_RC1R_RX_DELAY_DIS;
|
|
break;
|
|
case PHY_INTERFACE_MODE_RGMII_RXID:
|
|
- val = YT8521_RC1R_GE_TX_DELAY_DIS | YT8521_RC1R_GE_TX_DELAY_DIS;
|
|
+ val = YT8521_RC1R_GE_TX_DELAY_DIS | YT8521_RC1R_FE_TX_DELAY_DIS;
|
|
val |= YT8521_RC1R_RX_DELAY_EN;
|
|
break;
|
|
case PHY_INTERFACE_MODE_RGMII_TXID:
|
|
- val = YT8521_RC1R_GE_TX_DELAY_EN | YT8521_RC1R_GE_TX_DELAY_EN;
|
|
+ val = YT8521_RC1R_GE_TX_DELAY_EN | YT8521_RC1R_FE_TX_DELAY_EN;
|
|
val |= YT8521_RC1R_RX_DELAY_DIS;
|
|
break;
|
|
case PHY_INTERFACE_MODE_RGMII_ID:
|
|
- val = YT8521_RC1R_GE_TX_DELAY_EN | YT8521_RC1R_GE_TX_DELAY_EN;
|
|
+ val = YT8521_RC1R_GE_TX_DELAY_EN | YT8521_RC1R_FE_TX_DELAY_EN;
|
|
val |= YT8521_RC1R_RX_DELAY_EN;
|
|
break;
|
|
case PHY_INTERFACE_MODE_SGMII:
|