Skip to contentSkip to conversation

net: sh_eth: add support for SH7757's GETHER

PATCH New Shimoda 3 participants 3 messages Jun 27, 2012 – Jul 24, 2012 Network drivers

lore
Share & tools
lore

Shimoda

#0 lore raw

PATCH 4/4 net: sh_eth: add support for SH7757's GETHER

SH7757 has 2 ETHERs and 2 GETHERs. This patch supports the SH7757's GETHER. If CONFIG_SH_ETHER_USE_GETHER is defined using SH7757, the driver handles the GETHER.

Signed-off-by Yoshihiro Shimoda <[email protected]>
---
 drivers/net/sh_eth.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/net/sh_eth.h +9 -0
index 13003ec..3703c55 100644
@@ -282,8 +282,13 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
 #define SH_ETH_TYPE_GETHER
 #define BASE_IO_ADDR	0xfee00000
 #elif defined(CONFIG_CPU_SH7757)
+#if defined(CONFIG_SH_ETHER_USE_GETHER)
+#define SH_ETH_TYPE_GETHER
+#define BASE_IO_ADDR	0xfee00000
+#else
 #define SH_ETH_TYPE_ETHER
 #define BASE_IO_ADDR	0xfef00000
+#endif
 #elif defined(CONFIG_CPU_SH7724)
 #define SH_ETH_TYPE_ETHER
 #define BASE_IO_ADDR	0xA4600000

@@ -331,7 +336,11 @@ enum DMAC_T_BIT {
 
 /* GECMR */
 enum GECMR_BIT {
+#if defined(CONFIG_CPU_SH7757)
+	GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00,
+#else
 	GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00,
+#endif
 };
 
 /* EDRRR*/
Signature · 1 line
1.7.1
#1 lore raw

PATCH 4/4 net: sh_eth: add support for SH7757's GETHER

Tested-off-by Nobuhiro Iwamatsu <[email protected]>
Acked-by Nobuhiro Iwamatsu <[email protected]>

2012/6/27 Shimoda, Yoshihiro <[email protected]>:

Quoted 41 lines

SH7757 has 2 ETHERs and 2 GETHERs. This patch supports the SH7757's GETHER. If CONFIG_SH_ETHER_USE_GETHER is defined using SH7757, the driver handles the GETHER.

Signed-off-by Yoshihiro Shimoda <[email protected]>

---
?drivers/net/sh_eth.h | ? ?9 +++++++++
?1 files changed, 9 insertions(+), 0 deletions(-)

drivers/net/sh_eth.h +0 -0
index 13003ec..3703c55 100644
@@ -282,8 +282,13 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {

?#define SH_ETH_TYPE_GETHER
?#define BASE_IO_ADDR ? 0xfee00000
?#elif defined(CONFIG_CPU_SH7757)

drivers/net/sh_eth.h +4 -0
+#if defined(CONFIG_SH_ETHER_USE_GETHER)
+#define SH_ETH_TYPE_GETHER
+#define BASE_IO_ADDR ? 0xfee00000
+#else

?#define SH_ETH_TYPE_ETHER
?#define BASE_IO_ADDR ? 0xfef00000
+#endif
?#elif defined(CONFIG_CPU_SH7724)
?#define SH_ETH_TYPE_ETHER
?#define BASE_IO_ADDR ? 0xA4600000

drivers/net/sh_eth.h +0 -0
@@ -331,7 +336,11 @@ enum DMAC_T_BIT {

?/* GECMR */
?enum GECMR_BIT {

drivers/net/sh_eth.h +3 -0
+#if defined(CONFIG_CPU_SH7757)
+ ? ? ? GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00,
+#else

? ? ? ?GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00, +#endif
?};

?/* EDRRR*/
--
1.7.1

Signature · 1 line
Nobuhiro Iwamatsu
Applied
#2 lore raw

PATCH 4/4 net: sh_eth: add support for SH7757's GETHER

In reply to Shimoda

Hi Yoshihiro,

Quoted 6 lines · Yoshihiro

SH7757 has 2 ETHERs and 2 GETHERs. This patch supports the SH7757's GETHER. If CONFIG_SH_ETHER_USE_GETHER is defined using SH7757, the driver handles the GETHER.

Signed-off-by Yoshihiro Shimoda <[email protected]>

---

Applied to next, thanks.

-Joe