[PATCH] pinctrl: sh-pfc: r8a77990: Fix IOCTRL reg state after s2ram on R-Car E3

[PATCH] pinctrl: sh-pfc: r8a77990: Fix IOCTRL reg state after s2ram on R-Car E3

[Geert Uytterhoeven]

Due to an interaction with commit 9f2b76a2db3c4387 ("pinctrl: sh-pfc:
r8a77990: Add R8A774C0 PFC support"), the state of the I/O Control
Registers is saved/restored during s2ram on RZ/G2E, but not on R-Car E3.
Hence on R-Car E3, SDHI voltage state is lost after system resume.

Fix this by registering the I/O Control Registers on R-Car E3, too.

Fixes: 33847a71373cd6ae ("pinctrl: sh-pfc: r8a77990: Add voltage switch operations for SDHI")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
To be queued as a fix in sh-pfc-for-v4.21.

 drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
index 784d4400c3e0e7ea..d5b7a83e8b614370 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
@@ -5017,6 +5017,7 @@ const struct sh_pfc_soc_info r8a77990_pinmux_info = {
 
 	.cfg_regs = pinmux_config_regs,
 	.bias_regs = pinmux_bias_regs,
+	.ioctrl_regs = pinmux_ioctrl_regs,
 
 	.pinmux_data = pinmux_data,
 	.pinmux_data_size = ARRAY_SIZE(pinmux_data),
-- 
2.17.1

Re: [PATCH] pinctrl: sh-pfc: r8a77990: Fix IOCTRL reg state after s2ram on R-Car E3

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 685 bytes --]

On Thu, Dec 13, 2018 at 05:20:27PM +0100, Geert Uytterhoeven wrote:
> Due to an interaction with commit 9f2b76a2db3c4387 ("pinctrl: sh-pfc:
> r8a77990: Add R8A774C0 PFC support"), the state of the I/O Control
> Registers is saved/restored during s2ram on RZ/G2E, but not on R-Car E3.
> Hence on R-Car E3, SDHI voltage state is lost after system resume.
> 
> Fix this by registering the I/O Control Registers on R-Car E3, too.
> 
> Fixes: 33847a71373cd6ae ("pinctrl: sh-pfc: r8a77990: Add voltage switch operations for SDHI")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Obviously correct:

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] pinctrl: sh-pfc: r8a77990: Fix IOCTRL reg state after s2ram on R-Car E3

[Simon Horman]

On Thu, Dec 13, 2018 at 05:20:27PM +0100, Geert Uytterhoeven wrote:
> Due to an interaction with commit 9f2b76a2db3c4387 ("pinctrl: sh-pfc:
> r8a77990: Add R8A774C0 PFC support"), the state of the I/O Control
> Registers is saved/restored during s2ram on RZ/G2E, but not on R-Car E3.
> Hence on R-Car E3, SDHI voltage state is lost after system resume.
> 
> Fix this by registering the I/O Control Registers on R-Car E3, too.
> 
> Fixes: 33847a71373cd6ae ("pinctrl: sh-pfc: r8a77990: Add voltage switch operations for SDHI")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> To be queued as a fix in sh-pfc-for-v4.21.

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>