Skip to content

Commit

Permalink
ARM: shmobile: BOCK-W: change Ether device name
Browse files Browse the repository at this point in the history
When changing the name of Ether platform device in the commit c02f846 (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>
  • Loading branch information
Sergei Shtylyov authored and Simon Horman committed Jun 18, 2013
1 parent 1e0edb7 commit 2c83322
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-shmobile/board-bockw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 2c83322

Please sign in to comment.