sh_eth: get SH77{34|63} support out of #ifdef

Get the SH77{34|63} specific code/data in the driver out of #ifdef by adding
"sh7734-gether" and "sh7763-gether" to the platform driver's ID table.  Note
that we have to split the 'struct sh_eth_cpu_data' instance into two due to
#ifdef inside it; note that we can kill the duplicate sh_eth_set_rate_gether().
Change the GEther 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>

3 files changed, 3 insertions, 3 deletions

diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c
index d71a0bcf8145..4d94dff9015c 100644
--- a/arch/sh/boards/board-espt.c
+++ b/arch/sh/boards/board-espt.c
@@ -85,7 +85,7 @@ static struct sh_eth_plat_data sh7763_eth_pdata = {
 };
 
 static struct platform_device espt_eth_device = {
-        .name       = "sh-eth",
+        .name       = "sh7763-gether",
         .resource   = sh_eth_resources,
         .num_resources  = ARRAY_SIZE(sh_eth_resources),
         .dev        = {
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c
index b7c75298dfb5..50ba481fa240 100644
--- a/arch/sh/boards/mach-sh7763rdp/setup.c
+++ b/arch/sh/boards/mach-sh7763rdp/setup.c
@@ -93,7 +93,7 @@ static struct sh_eth_plat_data sh7763_eth_pdata = {
 };
 
 static struct platform_device sh7763rdp_eth_device = {
-        .name       = "sh-eth",
+        .name       = "sh7763-gether",
         .resource   = sh_eth_resources,
         .num_resources  = ARRAY_SIZE(sh_eth_resources),
         .dev        = {
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7734.c b/arch/sh/kernel/cpu/sh4a/clock-sh7734.c
index deb683abacf0..ed9501519ab3 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7734.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7734.c
@@ -238,7 +238,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("adc0", &mstp_clks[MSTP313]),
         CLKDEV_CON_ID("mtu0", &mstp_clks[MSTP312]),
         CLKDEV_CON_ID("iebus0", &mstp_clks[MSTP304]),
-        CLKDEV_DEV_ID("sh-eth.0", &mstp_clks[MSTP114]),
+        CLKDEV_DEV_ID("sh7734-gether.0", &mstp_clks[MSTP114]),
         CLKDEV_CON_ID("rtc0", &mstp_clks[MSTP303]),
         CLKDEV_CON_ID("hif0", &mstp_clks[MSTP302]),
         CLKDEV_CON_ID("stif0", &mstp_clks[MSTP301]),