mirror of https://gitee.com/openkylin/linux.git
sh_eth: get R8A777x support out of #ifdef
Get the R-Car code/data in the driver out of #ifdef by adding "r8a777x-ether" to the platfrom driver's ID table; since it's the last #ifdef, we remove CARDNAME from the ID table and no longer check the driver data before assigning it to 'mdp->cd'... Change the Ether 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:
parent
9c3beaabb9
commit
589ebdef7e
|
@ -77,7 +77,7 @@ static struct clk mstp_clks[MSTP_NR] = {
|
||||||
|
|
||||||
static struct clk_lookup lookups[] = {
|
static struct clk_lookup lookups[] = {
|
||||||
/* MSTP32 clocks */
|
/* MSTP32 clocks */
|
||||||
CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */
|
CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */
|
||||||
CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
|
CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
|
||||||
CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
|
CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
|
||||||
CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
|
CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
|
||||||
|
|
|
@ -163,7 +163,7 @@ static struct clk_lookup lookups[] = {
|
||||||
/* MSTP32 clocks */
|
/* MSTP32 clocks */
|
||||||
CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */
|
CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */
|
||||||
CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */
|
CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */
|
||||||
CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */
|
CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */
|
||||||
CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
|
CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
|
||||||
CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */
|
CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */
|
||||||
CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
|
CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
|
||||||
|
|
|
@ -356,8 +356,7 @@ static void __maybe_unused sh_eth_set_duplex(struct net_device *ndev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* There is CPU dependent code */
|
/* There is CPU dependent code */
|
||||||
#if defined(CONFIG_ARCH_R8A7778) || defined(CONFIG_ARCH_R8A7779)
|
static void sh_eth_set_rate_r8a777x(struct net_device *ndev)
|
||||||
static void sh_eth_set_rate(struct net_device *ndev)
|
|
||||||
{
|
{
|
||||||
struct sh_eth_private *mdp = netdev_priv(ndev);
|
struct sh_eth_private *mdp = netdev_priv(ndev);
|
||||||
|
|
||||||
|
@ -374,9 +373,9 @@ static void sh_eth_set_rate(struct net_device *ndev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* R8A7778/9 */
|
/* R8A7778/9 */
|
||||||
static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
|
static struct sh_eth_cpu_data r8a777x_data = {
|
||||||
.set_duplex = sh_eth_set_duplex,
|
.set_duplex = sh_eth_set_duplex,
|
||||||
.set_rate = sh_eth_set_rate,
|
.set_rate = sh_eth_set_rate_r8a777x,
|
||||||
|
|
||||||
.ecsr_value = ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD,
|
.ecsr_value = ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD,
|
||||||
.ecsipr_value = ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | ECSIPR_ICDIP,
|
.ecsipr_value = ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | ECSIPR_ICDIP,
|
||||||
|
@ -392,7 +391,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
|
||||||
.tpauser = 1,
|
.tpauser = 1,
|
||||||
.hw_swap = 1,
|
.hw_swap = 1,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
static void sh_eth_set_rate_sh7724(struct net_device *ndev)
|
static void sh_eth_set_rate_sh7724(struct net_device *ndev)
|
||||||
{
|
{
|
||||||
|
@ -2566,8 +2564,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
|
||||||
mdp->reg_offset = sh_eth_get_register_offset(pd->register_type);
|
mdp->reg_offset = sh_eth_get_register_offset(pd->register_type);
|
||||||
|
|
||||||
/* set cpu data */
|
/* set cpu data */
|
||||||
mdp->cd = &sh_eth_my_cpu_data;
|
|
||||||
if (id->driver_data)
|
|
||||||
mdp->cd = (struct sh_eth_cpu_data *)id->driver_data;
|
mdp->cd = (struct sh_eth_cpu_data *)id->driver_data;
|
||||||
sh_eth_set_default_cpu_data(mdp->cd);
|
sh_eth_set_default_cpu_data(mdp->cd);
|
||||||
|
|
||||||
|
@ -2692,7 +2688,7 @@ static struct platform_device_id sh_eth_id_table[] = {
|
||||||
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
|
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
|
||||||
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
|
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
|
||||||
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
|
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
|
||||||
{ CARDNAME },
|
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
|
MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
|
||||||
|
|
Loading…
Reference in New Issue