| Message ID | 4FEA7213.1070302@renesas.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Joe Hershberger |
| Headers | show |
Tested-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> 2012/6/27 Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>: > 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 <yoshihiro.shimoda.uh@renesas.com> > --- > drivers/net/sh_eth.h | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h > index 13003ec..3703c55 100644 > --- a/drivers/net/sh_eth.h > +++ b/drivers/net/sh_eth.h > @@ -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*/ > -- > 1.7.1
Hi Yoshihiro, On Tue, Jun 26, 2012 at 9:38 PM, Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com> wrote: > 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 <yoshihiro.shimoda.uh@renesas.com> > --- Applied to next, thanks. -Joe
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index 13003ec..3703c55 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -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*/
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 <yoshihiro.shimoda.uh@renesas.com> --- drivers/net/sh_eth.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)