summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2013-06-07 13:55:08 +0000
committerDavid S. Miller <davem@davemloft.net>2013-06-07 23:38:23 -0700
commit7bbe150d8c57c59689c8c50fd7b9915f4a7e10da (patch)
tree16d093fd26745564c9113a14a8830f96f1c8432a
parentafe391ad4b05f8f00ca955e165f3b37b480506b7 (diff)
downloadop-kernel-dev-7bbe150d8c57c59689c8c50fd7b9915f4a7e10da.zip
op-kernel-dev-7bbe150d8c57c59689c8c50fd7b9915f4a7e10da.tar.gz
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>
-rw-r--r--arch/sh/boards/mach-se/770x/setup.c8
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c7
2 files changed, 8 insertions, 7 deletions
diff --git a/arch/sh/boards/mach-se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c
index 9759d6b..658326f 100644
--- a/arch/sh/boards/mach-se/770x/setup.c
+++ b/arch/sh/boards/mach-se/770x/setup.c
@@ -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,
},
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index cf062de..f26546a 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -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 },
{ }
};
OpenPOWER on IntegriCloud