[PATCH v2 1/2] ARM: shmobile: r8a7778: fix Ether device name

[PATCH v2 1/2] ARM: shmobile: r8a7778: fix Ether device name

[Sergei Shtylyov]

While recasting commit 524219146a89aee5366326c225ccd71231419d89 (ARM: shmobile:
R8A7778: add Ether support), I made a typo in the platform device's name: used
underscore instead of hyphen.

However, there's now patch merged to net-next.git renaming the platform device
from "sh-eth" to "r8a777x-ehter", so it makes the most sense to change the name
straight to that one.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
The patch is atop of the 'renesas-next-20130607' tag of the 'renesas.git' tree
and the USB patches I have submitted earlier.

Changes in version 2:
- changed the platform device's name as in the patch merged to 'net-next.git';
- lowercased the SoC name in the subject.

 arch/arm/mach-shmobile/setup-r8a7778.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: renesas/arch/arm/mach-shmobile/setup-r8a7778.c
===================================================================
--- renesas.orig/arch/arm/mach-shmobile/setup-r8a7778.c
+++ renesas/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -196,7 +196,7 @@ static struct resource ether_resources[]
 
 void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata)
 {
-	platform_device_register_resndata(&platform_bus, "sh_eth", -1,
+	platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,
 					  ether_resources,
 					  ARRAY_SIZE(ether_resources),
 					  pdata, sizeof(*pdata));

[PATCH v2 1/2] ARM: shmobile: r8a7778: fix Ether device name

[Simon Horman]

On Sun, Jun 09, 2013 at 01:23:24AM +0400, Sergei Shtylyov wrote:
> While recasting commit 524219146a89aee5366326c225ccd71231419d89 (ARM: shmobile:
> R8A7778: add Ether support), I made a typo in the platform device's name: used
> underscore instead of hyphen.
> 
> However, there's now patch merged to net-next.git renaming the platform device
> from "sh-eth" to "r8a777x-ehter", so it makes the most sense to change the name
> straight to that one.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
> The patch is atop of the 'renesas-next-20130607' tag of the 'renesas.git' tree
> and the USB patches I have submitted earlier.
> 
> Changes in version 2:
> - changed the platform device's name as in the patch merged to 'net-next.git';
> - lowercased the SoC name in the subject.

Thanks, I have queued this up in the soc2 branch.
My current plan is to let that branch sit in next for a few
days and then send a pull-request for it to be included in v3.11.

[PATCH v2 1/2] ARM: shmobile: r8a7778: fix Ether device name

[Sergei Shtylyov]

Hello.

On 06/11/2013 11:48 AM, Simon Horman wrote:

>> While recasting commit 524219146a89aee5366326c225ccd71231419d89 (ARM: shmobile:
>> R8A7778: add Ether support), I made a typo in the platform device's name: used
>> underscore instead of hyphen.

>> However, there's now patch merged to net-next.git renaming the platform device
>> from "sh-eth" to "r8a777x-ehter", so it makes the most sense to change the name
>> straight to that one.

>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

>> ---
>> The patch is atop of the 'renesas-next-20130607' tag of the 'renesas.git' tree
>> and the USB patches I have submitted earlier.

>> Changes in version 2:
>> - changed the platform device's name as in the patch merged to 'net-next.git';
>> - lowercased the SoC name in the subject.

> Thanks, I have queued this up in the soc2 branch.
> My current plan is to let that branch sit in next for a few
> days and then send a pull-request for it to be included in v3.11.

     Could you then merge the BOCK-W Ether support too? The patch 
currently has some offsets applying to 'renesas-next-20130611v2', should 
I respin it?

WBR, Sergei

[PATCH v2 1/2] ARM: shmobile: r8a7778: fix Ether device name

[Simon Horman]

On Tue, Jun 11, 2013 at 11:49:40PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 06/11/2013 11:48 AM, Simon Horman wrote:
> 
> >>While recasting commit 524219146a89aee5366326c225ccd71231419d89 (ARM: shmobile:
> >>R8A7778: add Ether support), I made a typo in the platform device's name: used
> >>underscore instead of hyphen.
> 
> >>However, there's now patch merged to net-next.git renaming the platform device
> >>from "sh-eth" to "r8a777x-ehter", so it makes the most sense to change the name
> >>straight to that one.
> 
> >>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> >>---
> >>The patch is atop of the 'renesas-next-20130607' tag of the 'renesas.git' tree
> >>and the USB patches I have submitted earlier.
> 
> >>Changes in version 2:
> >>- changed the platform device's name as in the patch merged to 'net-next.git';
> >>- lowercased the SoC name in the subject.
> 
> >Thanks, I have queued this up in the soc2 branch.
> >My current plan is to let that branch sit in next for a few
> >days and then send a pull-request for it to be included in v3.11.
> 
>     Could you then merge the BOCK-W Ether support too? The patch
> currently has some offsets applying to 'renesas-next-20130611v2',
> should I respin it?

I think I should be able to take it as-is.
And I should be able to do so today or tomorrow.
I'll let you know if I need a re-spin after all.