ARM: shmobile: BOCK-W: change Ether device name
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Mon, 17 Jun 2013 19:39:44 +0000 (23:39 +0400)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 18 Jun 2013 07:22:45 +0000 (16:22 +0900)
When changing the name of Ether platform device in the commit c02f846938fe (ARM:
shmobile: r8a7778: fix Ether device name), I completely forgot that there's also
platform  device name used in bockw_pinctrl_map[], so the commit "ARM: shmobile:
BOCK-W: add Ether support" went in with the old "sh-eth" device name. Now change
it to "r8a777x-ether" in accordance with the commits that are now in  the  'net-
next.git' repository,  otherwise BOCK-W Ether support won't work in 3.11.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/board-bockw.c

index 7d48461478829822cc895ff6faab79139be1ac08..ce56381e0077ef16082816d64e2eed04439d5d1d 100644 (file)
@@ -142,7 +142,7 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
 
 static const struct pinctrl_map bockw_pinctrl_map[] = {
        /* Ether */
-       PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7778",
+       PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778",
                                  "ether_rmii", "ether"),
        /* HSPI0 */
        PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7778",