On CPU port, Force 1000Mbit/s Full-duplex and link-up.


---

 net/dsa/mv88e6131.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c
index 374d46a..400473a 100644
--- a/net/dsa/mv88e6131.c
+++ b/net/dsa/mv88e6131.c
@@ -159,9 +159,13 @@ static int mv88e6131_setup_port(struct dsa_switch *ds, int p)
 
 	/*
 	 * MAC Forcing register: don't force link, speed, duplex
-	 * or flow control state to any particular values.
+	 * or flow control state to any particular values.  Unless
+	 * this is the CPU port, then force 1Gb/s and link-up.
 	 */
-	REG_WRITE(addr, 0x01, 0x0003);
+	if ((p == ds->cpu_port))
+		REG_WRITE(addr, 0x01, 0x003E);
+	else
+		REG_WRITE(addr, 0x01, 0x0003);
 
 	/*
 	 * Port Control: disable Core Tag, disable Drop-on-Lock,