| From 1d1494a483e9b3aa65b6fa56561770c16f39c88f Mon Sep 17 00:00:00 2001 |
| From: Guido Piasenza <gpiasenza@soft-in.com> |
| Date: Tue, 22 Apr 2014 16:28:03 +0100 |
| Subject: sh-pfc: r8a7790: Fix definition of IPSR5 |
| |
| The extra entry in the table makes SCIFA0_B, and all |
| peripherals after it, fail. |
| |
| Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 34ce57e9df7d14b52c7613bb2c190e411ca99186) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c |
| index 48093719167a..f5cd3f961808 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c |
| @@ -4794,8 +4794,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { |
| FN_MSIOF0_SCK_B, 0, |
| /* IP5_23_21 [3] */ |
| FN_WE1_N, FN_IERX, FN_CAN1_RX, FN_VI1_G4, |
| - FN_VI1_G4_B, FN_VI2_R6, FN_SCIFA0_CTS_N_B, |
| - FN_IERX_C, 0, |
| + FN_VI1_G4_B, FN_VI2_R6, FN_SCIFA0_CTS_N_B, FN_IERX_C, |
| /* IP5_20_18 [3] */ |
| FN_WE0_N, FN_IECLK, FN_CAN_CLK, |
| FN_VI2_VSYNC_N, FN_SCIFA0_TXD_B, FN_VI2_VSYNC_N_B, 0, 0, |
| -- |
| 2.1.2 |
| |
