| Message ID | 1374542285-19602-3-git-send-email-horms+renesas@verge.net.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Simon, On Tuesday 23 July 2013 10:18:05 Simon Horman wrote: > This is a copy of support for r8a7778/9 with the .rmiimode mode bit > of struct sh_eth_cpu_data set. > > Also update R8A7779 to R8A777x. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > v4 > * s/R8A7779/R8A777x/ as requested by Sergei Shtylyov. > > v3 > * Add r8a7790_data rather than updating r8a777x_data. > As requested by Sergei Shtylyov. > > v2 > * Split from "sh_eth: add support RMIIMODE register" > --- > drivers/net/ethernet/renesas/Kconfig | 2 +- > drivers/net/ethernet/renesas/sh_eth.c | 21 +++++++++++++++++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/renesas/Kconfig > b/drivers/net/ethernet/renesas/Kconfig index 19a8a04..a30c439 100644 > --- a/drivers/net/ethernet/renesas/Kconfig > +++ b/drivers/net/ethernet/renesas/Kconfig > @@ -13,4 +13,4 @@ config SH_ETH > Renesas SuperH Ethernet device driver. > This driver supporting CPUs are: > - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763, SH7757, > - R8A7740 and R8A7779. > + R8A7740, R8A777x and R8A7790. > diff --git a/drivers/net/ethernet/renesas/sh_eth.c > b/drivers/net/ethernet/renesas/sh_eth.c index 87af49f..fedc0a0 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c > @@ -393,6 +393,26 @@ static struct sh_eth_cpu_data r8a777x_data = { > .hw_swap = 1, > }; > > +/* R8A7790 */ > +static struct sh_eth_cpu_data r8a7790_data = { > + .set_duplex = sh_eth_set_duplex, > + .set_rate = sh_eth_set_rate_r8a777x, > + > + .ecsr_value = ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD, > + .ecsipr_value = ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | ECSIPR_ICDIP, > + .eesipr_value = 0x01ff009f, > + > + .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, > + .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE | > + EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, Is there a reason why the EESR_RFE bit isn't set in eesr_err_check (and thus ignored in the interrupt handler) but set in eesipr_value ? If it's just an omission I'll send a patch. > + > + .apr = 1, > + .mpr = 1, > + .tpauser = 1, > + .hw_swap = 1, > + .rmiimode = 1, > +}; > + > static void sh_eth_set_rate_sh7724(struct net_device *ndev) > { > struct sh_eth_private *mdp = netdev_priv(ndev); > @@ -2753,6 +2773,7 @@ static struct platform_device_id sh_eth_id_table[] = { > { "sh7763-gether", (kernel_ulong_t)&sh7763_data }, > { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data }, > { "r8a777x-ether", (kernel_ulong_t)&r8a777x_data }, > + { "r8a7790-ether", (kernel_ulong_t)&r8a7790_data }, > { } > }; > MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
On Tue, Jul 30, 2013 at 01:32:33AM +0200, Laurent Pinchart wrote: > Hi Simon, > > On Tuesday 23 July 2013 10:18:05 Simon Horman wrote: > > This is a copy of support for r8a7778/9 with the .rmiimode mode bit > > of struct sh_eth_cpu_data set. > > > > Also update R8A7779 to R8A777x. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > > --- > > > > v4 > > * s/R8A7779/R8A777x/ as requested by Sergei Shtylyov. > > > > v3 > > * Add r8a7790_data rather than updating r8a777x_data. > > As requested by Sergei Shtylyov. > > > > v2 > > * Split from "sh_eth: add support RMIIMODE register" > > --- > > drivers/net/ethernet/renesas/Kconfig | 2 +- > > drivers/net/ethernet/renesas/sh_eth.c | 21 +++++++++++++++++++++ > > 2 files changed, 22 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/renesas/Kconfig > > b/drivers/net/ethernet/renesas/Kconfig index 19a8a04..a30c439 100644 > > --- a/drivers/net/ethernet/renesas/Kconfig > > +++ b/drivers/net/ethernet/renesas/Kconfig > > @@ -13,4 +13,4 @@ config SH_ETH > > Renesas SuperH Ethernet device driver. > > This driver supporting CPUs are: > > - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763, SH7757, > > - R8A7740 and R8A7779. > > + R8A7740, R8A777x and R8A7790. > > diff --git a/drivers/net/ethernet/renesas/sh_eth.c > > b/drivers/net/ethernet/renesas/sh_eth.c index 87af49f..fedc0a0 100644 > > --- a/drivers/net/ethernet/renesas/sh_eth.c > > +++ b/drivers/net/ethernet/renesas/sh_eth.c > > @@ -393,6 +393,26 @@ static struct sh_eth_cpu_data r8a777x_data = { > > .hw_swap = 1, > > }; > > > > +/* R8A7790 */ > > +static struct sh_eth_cpu_data r8a7790_data = { > > + .set_duplex = sh_eth_set_duplex, > > + .set_rate = sh_eth_set_rate_r8a777x, > > + > > + .ecsr_value = ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD, > > + .ecsipr_value = ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | ECSIPR_ICDIP, > > + .eesipr_value = 0x01ff009f, > > + > > + .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, > > + .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE | > > + EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, > > Is there a reason why the EESR_RFE bit isn't set in eesr_err_check (and thus > ignored in the interrupt handler) but set in eesipr_value ? > > If it's just an omission I'll send a patch. I believe it is just an omission. > > + > > + .apr = 1, > > + .mpr = 1, > > + .tpauser = 1, > > + .hw_swap = 1, > > + .rmiimode = 1, > > +}; > > + > > static void sh_eth_set_rate_sh7724(struct net_device *ndev) > > { > > struct sh_eth_private *mdp = netdev_priv(ndev); > > @@ -2753,6 +2773,7 @@ static struct platform_device_id sh_eth_id_table[] = { > > { "sh7763-gether", (kernel_ulong_t)&sh7763_data }, > > { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data }, > > { "r8a777x-ether", (kernel_ulong_t)&r8a777x_data }, > > + { "r8a7790-ether", (kernel_ulong_t)&r8a7790_data }, > > { } > > }; > > MODULE_DEVICE_TABLE(platform, sh_eth_id_table); > > -- > Regards, > > Laurent Pinchart > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig index 19a8a04..a30c439 100644 --- a/drivers/net/ethernet/renesas/Kconfig +++ b/drivers/net/ethernet/renesas/Kconfig @@ -13,4 +13,4 @@ config SH_ETH Renesas SuperH Ethernet device driver. This driver supporting CPUs are: - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763, SH7757, - R8A7740 and R8A7779. + R8A7740, R8A777x and R8A7790. diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 87af49f..fedc0a0 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -393,6 +393,26 @@ static struct sh_eth_cpu_data r8a777x_data = { .hw_swap = 1, }; +/* R8A7790 */ +static struct sh_eth_cpu_data r8a7790_data = { + .set_duplex = sh_eth_set_duplex, + .set_rate = sh_eth_set_rate_r8a777x, + + .ecsr_value = ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD, + .ecsipr_value = ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | ECSIPR_ICDIP, + .eesipr_value = 0x01ff009f, + + .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, + .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE | + EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, + + .apr = 1, + .mpr = 1, + .tpauser = 1, + .hw_swap = 1, + .rmiimode = 1, +}; + static void sh_eth_set_rate_sh7724(struct net_device *ndev) { struct sh_eth_private *mdp = netdev_priv(ndev); @@ -2753,6 +2773,7 @@ static struct platform_device_id sh_eth_id_table[] = { { "sh7763-gether", (kernel_ulong_t)&sh7763_data }, { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data }, { "r8a777x-ether", (kernel_ulong_t)&r8a777x_data }, + { "r8a7790-ether", (kernel_ulong_t)&r8a7790_data }, { } }; MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
This is a copy of support for r8a7778/9 with the .rmiimode mode bit of struct sh_eth_cpu_data set. Also update R8A7779 to R8A777x. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- v4 * s/R8A7779/R8A777x/ as requested by Sergei Shtylyov. v3 * Add r8a7790_data rather than updating r8a777x_data. As requested by Sergei Shtylyov. v2 * Split from "sh_eth: add support RMIIMODE register" --- drivers/net/ethernet/renesas/Kconfig | 2 +- drivers/net/ethernet/renesas/sh_eth.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-)