| From 29cfcc3507c5a5cf98537ae39b069e9cee6df975 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 8 Apr 2013 22:33:44 -0700 |
| Subject: ARM: shmobile: r8a7778: fixup Ether setup code position |
| |
| Ether setup code position was scattering. |
| This patch fixes it up |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 734e02f888c97e285ce3481dc6418b8dc27b22f4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/setup-r8a7778.c |
| --- |
| arch/arm/mach-shmobile/setup-r8a7778.c | 28 ++++++++++++++-------------- |
| 1 file changed, 14 insertions(+), 14 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c |
| index 1f36ecc3..06ead4a0 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7778.c |
| @@ -81,12 +81,6 @@ static struct sh_timer_config sh_tmu1_platform_data = { |
| .clocksource_rating = 200, |
| }; |
| |
| -/* Ether */ |
| -static struct resource ether_resources[] = { |
| - DEFINE_RES_MEM(0xfde00000, 0x400), |
| - DEFINE_RES_IRQ(gic_iid(0x89)), |
| -}; |
| - |
| #define r8a7778_register_tmu(idx) \ |
| platform_device_register_resndata( \ |
| &platform_bus, "sh_tmu", idx, \ |
| @@ -95,6 +89,20 @@ static struct resource ether_resources[] = { |
| &sh_tmu##idx##_platform_data, \ |
| sizeof(sh_tmu##idx##_platform_data)) |
| |
| +/* Ether */ |
| +static struct resource ether_resources[] = { |
| + DEFINE_RES_MEM(0xfde00000, 0x400), |
| + DEFINE_RES_IRQ(gic_iid(0x89)), |
| +}; |
| + |
| +void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata) |
| +{ |
| + platform_device_register_resndata(&platform_bus, "sh_eth", -1, |
| + ether_resources, |
| + ARRAY_SIZE(ether_resources), |
| + pdata, sizeof(*pdata)); |
| +} |
| + |
| /* PFC/GPIO */ |
| static struct resource pfc_resources[] = { |
| DEFINE_RES_MEM(0xfffc0000, 0x118), |
| @@ -165,14 +173,6 @@ void __init r8a7778_add_standard_devices(void) |
| r8a7778_register_tmu(1); |
| } |
| |
| -void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata) |
| -{ |
| - platform_device_register_resndata(&platform_bus, "sh_eth", -1, |
| - ether_resources, |
| - ARRAY_SIZE(ether_resources), |
| - pdata, sizeof(*pdata)); |
| -} |
| - |
| static struct renesas_intc_irqpin_config irqpin_platform_data = { |
| .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */ |
| .sense_bitfield_width = 2, |
| -- |
| 1.8.4.3.gca3854a |
| |