From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Date: Tue, 15 May 2012 15:49:39 +0000 (+0000)
Subject: net: sh-eth: Add support Gigabit of SH7734
X-Git-Tag: v2012.07-rc1~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4398d55991eb3c2484a2a8e991d701e5d7a64874;p=u-boot

net: sh-eth: Add support Gigabit of SH7734

SH7734 support GMII. This add register infomation and the function
which enable GMII.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 3657bd695f..bb57e4d53a 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -348,7 +348,7 @@ static int sh_eth_phy_config(struct sh_eth_dev *eth)
 
 	phydev = phy_connect(
 			miiphy_get_dev_by_name(dev->name),
-			port_info->phy_addr, dev, PHY_INTERFACE_MODE_MII);
+			port_info->phy_addr, dev, CONFIG_SH_ETHER_PHY_MODE);
 	port_info->phydev = phydev;
 	phy_config(phydev);
 
@@ -405,6 +405,9 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
 	outl(TPAUSER_UNLIMITED, TPAUSER(port));
 #endif
 
+#if defined(CONFIG_CPU_SH7734)
+	outl(CONFIG_SH_ETHER_SH7734_MII, RMII_MII(port));
+#endif
 	/* Configure phy */
 	ret = sh_eth_phy_config(eth);
 	if (ret) {
@@ -434,6 +437,12 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
 		outl(0, RTRATE(port));
 #endif
 	}
+#if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734)
+	else if (phy->speed == 1000) {
+		printf(SHETHER_NAME ": 1000Base/");
+		outl(GECMR_1000B, GECMR(port));
+	}
+#endif
 
 	/* Check if full duplex mode is supported by the phy */
 	if (phy->duplex) {
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 475a9e154c..a1ba68b1b4 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -225,6 +225,7 @@ struct sh_eth_dev {
 #define GECMR(port)		(BASE_IO_ADDR + 0x05b0)
 #define MAHR(port)		(BASE_IO_ADDR + 0x05C0)
 #define MALR(port)		(BASE_IO_ADDR + 0x05C8)
+#define RMII_MII(port)  (BASE_IO_ADDR + 0x0790)
 
 #endif