ARM: shmobile: BOCK-W: fix SDHI0 PFC settings

PATCH New Sergei Shtylyov 3 participants 4 messages Jul 26, 2013 – Jul 30, 2013

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Sergei Shtylyov

author

2013-07-26 23:46 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
The patch is atop of Simon's 'renesas.git' repo, 'renesas-devel-20130726' tag.

 arch/arm/mach-shmobile/board-bockw.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

arch/arm/mach-shmobile/board-bockw.c +7 -1

Index: renesas/arch/arm/mach-shmobile/board-bockw.c
===================================================================
@@ -167,7 +167,13 @@ static const struct pinctrl_map bockw_pi
 				  "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

Sergei Shtylyov

author

2013-07-26 23:55 UTC #1 lore raw

PATCH 1/1 ARM: shmobile: BOCK-W: fix SDHI0 PFC settings

Hello.

Quoted 9 lines · Sergei Shtylyov

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).

Quoted 6 lines

Add the missing pin groups according to the BOCK-W board schematics.
Signed-off-by Sergei Shtylyov <[email protected]>
---
The patch is atop of Simon's 'renesas.git' repo, 'renesas-devel-20130726' tag.

It also applies to the current Linus' tree cleanly. Please push it for 3.11.

WBR, Sergei

Kuninori Morimoto

2013-07-29 00:20 UTC #2 lore raw

PATCH 1/1 ARM: shmobile: BOCK-W: fix SDHI0 PFC settings

Hi Simon

Quoted 11 lines

Quoted 10 lines
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.

Quoted 8 lines

Quoted 4 lines
Signed-off-by Sergei Shtylyov <[email protected]>
---
The patch is atop of Simon's 'renesas.git' repo, 'renesas-devel-20130726' tag.
It also applies to the current Linus' tree cleanly. Please push it for 3.11.
WBR, Sergei

Something happen on patch.

Linux/master branch seems have old verion.

---- linux/master : old version -------------------------- commit ca7bb309485e4ec89a9addd47beaa1d079841b7d

Author: Kuninori Morimoto <[email protected]>
Date:   Wed Apr 17 05:17:56 2013 +0000

ARM: shmobile: bockw: add SDHI0 support

This patch is directly accessing to PUPR4 register which can control SDHI0 CD/WP pin pull-up setting.
It should be replaced in the future.

Signed-off-by Kuninori Morimoto <[email protected]>

Signed-off-by Simon Horman <[email protected]>

----------------------------------------------------------

This is the correct/latest version

----- correct version --------------------------------------------- commit c2ee46ab49ce3bb5a60b36940e70355beb409acf

Author: Kuninori Morimoto <[email protected]>
Date:   Thu Apr 18 20:09:32 2013 -0700

ARM: shmobile: bockw: add SDHI0 support

This patch is directly accessing to PUPR4 register which can control SDHI0 CD/WP pin pull-up setting.
It should be replaced in the future.

Signed-off-by Kuninori Morimoto <[email protected]>

Signed-off-by Simon Horman <[email protected]>

-------------------------------------------------------------------

Acked-by Kuninori Morimoto <[email protected]>

Best regards
---
Kuninori Morimoto

Simon Horman

2013-07-30 02:15 UTC #3 lore raw

PATCH 1/1 ARM: shmobile: BOCK-W: fix SDHI0 PFC settings

Quoted 16 lines · Kuninori Morimoto

Hi Simon
Quoted 13 lines
Quoted 12 lines
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 <[email protected]>

Quoted 8 lines

Quoted 6 lines
Quoted 2 lines
---
The patch is atop of Simon's 'renesas.git' repo, 'renesas-devel-20130726' tag.
It also applies to the current Linus' tree cleanly. Please push it for 3.11.
WBR, Sergei
Something happen on patch.

That something was probably me :(

Quoted 30 lines

Linux/master branch seems have old verion.
---- linux/master : old version -------------------------- commit ca7bb309485e4ec89a9addd47beaa1d079841b7d
Author: Kuninori Morimoto <[email protected]>
Date:   Wed Apr 17 05:17:56 2013 +0000
ARM: shmobile: bockw: add SDHI0 support
This patch is directly accessing to PUPR4 register which can control SDHI0 CD/WP pin pull-up setting.
It should be replaced in the future.
Signed-off-by Kuninori Morimoto <[email protected]>
Signed-off-by Simon Horman <[email protected]>
----------------------------------------------------------
This is the correct/latest version
----- correct version --------------------------------------------- commit c2ee46ab49ce3bb5a60b36940e70355beb409acf
Author: Kuninori Morimoto <[email protected]>
Date:   Thu Apr 18 20:09:32 2013 -0700
ARM: shmobile: bockw: add SDHI0 support
This patch is directly accessing to PUPR4 register which can control SDHI0 CD/WP pin pull-up setting.
It should be replaced in the future.

Quoted 5 lines

Signed-off-by Kuninori Morimoto <[email protected]>
Signed-off-by Simon Horman <[email protected]>
-------------------------------------------------------------------
Acked-by Kuninori Morimoto <[email protected]>

Thanks, I have queued this up for v3.11 in the fixes-for-v3.11 branch.