| From faa6abde94a12913a84854002327e0407633fa44 Mon Sep 17 00:00:00 2001 |
| From: Phil Edworthy <phil.edworthy@renesas.com> |
| Date: Mon, 3 Jun 2013 08:52:28 +0100 |
| Subject: pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry |
| |
| The list of functions selected by the MOD_SEL2 register was missing |
| an entry. This caused all entries after this to modify the MOD_SEL2 |
| register incorrectly. |
| |
| This bug showed up when selecting i2c2_c pins on the Renesas Hurricane board. |
| |
| This bug has been present since pinmux support was added for the |
| r8a7779 SoC by 881023d28b465eb457067dc8bbca0f24d8b34279 ("sh-pfc: Add |
| r8a7779 pinmux support") in v3.8-rc4. |
| |
| Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit b9ffcc2b12301eaf726ac24c93de01017ffea178) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c |
| index 96bdf480..8e22ca6c 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c |
| @@ -3768,7 +3768,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { |
| /* SEL_SCIF [2] */ |
| FN_SEL_SCIF_0, FN_SEL_SCIF_1, FN_SEL_SCIF_2, FN_SEL_SCIF_3, |
| /* SEL_CANCLK [2] */ |
| - FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2, |
| + FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2, 0, |
| /* SEL_CAN0 [1] */ |
| FN_SEL_CAN0_0, FN_SEL_CAN0_1, |
| /* SEL_HSCIF1 [1] */ |
| -- |
| 1.8.4.3.gca3854a |
| |
