| From 8448f88cf46ac5d2b771073b913733d1be639c30 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Fri, 7 Jun 2013 13:57:12 +0000 |
| Subject: sh_eth: get R8A7740 support out of #ifdef |
| |
| Get the R8A7740 code/data in the driver out of #ifdef by adding "r8a7740-gether" |
| to the platform driver's ID table. Change the GEther platform device's name in |
| the ARM 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 e5c9b4cd665106d9b5397114ea81a53059410b6a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/clock-r8a7740.c |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +- |
| arch/arm/mach-shmobile/clock-r8a7740.c | 2 +- |
| drivers/net/ethernet/renesas/sh_eth.c | 16 +++++++--------- |
| 3 files changed, 9 insertions(+), 11 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index 2ef31a69..4b247407 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| @@ -379,7 +379,7 @@ static struct resource sh_eth_resources[] = { |
| }; |
| |
| static struct platform_device sh_eth_device = { |
| - .name = "sh-eth", |
| + .name = "r8a7740-gether", |
| .id = -1, |
| .dev = { |
| .platform_data = &sh_eth_platdata, |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c |
| index 664321c8..c826bca4 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7740.c |
| @@ -594,7 +594,7 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("e6860000.sdhi", &mstp_clks[MSTP313]), |
| CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]), |
| CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), |
| - CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP309]), |
| + CLKDEV_DEV_ID("r8a7740-gether", &mstp_clks[MSTP309]), |
| CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]), |
| CLKDEV_DEV_ID("renesas-tpu-pwm", &mstp_clks[MSTP304]), |
| CLKDEV_DEV_ID("e6600000.pwm", &mstp_clks[MSTP304]), |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 96ec5783..403b055f 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -622,11 +622,9 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| .irq_flags = IRQF_SHARED, |
| #endif |
| }; |
| +#endif |
| |
| - |
| -#elif defined(CONFIG_ARCH_R8A7740) |
| - |
| -static void sh_eth_chip_reset(struct net_device *ndev) |
| +static void sh_eth_chip_reset_r8a7740(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| |
| @@ -637,7 +635,7 @@ static void sh_eth_chip_reset(struct net_device *ndev) |
| sh_eth_select_mii(ndev); |
| } |
| |
| -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); |
| |
| @@ -657,10 +655,10 @@ static void sh_eth_set_rate(struct net_device *ndev) |
| } |
| |
| /* R8A7740 */ |
| -static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| - .chip_reset = sh_eth_chip_reset, |
| +static struct sh_eth_cpu_data r8a7740_data = { |
| + .chip_reset = sh_eth_chip_reset_r8a7740, |
| .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, |
| @@ -683,7 +681,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| .tsu = 1, |
| .select_mii = 1, |
| }; |
| -#endif |
| |
| static struct sh_eth_cpu_data sh7619_data = { |
| .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, |
| @@ -2713,6 +2710,7 @@ 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 }, |
| + { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data }, |
| { CARDNAME }, |
| { } |
| }; |
| -- |
| 1.8.4.3.gca3854a |
| |