---

yaml --- r: 328409 b: refs/heads/master c: 342b7b7 h: refs/heads/master i: 328407: d69164a v: v3
git-mirror · Oct 1, 2012 · 7d7c3f1 · 7d7c3f1
1 parent d57aeab
commit 7d7c3f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;