diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-04-09 01:33:44 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-07 01:24:43 -0400 |
commit | 734e02f888c97e285ce3481dc6418b8dc27b22f4 (patch) | |
tree | b03bf9ad7d9b63709c5f3f6889c8484a83e95c4c | |
parent | b6825a02fd3c43f2bd2e126fdbe9d83d6ca44f4e (diff) |
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>
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7778.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index 30b4a336308f..d6ee5211b452 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c | |||
@@ -80,12 +80,6 @@ static struct sh_timer_config sh_tmu1_platform_data = { | |||
80 | .clocksource_rating = 200, | 80 | .clocksource_rating = 200, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | /* Ether */ | ||
84 | static struct resource ether_resources[] = { | ||
85 | DEFINE_RES_MEM(0xfde00000, 0x400), | ||
86 | DEFINE_RES_IRQ(gic_iid(0x89)), | ||
87 | }; | ||
88 | |||
89 | #define r8a7778_register_tmu(idx) \ | 83 | #define r8a7778_register_tmu(idx) \ |
90 | platform_device_register_resndata( \ | 84 | platform_device_register_resndata( \ |
91 | &platform_bus, "sh_tmu", idx, \ | 85 | &platform_bus, "sh_tmu", idx, \ |
@@ -94,6 +88,20 @@ static struct resource ether_resources[] = { | |||
94 | &sh_tmu##idx##_platform_data, \ | 88 | &sh_tmu##idx##_platform_data, \ |
95 | sizeof(sh_tmu##idx##_platform_data)) | 89 | sizeof(sh_tmu##idx##_platform_data)) |
96 | 90 | ||
91 | /* Ether */ | ||
92 | static struct resource ether_resources[] = { | ||
93 | DEFINE_RES_MEM(0xfde00000, 0x400), | ||
94 | DEFINE_RES_IRQ(gic_iid(0x89)), | ||
95 | }; | ||
96 | |||
97 | void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata) | ||
98 | { | ||
99 | platform_device_register_resndata(&platform_bus, "sh_eth", -1, | ||
100 | ether_resources, | ||
101 | ARRAY_SIZE(ether_resources), | ||
102 | pdata, sizeof(*pdata)); | ||
103 | } | ||
104 | |||
97 | void __init r8a7778_add_standard_devices(void) | 105 | void __init r8a7778_add_standard_devices(void) |
98 | { | 106 | { |
99 | int i; | 107 | int i; |
@@ -118,14 +126,6 @@ void __init r8a7778_add_standard_devices(void) | |||
118 | r8a7778_register_tmu(1); | 126 | r8a7778_register_tmu(1); |
119 | } | 127 | } |
120 | 128 | ||
121 | void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata) | ||
122 | { | ||
123 | platform_device_register_resndata(&platform_bus, "sh_eth", -1, | ||
124 | ether_resources, | ||
125 | ARRAY_SIZE(ether_resources), | ||
126 | pdata, sizeof(*pdata)); | ||
127 | } | ||
128 | |||
129 | static struct renesas_intc_irqpin_config irqpin_platform_data = { | 129 | static struct renesas_intc_irqpin_config irqpin_platform_data = { |
130 | .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */ | 130 | .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */ |
131 | .sense_bitfield_width = 2, | 131 | .sense_bitfield_width = 2, |