diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-01 13:22:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-01 13:22:34 -0800 |
| commit | 5db4f74ec86440fc8c9e391416f3b146d63fef9f (patch) | |
| tree | 0b48d83ff5c227db9f3c63280305cbf9fe131562 | |
| parent | a2bd45834e83d6c5a04d397bde13d744a4812dfc (diff) | |
| parent | 165bc5a4f30eee4735845aa7dbd6b738643f2603 (diff) | |
| download | linux-next-5db4f74ec86440fc8c9e391416f3b146d63fef9f.tar.gz | |
Merge branch 'sh_eth-masks'
Sergey Shtylyov says:
====================
Fix TRSCER masks in the Ether driver
Here are 3 patches against DaveM's 'net' repo. I'm fixing the TRSCER masks in
the driver to match the manuals...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 590b088bc4c7..f029c7c03804 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -560,6 +560,8 @@ static struct sh_eth_cpu_data r7s72100_data = { EESR_TDE, .fdr_value = 0x0000070f, + .trscer_err_mask = DESC_I_RINT8 | DESC_I_RINT5, + .no_psr = 1, .apr = 1, .mpr = 1, @@ -780,6 +782,8 @@ static struct sh_eth_cpu_data r7s9210_data = { .fdr_value = 0x0000070f, + .trscer_err_mask = DESC_I_RINT8 | DESC_I_RINT5, + .apr = 1, .mpr = 1, .tpauser = 1, @@ -1089,6 +1093,9 @@ static struct sh_eth_cpu_data sh771x_data = { EESIPR_CEEFIP | EESIPR_CELFIP | EESIPR_RRFIP | EESIPR_RTLFIP | EESIPR_RTSFIP | EESIPR_PREIP | EESIPR_CERFIP, + + .trscer_err_mask = DESC_I_RINT8, + .tsu = 1, .dual_port = 1, }; |