Commit 572de270 authored by David S. Miller's avatar David S. Miller

Merge branch 'sh_eth-RPADIR-related-clean-ups'

Sergei Shtylyov says:

====================
sh_eth: RPADIR related clean-ups

Here's a set of 2 patches against DaveM's 'net-next.git' repo. They are
clean-ups related to RPADIR (DMA padding to NET_IP_ALIGN)...
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f533f6b 470103dc
...@@ -622,7 +622,6 @@ static struct sh_eth_cpu_data r7s72100_data = { ...@@ -622,7 +622,6 @@ static struct sh_eth_cpu_data r7s72100_data = {
.tpauser = 1, .tpauser = 1,
.hw_swap = 1, .hw_swap = 1,
.rpadir = 1, .rpadir = 1,
.rpadir_value = 2 << 16,
.no_trimd = 1, .no_trimd = 1,
.no_ade = 1, .no_ade = 1,
.xdfar_rw = 1, .xdfar_rw = 1,
...@@ -672,7 +671,6 @@ static struct sh_eth_cpu_data r8a7740_data = { ...@@ -672,7 +671,6 @@ static struct sh_eth_cpu_data r8a7740_data = {
.bculr = 1, .bculr = 1,
.hw_swap = 1, .hw_swap = 1,
.rpadir = 1, .rpadir = 1,
.rpadir_value = 2 << 16,
.no_trimd = 1, .no_trimd = 1,
.no_ade = 1, .no_ade = 1,
.xdfar_rw = 1, .xdfar_rw = 1,
...@@ -798,7 +796,6 @@ static struct sh_eth_cpu_data r8a77980_data = { ...@@ -798,7 +796,6 @@ static struct sh_eth_cpu_data r8a77980_data = {
.hw_swap = 1, .hw_swap = 1,
.nbst = 1, .nbst = 1,
.rpadir = 1, .rpadir = 1,
.rpadir_value = 2 << 16,
.no_trimd = 1, .no_trimd = 1,
.no_ade = 1, .no_ade = 1,
.xdfar_rw = 1, .xdfar_rw = 1,
...@@ -851,7 +848,6 @@ static struct sh_eth_cpu_data sh7724_data = { ...@@ -851,7 +848,6 @@ static struct sh_eth_cpu_data sh7724_data = {
.tpauser = 1, .tpauser = 1,
.hw_swap = 1, .hw_swap = 1,
.rpadir = 1, .rpadir = 1,
.rpadir_value = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
}; };
static void sh_eth_set_rate_sh7757(struct net_device *ndev) static void sh_eth_set_rate_sh7757(struct net_device *ndev)
...@@ -898,7 +894,6 @@ static struct sh_eth_cpu_data sh7757_data = { ...@@ -898,7 +894,6 @@ static struct sh_eth_cpu_data sh7757_data = {
.hw_swap = 1, .hw_swap = 1,
.no_ade = 1, .no_ade = 1,
.rpadir = 1, .rpadir = 1,
.rpadir_value = 2 << 16,
.rtrate = 1, .rtrate = 1,
.dual_port = 1, .dual_port = 1,
}; };
...@@ -978,7 +973,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = { ...@@ -978,7 +973,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
.bculr = 1, .bculr = 1,
.hw_swap = 1, .hw_swap = 1,
.rpadir = 1, .rpadir = 1,
.rpadir_value = 2 << 16,
.no_trimd = 1, .no_trimd = 1,
.no_ade = 1, .no_ade = 1,
.xdfar_rw = 1, .xdfar_rw = 1,
...@@ -1467,7 +1461,7 @@ static int sh_eth_dev_init(struct net_device *ndev) ...@@ -1467,7 +1461,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
/* Descriptor format */ /* Descriptor format */
sh_eth_ring_format(ndev); sh_eth_ring_format(ndev);
if (mdp->cd->rpadir) if (mdp->cd->rpadir)
sh_eth_write(ndev, mdp->cd->rpadir_value, RPADIR); sh_eth_write(ndev, NET_IP_ALIGN << 16, RPADIR);
/* all sh_eth int mask */ /* all sh_eth int mask */
sh_eth_write(ndev, 0, EESIPR); sh_eth_write(ndev, 0, EESIPR);
......
...@@ -403,8 +403,7 @@ enum DESC_I_BIT { ...@@ -403,8 +403,7 @@ enum DESC_I_BIT {
/* RPADIR */ /* RPADIR */
enum RPADIR_BIT { enum RPADIR_BIT {
RPADIR_PADS1 = 0x20000, RPADIR_PADS0 = 0x10000, RPADIR_PADS = 0x1f0000, RPADIR_PADR = 0xffff,
RPADIR_PADR = 0x0003f,
}; };
/* FDR */ /* FDR */
...@@ -488,7 +487,6 @@ struct sh_eth_cpu_data { ...@@ -488,7 +487,6 @@ struct sh_eth_cpu_data {
u32 ecsipr_value; u32 ecsipr_value;
u32 fdr_value; u32 fdr_value;
u32 fcftr_value; u32 fcftr_value;
u32 rpadir_value;
/* interrupt checking mask */ /* interrupt checking mask */
u32 tx_check; u32 tx_check;
......
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