redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sh_eth: get SH771x support out of #ifdef 

Get the SH771[02] data in the driver out of #ifdef by adding "sh771x-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>
hifive-unleashed-5.1
Sergei Shtylyov 2013-06-07 13:55:08 +00:00 committed by David S. Miller
parent afe391ad4b
commit 7bbe150d8c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sh/boards/mach-se/770x/setup.c
View File

@ -128,8 +128,8 @@ static struct resource sh_eth0_resources[] = {
};
static struct platform_device sh_eth0_device = {
.name = "sh-eth",
.id = 0,
.name = "sh771x-ether",
.id = 0,
.dev = {
.platform_data = PHY_ID,
},
@ -151,8 +151,8 @@ static struct resource sh_eth1_resources[] = {
};
static struct platform_device sh_eth1_device = {
.name = "sh-eth",
.id = 1,
.name = "sh771x-ether",
.id = 1,
.dev = {
.platform_data = PHY_ID,
},

7
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -690,12 +690,12 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.tpauser = 1,
.hw_swap = 1,
};
#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
#endif
static struct sh_eth_cpu_data sh771x_data = {
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
.tsu = 1,
};
#endif
static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd)
{
@ -2700,6 +2700,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = {
#endif
static struct platform_device_id sh_eth_id_table[] = {
{ "sh771x-ether", (kernel_ulong_t)&sh771x_data },
{ CARDNAME },
{ }
};