From 7d7c3f16f088d57dbc8109347154036f4e0ab973 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Thu, 27 Sep 2012 09:19:34 +0000
Subject: [PATCH] --- yaml --- r: 328409 b: refs/heads/master c:
 342b7b741d76bc8aadeff844634348bb2a343d19 h: refs/heads/master i:   328407:
 d69164a1fba7b662fcc3b955a447778fa8b6d28e v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ethernet/ti/cpsw.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 54e524ee6be8..bef262dd48da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8112ec3b8722680251aecdcc23dfd81aa7af6340
+refs/heads/master: 342b7b741d76bc8aadeff844634348bb2a343d19
diff --git a/trunk/drivers/net/ethernet/ti/cpsw.c b/trunk/drivers/net/ethernet/ti/cpsw.c
index 0cbc0e59252c..df55e2403746 100644
--- a/trunk/drivers/net/ethernet/ti/cpsw.c
+++ b/trunk/drivers/net/ethernet/ti/cpsw.c
@@ -386,6 +386,11 @@ static void _cpsw_adjust_link(struct cpsw_slave *slave,
 			mac_control |= BIT(7);	/* GIGABITEN	*/
 		if (phy->duplex)
 			mac_control |= BIT(0);	/* FULLDUPLEXEN	*/
+
+		/* set speed_in input in case RMII mode is used in 100Mbps */
+		if (phy->speed == 100)
+			mac_control |= BIT(15);
+
 		*link = true;
 	} else {
 		mac_control = 0;