FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-16 22:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sh_eth: get R8A7740 support out of #ifdef

Browse Source 
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>
This commit is contained in:
Sergei Shtylyov 2013-06-07 13:57:12 +00:00 committed by David S. Miller
parent c18a79abe3
commit e5c9b4cd66
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shmobile/board-armadillo800eva.c
View File

@ -377,7 +377,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,

2
arch/arm/mach-shmobile/clock-r8a7740.c
View File

@ -591,7 +591,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("sh_mobile_sdhi.2", &mstp_clks[MSTP415]),
CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]),

16
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -619,11 +619,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);
@ -634,7 +632,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);
@ -654,10 +652,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,
@ -680,7 +678,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,
@ -2701,6 +2698,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 },
{ }
};