ucc_geth.c: Fix upsmr setting in RMII mode

PATCH Applied Heiko Schocher 4 participants 4 messages Apr 21, 2009 – Apr 22, 2009

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Heiko Schocher

author

2009-04-21 09:34 UTC #0 lore raw

PATCH 1/1 ucc_geth.c: Fix upsmr setting in RMII mode

If using the UCC on a MPC8360 in RMII mode, don;t set UCC_GETH_UPSMR_RPM bit in the upsmr register.

Signed-off-by Heiko Schocher <[email protected]>

---
 drivers/net/ucc_geth.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

drivers/net/ucc_geth.c +2 -1

index d3f39e8..44f8392 100644
@@ -1394,7 +1394,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
-		upsmr |= UCC_GETH_UPSMR_RPM;
+		if (ugeth->phy_interface != PHY_INTERFACE_MODE_RMII)
+			upsmr |= UCC_GETH_UPSMR_RPM;
 		switch (ugeth->max_speed) {
 		case SPEED_10:
 			upsmr |= UCC_GETH_UPSMR_R10M;

Signature · 5 lines

1.6.0.6

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Li Yang

Acked-by on v1 1/1

2009-04-21 10:51 UTC #1 lore raw

Quoted 4 lines · Heiko Schocher

If using the UCC on a MPC8360 in RMII mode, don;t set UCC_GETH_UPSMR_RPM bit in the upsmr register.
Signed-off-by Heiko Schocher <[email protected]>

Acked-by Li Yang <[email protected]>

Quoted 18 lines

---
drivers/net/ucc_geth.c | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/ucc_geth.c +0 -0
index d3f39e8..44f8392 100644
@@ -1394,7 +1394,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
           (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
           (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
(ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
- upsmr |= UCC_GETH_UPSMR_RPM;
+ if (ugeth->phy_interface != PHY_INTERFACE_MODE_RMII)
+ upsmr |= UCC_GETH_UPSMR_RPM; switch (ugeth->max_speed) {
case SPEED_10:
upsmr |= UCC_GETH_UPSMR_R10M;

David Miller

maintainer Applied

2009-04-22 07:47 UTC #2 lore raw

From: Li Yang <[email protected]>
Date: Tue, 21 Apr 2009 18:51:11 +0800

Quoted 7 lines · Heiko Schocher

Quoted 4 lines
If using the UCC on a MPC8360 in RMII mode, don;t set UCC_GETH_UPSMR_RPM bit in the upsmr register.
Signed-off-by Heiko Schocher <[email protected]>
Acked-by Li Yang <[email protected]>

Applied, thanks.

Gridish Shlomi-RM96313

2009-04-21 11:23 UTC #3 lore raw

In reply to Heiko Schocher

It is correct.
Thanks

Quoted 39 lines

-----Original Message-----
From: Heiko Schocher [mailto:[email protected]]
Sent: Tuesday, April 21, 2009 11:37 AM
To: Li Yang-R58472
Cc: Gridish Shlomi-RM96313; Kumar Gala; [email protected]; [email protected]
Subject: [PATCH] [net, 83xx] ucc_geth.c: Fix upsmr setting in RMII mode
If using the UCC on a MPC8360 in RMII mode, don;t set UCC_GETH_UPSMR_RPM bit in the upsmr register.
Signed-off-by Heiko Schocher <[email protected]>
---
 drivers/net/ucc_geth.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/ucc_geth.c +2 -1
index d3f39e8..44f8392 100644
@@ -1394,7 +1394,8 @@ static int adjust_enet_interface(struct 
 ucc_geth_private *ugeth)
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
-		upsmr |= UCC_GETH_UPSMR_RPM;
+		if (ugeth->phy_interface != PHY_INTERFACE_MODE_RMII)
+			upsmr |= UCC_GETH_UPSMR_RPM;
 		switch (ugeth->max_speed) {
 		case SPEED_10:
upsmr |= UCC_GETH_UPSMR_R10M;
--
1.6.0.6
Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany