Commit 734e02f8 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman

ARM: shmobile: r8a7778: fixup Ether setup code position

Ether setup code position was scattering.
This patch fixes it up
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent b6825a02
...@@ -80,12 +80,6 @@ static struct sh_timer_config sh_tmu1_platform_data = { ...@@ -80,12 +80,6 @@ static struct sh_timer_config sh_tmu1_platform_data = {
.clocksource_rating = 200, .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) \ #define r8a7778_register_tmu(idx) \
platform_device_register_resndata( \ platform_device_register_resndata( \
&platform_bus, "sh_tmu", idx, \ &platform_bus, "sh_tmu", idx, \
...@@ -94,6 +88,20 @@ static struct resource ether_resources[] = { ...@@ -94,6 +88,20 @@ static struct resource ether_resources[] = {
&sh_tmu##idx##_platform_data, \ &sh_tmu##idx##_platform_data, \
sizeof(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));
}
void __init r8a7778_add_standard_devices(void) void __init r8a7778_add_standard_devices(void)
{ {
int i; int i;
...@@ -118,14 +126,6 @@ void __init r8a7778_add_standard_devices(void) ...@@ -118,14 +126,6 @@ void __init r8a7778_add_standard_devices(void)
r8a7778_register_tmu(1); 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 = { static struct renesas_intc_irqpin_config irqpin_platform_data = {
.irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */ .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
.sense_bitfield_width = 2, .sense_bitfield_width = 2,
......
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