diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2017-04-04 16:20:16 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-04-05 03:41:29 -0400 |
| commit | 5f4c8cafe1148f8a91287072815df8f0b66f0e5c (patch) | |
| tree | b7de927a275f7f9aa9c50785f3938001dd3846f1 | |
| parent | 0cbdc11482d72ad164e33ef7cc57b01e8b61e40d (diff) | |
pinctrl: sh-pfc: r8a7794: Swap ATA signals
All R8A7794 manuals I have here (0.50 and 1.10) agree that the PFC driver
has ATAG0# and ATAWR0# signals in IPSR12 swapped -- fix this.
Fixes: 43c4436e2f18 ("pinctrl: sh-pfc: add R8A7794 PFC support")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c index ed734f560c84..ef093ac0cf2f 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c | |||
| @@ -281,8 +281,8 @@ enum { | |||
| 281 | FN_AVB_AVTP_CAPTURE, FN_ETH_CRS_DV_B, FN_SSI_WS1, FN_SCIF1_TXD_B, | 281 | FN_AVB_AVTP_CAPTURE, FN_ETH_CRS_DV_B, FN_SSI_WS1, FN_SCIF1_TXD_B, |
| 282 | FN_IIC1_SDA_C, FN_VI1_DATA0, FN_CAN0_TX_D, FN_AVB_AVTP_MATCH, | 282 | FN_IIC1_SDA_C, FN_VI1_DATA0, FN_CAN0_TX_D, FN_AVB_AVTP_MATCH, |
| 283 | FN_ETH_RX_ER_B, FN_SSI_SDATA1, FN_HSCIF1_HRX_B, FN_SDATA, FN_VI1_DATA1, | 283 | FN_ETH_RX_ER_B, FN_SSI_SDATA1, FN_HSCIF1_HRX_B, FN_SDATA, FN_VI1_DATA1, |
| 284 | FN_ATAG0_N, FN_ETH_RXD0_B, FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2, | 284 | FN_ATAWR0_N, FN_ETH_RXD0_B, FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2, |
| 285 | FN_MDATA, FN_ATAWR0_N, FN_ETH_RXD1_B, | 285 | FN_MDATA, FN_ATAG0_N, FN_ETH_RXD1_B, |
| 286 | 286 | ||
| 287 | /* IPSR13 */ | 287 | /* IPSR13 */ |
| 288 | FN_SSI_WS2, FN_HSCIF1_HCTS_N_B, FN_SCIFA0_RXD_D, FN_VI1_DATA3, FN_SCKZ, | 288 | FN_SSI_WS2, FN_HSCIF1_HCTS_N_B, FN_SCIFA0_RXD_D, FN_VI1_DATA3, FN_SCKZ, |
| @@ -575,8 +575,8 @@ enum { | |||
| 575 | ETH_CRS_DV_B_MARK, SSI_WS1_MARK, SCIF1_TXD_B_MARK, IIC1_SDA_C_MARK, | 575 | ETH_CRS_DV_B_MARK, SSI_WS1_MARK, SCIF1_TXD_B_MARK, IIC1_SDA_C_MARK, |
| 576 | VI1_DATA0_MARK, CAN0_TX_D_MARK, AVB_AVTP_MATCH_MARK, ETH_RX_ER_B_MARK, | 576 | VI1_DATA0_MARK, CAN0_TX_D_MARK, AVB_AVTP_MATCH_MARK, ETH_RX_ER_B_MARK, |
| 577 | SSI_SDATA1_MARK, HSCIF1_HRX_B_MARK, VI1_DATA1_MARK, SDATA_MARK, | 577 | SSI_SDATA1_MARK, HSCIF1_HRX_B_MARK, VI1_DATA1_MARK, SDATA_MARK, |
| 578 | ATAG0_N_MARK, ETH_RXD0_B_MARK, SSI_SCK2_MARK, HSCIF1_HTX_B_MARK, | 578 | ATAWR0_N_MARK, ETH_RXD0_B_MARK, SSI_SCK2_MARK, HSCIF1_HTX_B_MARK, |
| 579 | VI1_DATA2_MARK, MDATA_MARK, ATAWR0_N_MARK, ETH_RXD1_B_MARK, | 579 | VI1_DATA2_MARK, MDATA_MARK, ATAG0_N_MARK, ETH_RXD1_B_MARK, |
| 580 | 580 | ||
| 581 | /* IPSR13 */ | 581 | /* IPSR13 */ |
| 582 | SSI_WS2_MARK, HSCIF1_HCTS_N_B_MARK, SCIFA0_RXD_D_MARK, VI1_DATA3_MARK, | 582 | SSI_WS2_MARK, HSCIF1_HCTS_N_B_MARK, SCIFA0_RXD_D_MARK, VI1_DATA3_MARK, |
| @@ -1413,13 +1413,13 @@ static const u16 pinmux_data[] = { | |||
| 1413 | PINMUX_IPSR_MSEL(IP12_26_24, HSCIF1_HRX_B, SEL_HSCIF1_1), | 1413 | PINMUX_IPSR_MSEL(IP12_26_24, HSCIF1_HRX_B, SEL_HSCIF1_1), |
| 1414 | PINMUX_IPSR_GPSR(IP12_26_24, VI1_DATA1), | 1414 | PINMUX_IPSR_GPSR(IP12_26_24, VI1_DATA1), |
| 1415 | PINMUX_IPSR_MSEL(IP12_26_24, SDATA, SEL_FSN_0), | 1415 | PINMUX_IPSR_MSEL(IP12_26_24, SDATA, SEL_FSN_0), |
| 1416 | PINMUX_IPSR_GPSR(IP12_26_24, ATAG0_N), | 1416 | PINMUX_IPSR_GPSR(IP12_26_24, ATAWR0_N), |
| 1417 | PINMUX_IPSR_MSEL(IP12_26_24, ETH_RXD0_B, SEL_ETH_1), | 1417 | PINMUX_IPSR_MSEL(IP12_26_24, ETH_RXD0_B, SEL_ETH_1), |
| 1418 | PINMUX_IPSR_MSEL(IP12_29_27, SSI_SCK2, SEL_SSI2_0), | 1418 | PINMUX_IPSR_MSEL(IP12_29_27, SSI_SCK2, SEL_SSI2_0), |
| 1419 | PINMUX_IPSR_MSEL(IP12_29_27, HSCIF1_HTX_B, SEL_HSCIF1_1), | 1419 | PINMUX_IPSR_MSEL(IP12_29_27, HSCIF1_HTX_B, SEL_HSCIF1_1), |
| 1420 | PINMUX_IPSR_GPSR(IP12_29_27, VI1_DATA2), | 1420 | PINMUX_IPSR_GPSR(IP12_29_27, VI1_DATA2), |
| 1421 | PINMUX_IPSR_MSEL(IP12_29_27, MDATA, SEL_FSN_0), | 1421 | PINMUX_IPSR_MSEL(IP12_29_27, MDATA, SEL_FSN_0), |
| 1422 | PINMUX_IPSR_GPSR(IP12_29_27, ATAWR0_N), | 1422 | PINMUX_IPSR_GPSR(IP12_29_27, ATAG0_N), |
| 1423 | PINMUX_IPSR_MSEL(IP12_29_27, ETH_RXD1_B, SEL_ETH_1), | 1423 | PINMUX_IPSR_MSEL(IP12_29_27, ETH_RXD1_B, SEL_ETH_1), |
| 1424 | 1424 | ||
| 1425 | /* IPSR13 */ | 1425 | /* IPSR13 */ |
| @@ -4938,10 +4938,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { | |||
| 4938 | 0, 0, 0, 0, | 4938 | 0, 0, 0, 0, |
| 4939 | /* IP12_29_27 [3] */ | 4939 | /* IP12_29_27 [3] */ |
| 4940 | FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2, FN_MDATA, | 4940 | FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2, FN_MDATA, |
| 4941 | FN_ATAWR0_N, FN_ETH_RXD1_B, 0, 0, | 4941 | FN_ATAG0_N, FN_ETH_RXD1_B, 0, 0, |
| 4942 | /* IP12_26_24 [3] */ | 4942 | /* IP12_26_24 [3] */ |
| 4943 | FN_SSI_SDATA1, FN_HSCIF1_HRX_B, FN_VI1_DATA1, FN_SDATA, | 4943 | FN_SSI_SDATA1, FN_HSCIF1_HRX_B, FN_VI1_DATA1, FN_SDATA, |
| 4944 | FN_ATAG0_N, FN_ETH_RXD0_B, 0, 0, | 4944 | FN_ATAWR0_N, FN_ETH_RXD0_B, 0, 0, |
| 4945 | /* IP12_23_21 [3] */ | 4945 | /* IP12_23_21 [3] */ |
| 4946 | FN_SSI_WS1, FN_SCIF1_TXD_B, FN_IIC1_SDA_C, FN_VI1_DATA0, | 4946 | FN_SSI_WS1, FN_SCIF1_TXD_B, FN_IIC1_SDA_C, FN_VI1_DATA0, |
| 4947 | FN_CAN0_TX_D, FN_AVB_AVTP_MATCH, FN_ETH_RX_ER_B, 0, | 4947 | FN_CAN0_TX_D, FN_AVB_AVTP_MATCH, FN_ETH_RX_ER_B, 0, |
