pinctrl: sh-pfc: Retain TDSELCTRL register across suspend/resume
PATCH v3 1/1 pinctrl: sh-pfc: Retain TDSELCTRL register across suspend/resume
From: Marek Vasut <[email protected]>
The TDSELCTRL register is responsible for configuring the SDHI/MMC clock return path delay and may be adjusted by the bootloader. Retain the value across suspend/resume to prevent hardware instability after resume.
To: [email protected]
---
V2: Add D3 TDSELCTRL register
V3: Wrap tdsel register into ioctrl regs
--- drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 2 ++ drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 10 ++++++++++ 8 files changed, 24 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c +2 -0
@@ -5547,10 +5547,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {enum ioctrl_regs {POCCTRL , +TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL ] = {0xe6060380 , }, + [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a7795.c +2 -0
@@ -5897,10 +5897,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {enum ioctrl_regs {POCCTRL , +TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL ] = {0xe6060380 , }, + [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a7796.c +2 -0
@@ -5855,10 +5855,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {enum ioctrl_regs {POCCTRL , +TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL ] = {0xe6060380 , }, + [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a77965.c +2 -0
@@ -6012,10 +6012,12 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {enum ioctrl_regs {POCCTRL , +TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL ] = {0xe6060380 , }, + [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +2 -0
@@ -2409,12 +2409,14 @@ enum ioctrl_regs {POCCTRL0 ,POCCTRL1 ,POCCTRL2 , + TDSELCTRL, };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL0 ] = {0xe6060380 }, [POCCTRL1 ] = {0xe6060384 }, [POCCTRL2 ] = {0xe6060388 }, + [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +2 -0
@@ -2832,6 +2832,7 @@ enum ioctrl_regs {POCCTRL1 ,POCCTRL2 ,POCCTRL3 , + TDSELCTRL, }; static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {
@@ -2839,6 +2840,7 @@ static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL1] = { 0xe6060384, }, [POCCTRL2] = { 0xe6060388, }, [POCCTRL3] = { 0xe606038c, }, + [TDSELCTRL] = { 0xe60603c0, }, { /* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a77990.c +2 -0
@@ -4996,10 +4996,12 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {enum ioctrl_regs {POCCTRL0 , +TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL0 ] = {0xe6060380 , }, + [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
drivers/pinctrl/sh-pfc/pfc-r8a77995.c +10 -0
@@ -2833,6 +2833,15 @@ static int r8a77995_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, u32 *poreturn bit; } +enum ioctrl_regs { +TDSELCTRL , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [TDSELCTRL ] = {0xe60603c0 , }, + {/* sentinel */ }, +}; +static const struct sh_pfc_soc_operations r8a77995_pinmux_ops = { .pin_to_pocctrl = r8a77995_pin_to_pocctrl, };
@@ -2852,6 +2861,7 @@ const struct sh_pfc_soc_info r8a77995_pinmux_info = { .nr_functions = ARRAY_SIZE(pinmux_functions), .cfg_regs = pinmux_config_regs, + .ioctrl_regs = pinmux_ioctrl_regs, .pinmux_data = pinmux_data, .pinmux_data_size = ARRAY_SIZE(pinmux_data),
Signature · 1 line
2.19.2
Quoted 12 lines · On Sat, Feb 23, 2019 at 11:40 PM <[email protected]> wrote:
From: Marek Vasut <[email protected]>
The TDSELCTRL register is responsible for configuring the SDHI/MMC clock return path delay and may be adjusted by the bootloader. Retain the value across suspend/resume to prevent hardware instability after resume.
Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Linus Walleij <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>
Quoted 4 lines
To: [email protected]
---
V2: Add D3 TDSELCTRL register
V3: Wrap tdsel register into ioctrl regs
Thanks for the update!
i.e. will queue in sh-pfc-for-v5.2.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds