Commit e5c9b4cd authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c18a79ab
...@@ -377,7 +377,7 @@ static struct resource sh_eth_resources[] = { ...@@ -377,7 +377,7 @@ static struct resource sh_eth_resources[] = {
}; };
static struct platform_device sh_eth_device = { static struct platform_device sh_eth_device = {
.name = "sh-eth", .name = "r8a7740-gether",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &sh_eth_platdata, .platform_data = &sh_eth_platdata,
......
...@@ -591,7 +591,7 @@ static struct clk_lookup lookups[] = { ...@@ -591,7 +591,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("e6860000.sdhi", &mstp_clks[MSTP313]), CLKDEV_DEV_ID("e6860000.sdhi", &mstp_clks[MSTP313]),
CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]), CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]),
CLKDEV_DEV_ID("e6bd0000.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("sh_mobile_sdhi.2", &mstp_clks[MSTP415]),
CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]), CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]),
......
...@@ -619,11 +619,9 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { ...@@ -619,11 +619,9 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.irq_flags = IRQF_SHARED, .irq_flags = IRQF_SHARED,
#endif #endif
}; };
#endif
static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)
#elif defined(CONFIG_ARCH_R8A7740)
static void sh_eth_chip_reset(struct net_device *ndev)
{ {
struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_private *mdp = netdev_priv(ndev);
...@@ -634,7 +632,7 @@ static void sh_eth_chip_reset(struct net_device *ndev) ...@@ -634,7 +632,7 @@ static void sh_eth_chip_reset(struct net_device *ndev)
sh_eth_select_mii(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); struct sh_eth_private *mdp = netdev_priv(ndev);
...@@ -654,10 +652,10 @@ static void sh_eth_set_rate(struct net_device *ndev) ...@@ -654,10 +652,10 @@ static void sh_eth_set_rate(struct net_device *ndev)
} }
/* R8A7740 */ /* R8A7740 */
static struct sh_eth_cpu_data sh_eth_my_cpu_data = { static struct sh_eth_cpu_data r8a7740_data = {
.chip_reset = sh_eth_chip_reset, .chip_reset = sh_eth_chip_reset_r8a7740,
.set_duplex = sh_eth_set_duplex, .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, .ecsr_value = ECSR_ICD | ECSR_MPD,
.ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP, .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
...@@ -680,7 +678,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { ...@@ -680,7 +678,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.tsu = 1, .tsu = 1,
.select_mii = 1, .select_mii = 1,
}; };
#endif
static struct sh_eth_cpu_data sh7619_data = { static struct sh_eth_cpu_data sh7619_data = {
.eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
...@@ -2701,6 +2698,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = { ...@@ -2701,6 +2698,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = {
static struct platform_device_id sh_eth_id_table[] = { static struct platform_device_id sh_eth_id_table[] = {
{ "sh7619-ether", (kernel_ulong_t)&sh7619_data }, { "sh7619-ether", (kernel_ulong_t)&sh7619_data },
{ "sh771x-ether", (kernel_ulong_t)&sh771x_data }, { "sh771x-ether", (kernel_ulong_t)&sh771x_data },
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ CARDNAME }, { CARDNAME },
{ } { }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment