| From b010d4f7b043ec9fd27b49f9dbbd2ba764e6f50d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 30 Apr 2021 14:31:00 +0200 |
| Subject: pinctrl: renesas: r8a7796: Add missing bias for PRESET# pin |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| [ Upstream commit 2cee31cd49733e89dfedf4f68a56839fc2e42040 ] |
| |
| R-Car Gen3 Hardware Manual Errata for Rev. 0.52 of Nov 30, 2016, added |
| the configuration bit for bias pull-down control for the PRESET# pin on |
| R-Car M3-W. Add driver support for controlling pull-down on this pin. |
| |
| Fixes: 2d40bd24274d2577 ("pinctrl: sh-pfc: r8a7796: Add bias pinconf support") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Reviewed-by: Niklas Sรถderlund <niklas.soderlund+renesas@ragnatech.se> |
| Link: https://lore.kernel.org/r/c479de5b3f235c2f7d5faea9e7e08e6fccb135df.1619785375.git.geert+renesas@glider.be |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/pinctrl/renesas/pfc-r8a7796.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c |
| index 55f0344a3d3e..3878d6b0db14 100644 |
| --- a/drivers/pinctrl/renesas/pfc-r8a7796.c |
| +++ b/drivers/pinctrl/renesas/pfc-r8a7796.c |
| @@ -68,6 +68,7 @@ |
| PIN_NOGP_CFG(QSPI1_MOSI_IO0, "QSPI1_MOSI_IO0", fn, CFG_FLAGS), \ |
| PIN_NOGP_CFG(QSPI1_SPCLK, "QSPI1_SPCLK", fn, CFG_FLAGS), \ |
| PIN_NOGP_CFG(QSPI1_SSL, "QSPI1_SSL", fn, CFG_FLAGS), \ |
| + PIN_NOGP_CFG(PRESET_N, "PRESET#", fn, SH_PFC_PIN_CFG_PULL_DOWN),\ |
| PIN_NOGP_CFG(RPC_INT_N, "RPC_INT#", fn, CFG_FLAGS), \ |
| PIN_NOGP_CFG(RPC_RESET_N, "RPC_RESET#", fn, CFG_FLAGS), \ |
| PIN_NOGP_CFG(RPC_WP_N, "RPC_WP#", fn, CFG_FLAGS), \ |
| @@ -6109,7 +6110,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { |
| [ 4] = RCAR_GP_PIN(6, 29), /* USB30_OVC */ |
| [ 5] = RCAR_GP_PIN(6, 30), /* GP6_30 */ |
| [ 6] = RCAR_GP_PIN(6, 31), /* GP6_31 */ |
| - [ 7] = SH_PFC_PIN_NONE, |
| + [ 7] = PIN_PRESET_N, /* PRESET# */ |
| [ 8] = SH_PFC_PIN_NONE, |
| [ 9] = SH_PFC_PIN_NONE, |
| [10] = SH_PFC_PIN_NONE, |
| -- |
| 2.30.2 |
| |
