| From b6c7ac07a8e3fd5d5e3b4e4a125e76bbb8ac7719 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Mon, 17 Jun 2013 23:39:44 +0400 |
| Subject: 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> |
| (cherry picked from commit 2c83322ce820bcf2d5e8265de831489076ee211e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bockw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index 394186c7..9936ad2e 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -144,7 +144,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", |
| -- |
| 1.8.4.3.gca3854a |
| |
