summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido Piasenza <gpiasenza@soft-in.com>2014-04-22 16:28:03 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-04-23 16:08:23 +0200
commit34ce57e9df7d14b52c7613bb2c190e411ca99186 (patch)
tree8370359e86b8af8f43da9af5edf0dd0667214dc1
parent58968625c496c2e39545781915dbb848b38bd249 (diff)
downloadblackbird-op-linux-34ce57e9df7d14b52c7613bb2c190e411ca99186.tar.gz
blackbird-op-linux-34ce57e9df7d14b52c7613bb2c190e411ca99186.zip
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>
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7790.c3
1 files changed, 1 insertions, 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,
OpenPOWER on IntegriCloud