aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sh_eth.h
diff options
context:
space:
mode:
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>2011-03-07 16:59:34 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-14 17:10:14 -0400
commit4986b996882d82c68ab54b822d7cfdd7dd35f19a (patch)
tree9bfe429b440788817946b3de9f616ef9a80495a5 /drivers/net/sh_eth.h
parent4a55530f38e4eeee3afb06093e81309138fe8360 (diff)
net: sh_eth: remove the SH_TSU_ADDR
The defination is hardcoded in this driver for some CPUs. This patch modifies to get resource of TSU address from platform_device. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sh_eth.h')
-rw-r--r--drivers/net/sh_eth.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 1510a7ca956a..35a3adbb2e7a 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -207,6 +207,7 @@ static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
207 [CEECR] = 0x0770, 207 [CEECR] = 0x0770,
208 [MAFCR] = 0x0778, 208 [MAFCR] = 0x0778,
209 209
210 [ARSTR] = 0x0000,
210 [TSU_CTRST] = 0x0004, 211 [TSU_CTRST] = 0x0004,
211 [TSU_FWEN0] = 0x0010, 212 [TSU_FWEN0] = 0x0010,
212 [TSU_FWEN1] = 0x0014, 213 [TSU_FWEN1] = 0x0014,
@@ -328,6 +329,7 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
328 [TPAUSER] = 0x01c4, 329 [TPAUSER] = 0x01c4,
329 [BCFR] = 0x01cc, 330 [BCFR] = 0x01cc,
330 331
332 [ARSTR] = 0x0000,
331 [TSU_CTRST] = 0x0004, 333 [TSU_CTRST] = 0x0004,
332 [TSU_FWEN0] = 0x0010, 334 [TSU_FWEN0] = 0x0010,
333 [TSU_FWEN1] = 0x0014, 335 [TSU_FWEN1] = 0x0014,
@@ -371,21 +373,6 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
371 373
372}; 374};
373 375
374#if defined(CONFIG_CPU_SUBTYPE_SH7763)
375/* This CPU register maps is very difference by other SH4 CPU */
376/* Chip Base Address */
377# define SH_TSU_ADDR 0xFEE01800
378# define ARSTR SH_TSU_ADDR
379#elif defined(CONFIG_CPU_SH4) /* #if defined(CONFIG_CPU_SUBTYPE_SH7763) */
380#else /* #elif defined(CONFIG_CPU_SH4) */
381/* This section is SH3 or SH2 */
382#ifndef CONFIG_CPU_SUBTYPE_SH7619
383/* Chip base address */
384# define SH_TSU_ADDR 0xA7000804
385# define ARSTR 0xA7000800
386#endif
387#endif /* CONFIG_CPU_SUBTYPE_SH7763 */
388
389/* Driver's parameters */ 376/* Driver's parameters */
390#if defined(CONFIG_CPU_SH4) 377#if defined(CONFIG_CPU_SH4)
391#define SH4_SKB_RX_ALIGN 32 378#define SH4_SKB_RX_ALIGN 32
@@ -770,6 +757,7 @@ struct sh_eth_cpu_data {
770 unsigned mpr:1; /* EtherC have MPR */ 757 unsigned mpr:1; /* EtherC have MPR */
771 unsigned tpauser:1; /* EtherC have TPAUSER */ 758 unsigned tpauser:1; /* EtherC have TPAUSER */
772 unsigned bculr:1; /* EtherC have BCULR */ 759 unsigned bculr:1; /* EtherC have BCULR */
760 unsigned tsu:1; /* EtherC have TSU */
773 unsigned hw_swap:1; /* E-DMAC have DE bit in EDMR */ 761 unsigned hw_swap:1; /* E-DMAC have DE bit in EDMR */
774 unsigned rpadir:1; /* E-DMAC have RPADIR */ 762 unsigned rpadir:1; /* E-DMAC have RPADIR */
775 unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */ 763 unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */