* [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position
@ 2013-04-09 5:33 Kuninori Morimoto
2013-04-09 7:59 ` Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kuninori Morimoto @ 2013-04-09 5:33 UTC (permalink / raw)
To: linux-sh
Ether setup code position was scattering.
This patch fixes it up
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
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 30b4a33..d6ee521 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 = {
.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, \
@@ -94,6 +88,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));
+}
+
void __init r8a7778_add_standard_devices(void)
{
int i;
@@ -118,14 +126,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.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position
2013-04-09 5:33 [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position Kuninori Morimoto
@ 2013-04-09 7:59 ` Simon Horman
2013-04-09 12:19 ` Sergei Shtylyov
2013-04-09 15:12 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-04-09 7:59 UTC (permalink / raw)
To: linux-sh
On Mon, Apr 08, 2013 at 10:33:44PM -0700, Kuninori Morimoto wrote:
> Ether setup code position was scattering.
> This patch fixes it up
Thanks, queued-up in the shc-r8a7778 branch.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> 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 30b4a33..d6ee521 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 = {
> .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, \
> @@ -94,6 +88,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,
BTW, s/sh_eth/sh-eth/ ? Also for r8a7778?
> + ether_resources,
> + ARRAY_SIZE(ether_resources),
> + pdata, sizeof(*pdata));
> +}
> +
> void __init r8a7778_add_standard_devices(void)
> {
> int i;
> @@ -118,14 +126,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.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position
2013-04-09 5:33 [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position Kuninori Morimoto
2013-04-09 7:59 ` Simon Horman
@ 2013-04-09 12:19 ` Sergei Shtylyov
2013-04-09 15:12 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2013-04-09 12:19 UTC (permalink / raw)
To: linux-sh
Hello.
On 09-04-2013 11:59, Simon Horman wrote:
>> Ether setup code position was scattering.
>> This patch fixes it up
> Thanks, queued-up in the shc-r8a7778 branch.
>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> ---
>> 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 30b4a33..d6ee521 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 = {
[...]
>> +/* 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,
> BTW, s/sh_eth/sh-eth/ ? Also for r8a7778?
Yes, sorry for this mistake, I'll fix it. Unfortunately, I couldn't test it...
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position
2013-04-09 5:33 [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position Kuninori Morimoto
2013-04-09 7:59 ` Simon Horman
2013-04-09 12:19 ` Sergei Shtylyov
@ 2013-04-09 15:12 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-04-09 15:12 UTC (permalink / raw)
To: linux-sh
On Tue, Apr 09, 2013 at 04:19:16PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 09-04-2013 11:59, Simon Horman wrote:
>
> >>Ether setup code position was scattering.
> >>This patch fixes it up
>
> >Thanks, queued-up in the shc-r8a7778 branch.
>
> >>Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >>---
> >> 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 30b4a33..d6ee521 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 = {
> [...]
> >>+/* 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,
>
> >BTW, s/sh_eth/sh-eth/ ? Also for r8a7778?
>
> Yes, sorry for this mistake, I'll fix it. Unfortunately, I couldn't test it...
No problem, its an easy mistake to make.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-09 15:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-09 5:33 [RFC][PATCH 2/4] ARM: shmobile: r8a7778: fixup Ether setup code position Kuninori Morimoto
2013-04-09 7:59 ` Simon Horman
2013-04-09 12:19 ` Sergei Shtylyov
2013-04-09 15:12 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox