diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-11-11 23:23:36 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-11-24 01:14:32 -0500 |
commit | be15182068582bc38281329d86d106adaca63fda (patch) | |
tree | 9ff5b055b1ec1e92ad0ecb3a0c19fa8af0dcde0f | |
parent | 7d947813d4dbb8cfee0ed2c75b27f65cb2c54434 (diff) |
ARM: shmobile: r8a7779: cleanup registration of sh_eth
sh_eth driver which needs platform data at the time of
registration is not used.
Now, ARM/shmobile aims to support DT,
and the C code base board support will be removed
if DT support is completed.
Current driver registration method which needs platform data
and which is not shared complicates codes.
This means legacy C code cleanup after DT supporting
will be more complicated
This patch removes r8a7779_add_ether_device()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 20 |
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h index 1cab247ff255..5014145f272e 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/sh_clk.h> | 4 | #include <linux/sh_clk.h> |
5 | #include <linux/pm_domain.h> | 5 | #include <linux/pm_domain.h> |
6 | #include <linux/sh_eth.h> | ||
7 | 6 | ||
8 | /* HPB-DMA slave IDs */ | 7 | /* HPB-DMA slave IDs */ |
9 | enum { | 8 | enum { |
@@ -39,7 +38,6 @@ extern void r8a7779_earlytimer_init(void); | |||
39 | extern void r8a7779_add_early_devices(void); | 38 | extern void r8a7779_add_early_devices(void); |
40 | extern void r8a7779_add_standard_devices(void); | 39 | extern void r8a7779_add_standard_devices(void); |
41 | extern void r8a7779_add_standard_devices_dt(void); | 40 | extern void r8a7779_add_standard_devices_dt(void); |
42 | extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata); | ||
43 | extern void r8a7779_init_late(void); | 41 | extern void r8a7779_init_late(void); |
44 | extern void r8a7779_clock_init(void); | 42 | extern void r8a7779_clock_init(void); |
45 | extern void r8a7779_pinmux_init(void); | 43 | extern void r8a7779_pinmux_init(void); |
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index 51a43c52c611..8f9453152fb9 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c | |||
@@ -598,18 +598,6 @@ static struct platform_device ohci1_device = { | |||
598 | .resource = ohci1_resources, | 598 | .resource = ohci1_resources, |
599 | }; | 599 | }; |
600 | 600 | ||
601 | /* Ether */ | ||
602 | static struct resource ether_resources[] __initdata = { | ||
603 | { | ||
604 | .start = 0xfde00000, | ||
605 | .end = 0xfde003ff, | ||
606 | .flags = IORESOURCE_MEM, | ||
607 | }, { | ||
608 | .start = gic_iid(0xb4), | ||
609 | .flags = IORESOURCE_IRQ, | ||
610 | }, | ||
611 | }; | ||
612 | |||
613 | /* HPB-DMA */ | 601 | /* HPB-DMA */ |
614 | 602 | ||
615 | /* Asynchronous mode register bits */ | 603 | /* Asynchronous mode register bits */ |
@@ -798,14 +786,6 @@ void __init r8a7779_add_standard_devices(void) | |||
798 | r8a7779_register_hpb_dmae(); | 786 | r8a7779_register_hpb_dmae(); |
799 | } | 787 | } |
800 | 788 | ||
801 | void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata) | ||
802 | { | ||
803 | platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1, | ||
804 | ether_resources, | ||
805 | ARRAY_SIZE(ether_resources), | ||
806 | pdata, sizeof(*pdata)); | ||
807 | } | ||
808 | |||
809 | /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ | 789 | /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ |
810 | void __init __weak r8a7779_register_twd(void) { } | 790 | void __init __weak r8a7779_register_twd(void) { } |
811 | 791 | ||