Commit 7bbe150d authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afe391ad
......@@ -128,7 +128,7 @@ static struct resource sh_eth0_resources[] = {
};
static struct platform_device sh_eth0_device = {
.name = "sh-eth",
.name = "sh771x-ether",
.id = 0,
.dev = {
.platform_data = PHY_ID,
......@@ -151,7 +151,7 @@ static struct resource sh_eth1_resources[] = {
};
static struct platform_device sh_eth1_device = {
.name = "sh-eth",
.name = "sh771x-ether",
.id = 1,
.dev = {
.platform_data = PHY_ID,
......
......@@ -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 },
{ }
};
......
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