diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-01-15 11:52:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-15 14:09:37 -0500 |
| commit | 01fbd3f55cca25a6f9a4764d73da55615398c393 (patch) | |
| tree | a07fbbdcf6669e96299760819e65f7ee1ad10687 /drivers/net/ethernet/renesas | |
| parent | 9f6bd8fa5860fc7b041b10f2d463c78d65bdb59d (diff) | |
| download | linux-01fbd3f55cca25a6f9a4764d73da55615398c393.tar.gz linux-01fbd3f55cca25a6f9a4764d73da55615398c393.tar.xz | |
sh_eth: Fix addition of .trscer_err_mask to wrong SoC data
commit b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register") wanted
to add a .trscer_err_mask value to the R-Car Gen2 family-specific data
structure (r8a779x_data), but it was accidentally added to the
SH7724-specific data structure (sh7724_data).
Presumably this happened due to a patch conflict with commit
d407bc0203539031 ("sh-eth: Set fdr_value of R-Car SoCs"), which added
another field at the same position.
Move the field setting to fix this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 37583a9d8853..8d227d919e19 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -498,6 +498,8 @@ static struct sh_eth_cpu_data r8a779x_data = { EESR_ECI, .fdr_value = 0x00000f0f, + .trscer_err_mask = DESC_I_RINT8, + .apr = 1, .mpr = 1, .tpauser = 1, @@ -538,8 +540,6 @@ static struct sh_eth_cpu_data sh7724_data = { EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, - .trscer_err_mask = DESC_I_RINT8, - .apr = 1, .mpr = 1, .tpauser = 1, |