diff options
author | Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> | 2013-05-24 04:50:44 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-07-29 09:52:09 -0400 |
commit | 5de880dd953ebb5b5d7852ce568608e828a7217e (patch) | |
tree | 972cf7be43ccaeb976e71e901e597611dc8accb8 | |
parent | 7d2b2854c665ff1bcbf0e740c30bf3fc4dc760bf (diff) |
sh-pfc: r8a7790: Swap SCIFA2_RXD_B and HRX0_C configurations
The SCIFA2 RXD_B and HRX0_C pins have their pinmux configuration data
swapped, fix it.
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 350b076d9056..b06d36ce10ab 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c | |||
@@ -464,7 +464,7 @@ enum { | |||
464 | FN_LCDOUT21, FN_MSIOF0_SCK, FN_TS_SDAT0, FN_ADICLK, | 464 | FN_LCDOUT21, FN_MSIOF0_SCK, FN_TS_SDAT0, FN_ADICLK, |
465 | FN_DU2_DB6, FN_LCDOUT22, FN_MSIOF0_SYNC, FN_TS_SCK0, | 465 | FN_DU2_DB6, FN_LCDOUT22, FN_MSIOF0_SYNC, FN_TS_SCK0, |
466 | FN_SSI_SCK2, FN_ADIDATA, FN_DU2_DB7, FN_LCDOUT23, | 466 | FN_SSI_SCK2, FN_ADIDATA, FN_DU2_DB7, FN_LCDOUT23, |
467 | FN_SCIFA2_RXD_B, FN_MSIOF0_SS1, FN_ADICHS0, | 467 | FN_HRX0_C, FN_MSIOF0_SS1, FN_ADICHS0, |
468 | FN_DU2_DG5, FN_LCDOUT13, FN_MSIOF0_TXD, FN_ADICHS1, | 468 | FN_DU2_DG5, FN_LCDOUT13, FN_MSIOF0_TXD, FN_ADICHS1, |
469 | FN_DU2_DG6, FN_LCDOUT14, | 469 | FN_DU2_DG6, FN_LCDOUT14, |
470 | 470 | ||
@@ -472,7 +472,7 @@ enum { | |||
472 | FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2, | 472 | FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2, |
473 | FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, | 473 | FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, |
474 | FN_MSIOF0_RXD, FN_TS_SPSYNC0, FN_SSI_WS2, | 474 | FN_MSIOF0_RXD, FN_TS_SPSYNC0, FN_SSI_WS2, |
475 | FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_HRX0_C, | 475 | FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_SCIFA2_RXD_B, |
476 | FN_USB1_PWEN, FN_AUDIO_CLKOUT_D, FN_USB1_OVC, | 476 | FN_USB1_PWEN, FN_AUDIO_CLKOUT_D, FN_USB1_OVC, |
477 | FN_TCLK1_B, | 477 | FN_TCLK1_B, |
478 | 478 | ||
@@ -827,14 +827,14 @@ enum { | |||
827 | LCDOUT21_MARK, MSIOF0_SCK_MARK, TS_SDAT0_MARK, ADICLK_MARK, | 827 | LCDOUT21_MARK, MSIOF0_SCK_MARK, TS_SDAT0_MARK, ADICLK_MARK, |
828 | DU2_DB6_MARK, LCDOUT22_MARK, MSIOF0_SYNC_MARK, TS_SCK0_MARK, | 828 | DU2_DB6_MARK, LCDOUT22_MARK, MSIOF0_SYNC_MARK, TS_SCK0_MARK, |
829 | SSI_SCK2_MARK, ADIDATA_MARK, DU2_DB7_MARK, LCDOUT23_MARK, | 829 | SSI_SCK2_MARK, ADIDATA_MARK, DU2_DB7_MARK, LCDOUT23_MARK, |
830 | SCIFA2_RXD_B_MARK, MSIOF0_SS1_MARK, ADICHS0_MARK, | 830 | HRX0_C_MARK, MSIOF0_SS1_MARK, ADICHS0_MARK, |
831 | DU2_DG5_MARK, LCDOUT13_MARK, MSIOF0_TXD_MARK, ADICHS1_MARK, | 831 | DU2_DG5_MARK, LCDOUT13_MARK, MSIOF0_TXD_MARK, ADICHS1_MARK, |
832 | DU2_DG6_MARK, LCDOUT14_MARK, | 832 | DU2_DG6_MARK, LCDOUT14_MARK, |
833 | 833 | ||
834 | MSIOF0_SS2_MARK, AUDIO_CLKOUT_MARK, ADICHS2_MARK, | 834 | MSIOF0_SS2_MARK, AUDIO_CLKOUT_MARK, ADICHS2_MARK, |
835 | DU2_DISP_MARK, QPOLA_MARK, HTX0_C_MARK, SCIFA2_TXD_B_MARK, | 835 | DU2_DISP_MARK, QPOLA_MARK, HTX0_C_MARK, SCIFA2_TXD_B_MARK, |
836 | MSIOF0_RXD_MARK, TS_SPSYNC0_MARK, SSI_WS2_MARK, | 836 | MSIOF0_RXD_MARK, TS_SPSYNC0_MARK, SSI_WS2_MARK, |
837 | ADICS_SAMP_MARK, DU2_CDE_MARK, QPOLB_MARK, HRX0_C_MARK, | 837 | ADICS_SAMP_MARK, DU2_CDE_MARK, QPOLB_MARK, SCIFA2_RXD_B_MARK, |
838 | USB1_PWEN_MARK, AUDIO_CLKOUT_D_MARK, USB1_OVC_MARK, | 838 | USB1_PWEN_MARK, AUDIO_CLKOUT_D_MARK, USB1_OVC_MARK, |
839 | TCLK1_B_MARK, | 839 | TCLK1_B_MARK, |
840 | PINMUX_MARK_END, | 840 | PINMUX_MARK_END, |
@@ -1742,7 +1742,7 @@ static const pinmux_enum_t pinmux_data[] = { | |||
1742 | PINMUX_IPSR_DATA(IP15_25_23, ADIDATA), | 1742 | PINMUX_IPSR_DATA(IP15_25_23, ADIDATA), |
1743 | PINMUX_IPSR_DATA(IP15_25_23, DU2_DB7), | 1743 | PINMUX_IPSR_DATA(IP15_25_23, DU2_DB7), |
1744 | PINMUX_IPSR_DATA(IP15_25_23, LCDOUT23), | 1744 | PINMUX_IPSR_DATA(IP15_25_23, LCDOUT23), |
1745 | PINMUX_IPSR_MODSEL_DATA(IP15_25_23, SCIFA2_RXD_B, SEL_SCIFA2_1), | 1745 | PINMUX_IPSR_MODSEL_DATA(IP15_25_23, HRX0_C, SEL_SCIFA2_1), |
1746 | PINMUX_IPSR_MODSEL_DATA(IP15_27_26, MSIOF0_SS1, SEL_SOF0_0), | 1746 | PINMUX_IPSR_MODSEL_DATA(IP15_27_26, MSIOF0_SS1, SEL_SOF0_0), |
1747 | PINMUX_IPSR_DATA(IP15_27_26, ADICHS0), | 1747 | PINMUX_IPSR_DATA(IP15_27_26, ADICHS0), |
1748 | PINMUX_IPSR_DATA(IP15_27_26, DU2_DG5), | 1748 | PINMUX_IPSR_DATA(IP15_27_26, DU2_DG5), |
@@ -1765,7 +1765,7 @@ static const pinmux_enum_t pinmux_data[] = { | |||
1765 | PINMUX_IPSR_DATA(IP16_5_3, ADICS_SAMP), | 1765 | PINMUX_IPSR_DATA(IP16_5_3, ADICS_SAMP), |
1766 | PINMUX_IPSR_DATA(IP16_5_3, DU2_CDE), | 1766 | PINMUX_IPSR_DATA(IP16_5_3, DU2_CDE), |
1767 | PINMUX_IPSR_DATA(IP16_5_3, QPOLB), | 1767 | PINMUX_IPSR_DATA(IP16_5_3, QPOLB), |
1768 | PINMUX_IPSR_MODSEL_DATA(IP16_5_3, HRX0_C, SEL_HSCIF0_2), | 1768 | PINMUX_IPSR_MODSEL_DATA(IP16_5_3, SCIFA2_RXD_B, SEL_HSCIF0_2), |
1769 | PINMUX_IPSR_DATA(IP16_6, USB1_PWEN), | 1769 | PINMUX_IPSR_DATA(IP16_6, USB1_PWEN), |
1770 | PINMUX_IPSR_DATA(IP16_6, AUDIO_CLKOUT_D), | 1770 | PINMUX_IPSR_DATA(IP16_6, AUDIO_CLKOUT_D), |
1771 | PINMUX_IPSR_DATA(IP16_7, USB1_OVC), | 1771 | PINMUX_IPSR_DATA(IP16_7, USB1_OVC), |
@@ -3753,7 +3753,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { | |||
3753 | FN_MSIOF0_SS1, FN_ADICHS0, FN_DU2_DG5, FN_LCDOUT13, | 3753 | FN_MSIOF0_SS1, FN_ADICHS0, FN_DU2_DG5, FN_LCDOUT13, |
3754 | /* IP15_25_23 [3] */ | 3754 | /* IP15_25_23 [3] */ |
3755 | FN_MSIOF0_SYNC, FN_TS_SCK0, FN_SSI_SCK2, FN_ADIDATA, | 3755 | FN_MSIOF0_SYNC, FN_TS_SCK0, FN_SSI_SCK2, FN_ADIDATA, |
3756 | FN_DU2_DB7, FN_LCDOUT23, FN_SCIFA2_RXD_B, 0, | 3756 | FN_DU2_DB7, FN_LCDOUT23, FN_HRX0_C, 0, |
3757 | /* IP15_22_20 [3] */ | 3757 | /* IP15_22_20 [3] */ |
3758 | FN_MSIOF0_SCK, FN_TS_SDAT0, FN_ADICLK, | 3758 | FN_MSIOF0_SCK, FN_TS_SDAT0, FN_ADICLK, |
3759 | FN_DU2_DB6, FN_LCDOUT22, 0, 0, 0, | 3759 | FN_DU2_DB6, FN_LCDOUT22, 0, 0, 0, |
@@ -3804,7 +3804,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { | |||
3804 | FN_USB1_PWEN, FN_AUDIO_CLKOUT_D, | 3804 | FN_USB1_PWEN, FN_AUDIO_CLKOUT_D, |
3805 | /* IP16_5_3 [3] */ | 3805 | /* IP16_5_3 [3] */ |
3806 | FN_MSIOF0_RXD, FN_TS_SPSYNC0, FN_SSI_WS2, | 3806 | FN_MSIOF0_RXD, FN_TS_SPSYNC0, FN_SSI_WS2, |
3807 | FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_HRX0_C, 0, | 3807 | FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_SCIFA2_RXD_B, 0, |
3808 | /* IP16_2_0 [3] */ | 3808 | /* IP16_2_0 [3] */ |
3809 | FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2, | 3809 | FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2, |
3810 | FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, 0, } | 3810 | FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, 0, } |