| From 930f1337cf779ba1e69a516e8c70a6270413fa6f Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sat, 27 Jul 2013 03:46:33 +0400 |
| Subject: ARM: shmobile: BOCK-W: fix SDHI0 PFC settings |
| |
| The following message is printed on the BOCK-W kernel bootup: |
| |
| sh-pfc pfc-r8a7778: invalid group "sdhi0" for function "sdhi0" |
| |
| In addition, SD card cannot be detected. The reason is apparently that commit |
| ca7bb309485e4ec89a9addd47bea (ARM: shmobile: bockw: add SDHI0 support) matched |
| the previous version of commit 564617d2f92473031d035deb273da5 (sh-pfc: r8a7778: |
| add SDHI support). |
| |
| Add the missing pin groups according to the BOCK-W board schematics. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit fa3e0cee12fbdd9e0b03470b2b8cf968f537c161) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bockw.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index 9936ad2e..c7a0f9ba 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -165,7 +165,13 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { |
| "usb1", "usb1"), |
| /* SDHI0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", |
| - "sdhi0", "sdhi0"), |
| + "sdhi0_data4", "sdhi0"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", |
| + "sdhi0_ctrl", "sdhi0"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", |
| + "sdhi0_cd", "sdhi0"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", |
| + "sdhi0_wp", "sdhi0"), |
| }; |
| |
| #define FPGA 0x18200000 |
| -- |
| 1.8.4.3.gca3854a |
| |
