Skip to content

Commit

Permalink
sh_eth: get SH7619 support out of #ifdef
Browse files Browse the repository at this point in the history
Get  the SH7619 data in the driver out of #ifdef by adding "sh7619-ether" to the
platform driver's ID table. Change the Ether platform device's name  in  the SH
platform code accordingly.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sergei Shtylyov authored and David S. Miller committed Jun 8, 2013
1 parent 7bbe150 commit c18a79a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions arch/sh/kernel/cpu/sh2/setup-sh7619.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ static struct resource eth_resources[] = {
};

static struct platform_device eth_device = {
.name = "sh-eth",
.id = -1,
.name = "sh7619-ether",
.id = -1,
.dev = {
.platform_data = (void *)1,
},
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/renesas/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,17 +680,16 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.tsu = 1,
.select_mii = 1,
};
#endif

#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
static struct sh_eth_cpu_data sh7619_data = {
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,

.apr = 1,
.mpr = 1,
.tpauser = 1,
.hw_swap = 1,
};
#endif

static struct sh_eth_cpu_data sh771x_data = {
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
Expand Down Expand Up @@ -2700,6 +2699,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = {
#endif

static struct platform_device_id sh_eth_id_table[] = {
{ "sh7619-ether", (kernel_ulong_t)&sh7619_data },
{ "sh771x-ether", (kernel_ulong_t)&sh771x_data },
{ CARDNAME },
{ }
Expand Down

0 comments on commit c18a79a

Please sign in to comment.