| Message ID | 50971C56.1090409@renesas.com |
|---|---|
| State | Accepted |
| Delegated to: | Joe Hershberger |
| Headers | show |
On Mon, Nov 5, 2012 at 10:54 AM, Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com> wrote: > SH7752 has two fast ethernet controllers and two gigabit ethernet > controllers. It is similar to SH7757. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > --- > drivers/net/sh_eth.c | 4 ++-- > drivers/net/sh_eth.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c > index 2d9cc32..e6fc8c8 100644 > --- a/drivers/net/sh_eth.c > +++ b/drivers/net/sh_eth.c > @@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) > printf(SHETHER_NAME ": 100Base/"); > #if defined(SH_ETH_TYPE_GETHER) > sh_eth_write(eth, GECMR_100B, GECMR); > -#elif defined(CONFIG_CPU_SH7757) > +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) > sh_eth_write(eth, 1, RTRATE); > #elif defined(CONFIG_CPU_SH7724) > val = ECMR_RTM; > @@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) > printf(SHETHER_NAME ": 10Base/"); > #if defined(SH_ETH_TYPE_GETHER) > sh_eth_write(eth, GECMR_10B, GECMR); > -#elif defined(CONFIG_CPU_SH7757) > +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) > sh_eth_write(eth, 0, RTRATE); > #endif > } > diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h > index 61d2df9..568fafe 100644 > --- a/drivers/net/sh_eth.h > +++ b/drivers/net/sh_eth.h > @@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { > #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) > #define SH_ETH_TYPE_GETHER > #define BASE_IO_ADDR 0xfee00000 > -#elif defined(CONFIG_CPU_SH7757) > +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) > #if defined(CONFIG_SH_ETHER_USE_GETHER) > #define SH_ETH_TYPE_GETHER > #define BASE_IO_ADDR 0xfee00000 > @@ -346,7 +346,7 @@ enum DMAC_T_BIT { > > /* GECMR */ > enum GECMR_BIT { > -#if defined(CONFIG_CPU_SH7757) > +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) > GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00, > #else > GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00, > -- > 1.7.1 Best regards, Nobuhiro
Hi, Joe. Please pick this patch for your repository. Best regards, Nobuhiro On Mon, Nov 12, 2012 at 2:52 PM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote: > On Mon, Nov 5, 2012 at 10:54 AM, Shimoda, Yoshihiro > <yoshihiro.shimoda.uh@renesas.com> wrote: >> SH7752 has two fast ethernet controllers and two gigabit ethernet >> controllers. It is similar to SH7757. >> >> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > > Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > >> --- >> drivers/net/sh_eth.c | 4 ++-- >> drivers/net/sh_eth.h | 4 ++-- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c >> index 2d9cc32..e6fc8c8 100644 >> --- a/drivers/net/sh_eth.c >> +++ b/drivers/net/sh_eth.c >> @@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) >> printf(SHETHER_NAME ": 100Base/"); >> #if defined(SH_ETH_TYPE_GETHER) >> sh_eth_write(eth, GECMR_100B, GECMR); >> -#elif defined(CONFIG_CPU_SH7757) >> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >> sh_eth_write(eth, 1, RTRATE); >> #elif defined(CONFIG_CPU_SH7724) >> val = ECMR_RTM; >> @@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) >> printf(SHETHER_NAME ": 10Base/"); >> #if defined(SH_ETH_TYPE_GETHER) >> sh_eth_write(eth, GECMR_10B, GECMR); >> -#elif defined(CONFIG_CPU_SH7757) >> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >> sh_eth_write(eth, 0, RTRATE); >> #endif >> } >> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h >> index 61d2df9..568fafe 100644 >> --- a/drivers/net/sh_eth.h >> +++ b/drivers/net/sh_eth.h >> @@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { >> #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) >> #define SH_ETH_TYPE_GETHER >> #define BASE_IO_ADDR 0xfee00000 >> -#elif defined(CONFIG_CPU_SH7757) >> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >> #if defined(CONFIG_SH_ETHER_USE_GETHER) >> #define SH_ETH_TYPE_GETHER >> #define BASE_IO_ADDR 0xfee00000 >> @@ -346,7 +346,7 @@ enum DMAC_T_BIT { >> >> /* GECMR */ >> enum GECMR_BIT { >> -#if defined(CONFIG_CPU_SH7757) >> +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >> GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00, >> #else >> GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00, >> -- >> 1.7.1 > > Best regards, > Nobuhiro > > -- > Nobuhiro Iwamatsu > iwamatsu at {nigauri.org / debian.org} > GPG ID: 40AD1FA6
Hi On Wed, Dec 12, 2012 at 12:37 AM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote: > Hi, Joe. > > Please pick this patch for your repository. Sure thing. Did you recently assign it to me in patchwork? I don't remember seeing it when I pulled patches a few days back. -Joe > Best regards, > Nobuhiro > > On Mon, Nov 12, 2012 at 2:52 PM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote: >> On Mon, Nov 5, 2012 at 10:54 AM, Shimoda, Yoshihiro >> <yoshihiro.shimoda.uh@renesas.com> wrote: >>> SH7752 has two fast ethernet controllers and two gigabit ethernet >>> controllers. It is similar to SH7757. >>> >>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> >> >> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> >> >>> --- >>> drivers/net/sh_eth.c | 4 ++-- >>> drivers/net/sh_eth.h | 4 ++-- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c >>> index 2d9cc32..e6fc8c8 100644 >>> --- a/drivers/net/sh_eth.c >>> +++ b/drivers/net/sh_eth.c >>> @@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) >>> printf(SHETHER_NAME ": 100Base/"); >>> #if defined(SH_ETH_TYPE_GETHER) >>> sh_eth_write(eth, GECMR_100B, GECMR); >>> -#elif defined(CONFIG_CPU_SH7757) >>> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>> sh_eth_write(eth, 1, RTRATE); >>> #elif defined(CONFIG_CPU_SH7724) >>> val = ECMR_RTM; >>> @@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) >>> printf(SHETHER_NAME ": 10Base/"); >>> #if defined(SH_ETH_TYPE_GETHER) >>> sh_eth_write(eth, GECMR_10B, GECMR); >>> -#elif defined(CONFIG_CPU_SH7757) >>> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>> sh_eth_write(eth, 0, RTRATE); >>> #endif >>> } >>> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h >>> index 61d2df9..568fafe 100644 >>> --- a/drivers/net/sh_eth.h >>> +++ b/drivers/net/sh_eth.h >>> @@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { >>> #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) >>> #define SH_ETH_TYPE_GETHER >>> #define BASE_IO_ADDR 0xfee00000 >>> -#elif defined(CONFIG_CPU_SH7757) >>> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>> #if defined(CONFIG_SH_ETHER_USE_GETHER) >>> #define SH_ETH_TYPE_GETHER >>> #define BASE_IO_ADDR 0xfee00000 >>> @@ -346,7 +346,7 @@ enum DMAC_T_BIT { >>> >>> /* GECMR */ >>> enum GECMR_BIT { >>> -#if defined(CONFIG_CPU_SH7757) >>> +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>> GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00, >>> #else >>> GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00, >>> -- >>> 1.7.1 >> >> Best regards, >> Nobuhiro >> >> -- >> Nobuhiro Iwamatsu >> iwamatsu at {nigauri.org / debian.org} >> GPG ID: 40AD1FA6 > > > > -- > Nobuhiro Iwamatsu > iwamatsu at {nigauri.org / debian.org} > GPG ID: 40AD1FA6
Hi, Thanks. I set assign to you in patchwork. But first, this was set to me. Best regards, Nobuhiro On Wed, Dec 12, 2012 at 4:23 PM, Joe Hershberger <joe.hershberger@gmail.com> wrote: > Hi > > On Wed, Dec 12, 2012 at 12:37 AM, Nobuhiro Iwamatsu > <iwamatsu@nigauri.org> wrote: >> Hi, Joe. >> >> Please pick this patch for your repository. > > Sure thing. Did you recently assign it to me in patchwork? I don't > remember seeing it when I pulled patches a few days back. > > -Joe > >> Best regards, >> Nobuhiro >> >> On Mon, Nov 12, 2012 at 2:52 PM, Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote: >>> On Mon, Nov 5, 2012 at 10:54 AM, Shimoda, Yoshihiro >>> <yoshihiro.shimoda.uh@renesas.com> wrote: >>>> SH7752 has two fast ethernet controllers and two gigabit ethernet >>>> controllers. It is similar to SH7757. >>>> >>>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> >>> >>> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> >>> >>>> --- >>>> drivers/net/sh_eth.c | 4 ++-- >>>> drivers/net/sh_eth.h | 4 ++-- >>>> 2 files changed, 4 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c >>>> index 2d9cc32..e6fc8c8 100644 >>>> --- a/drivers/net/sh_eth.c >>>> +++ b/drivers/net/sh_eth.c >>>> @@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) >>>> printf(SHETHER_NAME ": 100Base/"); >>>> #if defined(SH_ETH_TYPE_GETHER) >>>> sh_eth_write(eth, GECMR_100B, GECMR); >>>> -#elif defined(CONFIG_CPU_SH7757) >>>> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>>> sh_eth_write(eth, 1, RTRATE); >>>> #elif defined(CONFIG_CPU_SH7724) >>>> val = ECMR_RTM; >>>> @@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) >>>> printf(SHETHER_NAME ": 10Base/"); >>>> #if defined(SH_ETH_TYPE_GETHER) >>>> sh_eth_write(eth, GECMR_10B, GECMR); >>>> -#elif defined(CONFIG_CPU_SH7757) >>>> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>>> sh_eth_write(eth, 0, RTRATE); >>>> #endif >>>> } >>>> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h >>>> index 61d2df9..568fafe 100644 >>>> --- a/drivers/net/sh_eth.h >>>> +++ b/drivers/net/sh_eth.h >>>> @@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { >>>> #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) >>>> #define SH_ETH_TYPE_GETHER >>>> #define BASE_IO_ADDR 0xfee00000 >>>> -#elif defined(CONFIG_CPU_SH7757) >>>> +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>>> #if defined(CONFIG_SH_ETHER_USE_GETHER) >>>> #define SH_ETH_TYPE_GETHER >>>> #define BASE_IO_ADDR 0xfee00000 >>>> @@ -346,7 +346,7 @@ enum DMAC_T_BIT { >>>> >>>> /* GECMR */ >>>> enum GECMR_BIT { >>>> -#if defined(CONFIG_CPU_SH7757) >>>> +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) >>>> GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00, >>>> #else >>>> GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00, >>>> -- >>>> 1.7.1 >>> >>> Best regards, >>> Nobuhiro >>> >>> -- >>> Nobuhiro Iwamatsu >>> iwamatsu at {nigauri.org / debian.org} >>> GPG ID: 40AD1FA6 >> >> >> >> -- >> Nobuhiro Iwamatsu >> iwamatsu at {nigauri.org / debian.org} >> GPG ID: 40AD1FA6
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 2d9cc32..e6fc8c8 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) printf(SHETHER_NAME ": 100Base/"); #if defined(SH_ETH_TYPE_GETHER) sh_eth_write(eth, GECMR_100B, GECMR); -#elif defined(CONFIG_CPU_SH7757) +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) sh_eth_write(eth, 1, RTRATE); #elif defined(CONFIG_CPU_SH7724) val = ECMR_RTM; @@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) printf(SHETHER_NAME ": 10Base/"); #if defined(SH_ETH_TYPE_GETHER) sh_eth_write(eth, GECMR_10B, GECMR); -#elif defined(CONFIG_CPU_SH7757) +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) sh_eth_write(eth, 0, RTRATE); #endif } diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index 61d2df9..568fafe 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) #define SH_ETH_TYPE_GETHER #define BASE_IO_ADDR 0xfee00000 -#elif defined(CONFIG_CPU_SH7757) +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) #if defined(CONFIG_SH_ETHER_USE_GETHER) #define SH_ETH_TYPE_GETHER #define BASE_IO_ADDR 0xfee00000 @@ -346,7 +346,7 @@ enum DMAC_T_BIT { /* GECMR */ enum GECMR_BIT { -#if defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00, #else GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00,
SH7752 has two fast ethernet controllers and two gigabit ethernet controllers. It is similar to SH7757. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/net/sh_eth.c | 4 ++-- drivers/net/sh_eth.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)