| From 1a92651a9dd29f035ce933d7d28ed800596d8acb Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Fri, 7 Jun 2013 13:58:18 +0000 |
| Subject: 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> |
| (cherry picked from commit f5d12767c8fd77e29d3d6771de59fd9ac3e540bb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/sh/boards/board-espt.c | 2 +- |
| arch/sh/boards/mach-sh7763rdp/setup.c | 2 +- |
| arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 2 +- |
| drivers/net/ethernet/renesas/sh_eth.c | 67 ++++++++++++++++++---------------- |
| 4 files changed, 39 insertions(+), 34 deletions(-) |
| |
| diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c |
| index d71a0bcf..4d94dff9 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 b7c75298..50ba481f 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 deb683ab..ed950151 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]), |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 403b055f..bdc3f20f 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -559,8 +559,7 @@ static struct sh_eth_cpu_data *sh_eth_get_cpu_data(struct sh_eth_private *mdp) |
| else |
| return &sh_eth_my_cpu_data; |
| } |
| - |
| -#elif defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763) |
| +#endif |
| |
| static void sh_eth_chip_reset(struct net_device *ndev) |
| { |
| @@ -571,7 +570,7 @@ static void sh_eth_chip_reset(struct net_device *ndev) |
| mdelay(1); |
| } |
| |
| -static void sh_eth_set_rate(struct net_device *ndev) |
| +static void sh_eth_set_rate_gether(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| |
| @@ -590,11 +589,40 @@ static void sh_eth_set_rate(struct net_device *ndev) |
| } |
| } |
| |
| -/* sh7763 */ |
| -static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| +/* SH7734 */ |
| +static struct sh_eth_cpu_data sh7734_data = { |
| .chip_reset = sh_eth_chip_reset, |
| .set_duplex = sh_eth_set_duplex, |
| - .set_rate = sh_eth_set_rate, |
| + .set_rate = sh_eth_set_rate_gether, |
| + |
| + .ecsr_value = ECSR_ICD | ECSR_MPD, |
| + .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP, |
| + .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, |
| + |
| + .tx_check = EESR_TC1 | EESR_FTC, |
| + .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ |
| + EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ |
| + EESR_ECI, |
| + .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ |
| + EESR_TFE, |
| + |
| + .apr = 1, |
| + .mpr = 1, |
| + .tpauser = 1, |
| + .bculr = 1, |
| + .hw_swap = 1, |
| + .no_trimd = 1, |
| + .no_ade = 1, |
| + .tsu = 1, |
| + .hw_crc = 1, |
| + .select_mii = 1, |
| +}; |
| + |
| +/* SH7763 */ |
| +static struct sh_eth_cpu_data sh7763_data = { |
| + .chip_reset = sh_eth_chip_reset, |
| + .set_duplex = sh_eth_set_duplex, |
| + .set_rate = sh_eth_set_rate_gether, |
| |
| .ecsr_value = ECSR_ICD | ECSR_MPD, |
| .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP, |
| @@ -615,14 +643,8 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| .no_trimd = 1, |
| .no_ade = 1, |
| .tsu = 1, |
| -#if defined(CONFIG_CPU_SUBTYPE_SH7734) |
| - .hw_crc = 1, |
| - .select_mii = 1, |
| -#else |
| .irq_flags = IRQF_SHARED, |
| -#endif |
| }; |
| -#endif |
| |
| static void sh_eth_chip_reset_r8a7740(struct net_device *ndev) |
| { |
| @@ -635,25 +657,6 @@ static void sh_eth_chip_reset_r8a7740(struct net_device *ndev) |
| sh_eth_select_mii(ndev); |
| } |
| |
| -static void sh_eth_set_rate_gether(struct net_device *ndev) |
| -{ |
| - struct sh_eth_private *mdp = netdev_priv(ndev); |
| - |
| - switch (mdp->speed) { |
| - case 10: /* 10BASE */ |
| - sh_eth_write(ndev, GECMR_10, GECMR); |
| - break; |
| - case 100:/* 100BASE */ |
| - sh_eth_write(ndev, GECMR_100, GECMR); |
| - break; |
| - case 1000: /* 1000BASE */ |
| - sh_eth_write(ndev, GECMR_1000, GECMR); |
| - break; |
| - default: |
| - break; |
| - } |
| -} |
| - |
| /* R8A7740 */ |
| static struct sh_eth_cpu_data r8a7740_data = { |
| .chip_reset = sh_eth_chip_reset_r8a7740, |
| @@ -2710,6 +2713,8 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = { |
| static struct platform_device_id sh_eth_id_table[] = { |
| { "sh7619-ether", (kernel_ulong_t)&sh7619_data }, |
| { "sh771x-ether", (kernel_ulong_t)&sh771x_data }, |
| + { "sh7734-gether", (kernel_ulong_t)&sh7734_data }, |
| + { "sh7763-gether", (kernel_ulong_t)&sh7763_data }, |
| { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data }, |
| { CARDNAME }, |
| { } |
| -- |
| 1.8.4.3.gca3854a |
| |