Commit 5db4f74e authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents a2bd4583 165bc5a4
...@@ -560,6 +560,8 @@ static struct sh_eth_cpu_data r7s72100_data = { ...@@ -560,6 +560,8 @@ static struct sh_eth_cpu_data r7s72100_data = {
EESR_TDE, EESR_TDE,
.fdr_value = 0x0000070f, .fdr_value = 0x0000070f,
.trscer_err_mask = DESC_I_RINT8 | DESC_I_RINT5,
.no_psr = 1, .no_psr = 1,
.apr = 1, .apr = 1,
.mpr = 1, .mpr = 1,
...@@ -780,6 +782,8 @@ static struct sh_eth_cpu_data r7s9210_data = { ...@@ -780,6 +782,8 @@ static struct sh_eth_cpu_data r7s9210_data = {
.fdr_value = 0x0000070f, .fdr_value = 0x0000070f,
.trscer_err_mask = DESC_I_RINT8 | DESC_I_RINT5,
.apr = 1, .apr = 1,
.mpr = 1, .mpr = 1,
.tpauser = 1, .tpauser = 1,
...@@ -1089,6 +1093,9 @@ static struct sh_eth_cpu_data sh771x_data = { ...@@ -1089,6 +1093,9 @@ static struct sh_eth_cpu_data sh771x_data = {
EESIPR_CEEFIP | EESIPR_CELFIP | EESIPR_CEEFIP | EESIPR_CELFIP |
EESIPR_RRFIP | EESIPR_RTLFIP | EESIPR_RTSFIP | EESIPR_RRFIP | EESIPR_RTLFIP | EESIPR_RTSFIP |
EESIPR_PREIP | EESIPR_CERFIP, EESIPR_PREIP | EESIPR_CERFIP,
.trscer_err_mask = DESC_I_RINT8,
.tsu = 1, .tsu = 1,
.dual_port = 1, .dual_port = 1,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment