summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2013-06-17 23:39:44 +0400
committerSimon Horman <horms+renesas@verge.net.au>2013-06-18 16:22:45 +0900
commit2c83322ce820bcf2d5e8265de831489076ee211e (patch)
treeb9e045c17043e39963b6e5c0b45184e5e9ebdce3
parent1e0edb76e925927d396be60e22f9c5ab815f2ab0 (diff)
downloadblackbird-op-linux-2c83322ce820bcf2d5e8265de831489076ee211e.tar.gz
blackbird-op-linux-2c83322ce820bcf2d5e8265de831489076ee211e.zip
ARM: shmobile: BOCK-W: change Ether device name
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>
-rw-r--r--arch/arm/mach-shmobile/board-bockw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 7d4846147882..ce56381e0077 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -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",
OpenPOWER on IntegriCloud