| From a37c7e191c20ef11a2981f93e97fdc373abca1aa Mon Sep 17 00:00:00 2001 |
| From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> |
| Date: Fri, 24 May 2013 17:50:44 +0900 |
| Subject: 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> |
| (cherry picked from commit 5de880dd953ebb5b5d7852ce568608e828a7217e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c |
| index be19b25e..1507d3e6 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c |
| @@ -407,7 +407,7 @@ enum { |
| FN_LCDOUT21, FN_MSIOF0_SCK, FN_TS_SDAT0, FN_ADICLK, |
| FN_DU2_DB6, FN_LCDOUT22, FN_MSIOF0_SYNC, FN_TS_SCK0, |
| FN_SSI_SCK2, FN_ADIDATA, FN_DU2_DB7, FN_LCDOUT23, |
| - FN_SCIFA2_RXD_B, FN_MSIOF0_SS1, FN_ADICHS0, |
| + FN_HRX0_C, FN_MSIOF0_SS1, FN_ADICHS0, |
| FN_DU2_DG5, FN_LCDOUT13, FN_MSIOF0_TXD, FN_ADICHS1, |
| FN_DU2_DG6, FN_LCDOUT14, |
| |
| @@ -415,7 +415,7 @@ enum { |
| FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2, |
| FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, |
| FN_MSIOF0_RXD, FN_TS_SPSYNC0, FN_SSI_WS2, |
| - FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_HRX0_C, |
| + FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_SCIFA2_RXD_B, |
| FN_USB1_PWEN, FN_AUDIO_CLKOUT_D, FN_USB1_OVC, |
| FN_TCLK1_B, |
| |
| @@ -770,14 +770,14 @@ enum { |
| LCDOUT21_MARK, MSIOF0_SCK_MARK, TS_SDAT0_MARK, ADICLK_MARK, |
| DU2_DB6_MARK, LCDOUT22_MARK, MSIOF0_SYNC_MARK, TS_SCK0_MARK, |
| SSI_SCK2_MARK, ADIDATA_MARK, DU2_DB7_MARK, LCDOUT23_MARK, |
| - SCIFA2_RXD_B_MARK, MSIOF0_SS1_MARK, ADICHS0_MARK, |
| + HRX0_C_MARK, MSIOF0_SS1_MARK, ADICHS0_MARK, |
| DU2_DG5_MARK, LCDOUT13_MARK, MSIOF0_TXD_MARK, ADICHS1_MARK, |
| DU2_DG6_MARK, LCDOUT14_MARK, |
| |
| MSIOF0_SS2_MARK, AUDIO_CLKOUT_MARK, ADICHS2_MARK, |
| DU2_DISP_MARK, QPOLA_MARK, HTX0_C_MARK, SCIFA2_TXD_B_MARK, |
| MSIOF0_RXD_MARK, TS_SPSYNC0_MARK, SSI_WS2_MARK, |
| - ADICS_SAMP_MARK, DU2_CDE_MARK, QPOLB_MARK, HRX0_C_MARK, |
| + ADICS_SAMP_MARK, DU2_CDE_MARK, QPOLB_MARK, SCIFA2_RXD_B_MARK, |
| USB1_PWEN_MARK, AUDIO_CLKOUT_D_MARK, USB1_OVC_MARK, |
| TCLK1_B_MARK, |
| PINMUX_MARK_END, |
| @@ -1685,7 +1685,7 @@ static const u16 pinmux_data[] = { |
| PINMUX_IPSR_DATA(IP15_25_23, ADIDATA), |
| PINMUX_IPSR_DATA(IP15_25_23, DU2_DB7), |
| PINMUX_IPSR_DATA(IP15_25_23, LCDOUT23), |
| - PINMUX_IPSR_MODSEL_DATA(IP15_25_23, SCIFA2_RXD_B, SEL_SCIFA2_1), |
| + PINMUX_IPSR_MODSEL_DATA(IP15_25_23, HRX0_C, SEL_SCIFA2_1), |
| PINMUX_IPSR_MODSEL_DATA(IP15_27_26, MSIOF0_SS1, SEL_SOF0_0), |
| PINMUX_IPSR_DATA(IP15_27_26, ADICHS0), |
| PINMUX_IPSR_DATA(IP15_27_26, DU2_DG5), |
| @@ -1708,7 +1708,7 @@ static const u16 pinmux_data[] = { |
| PINMUX_IPSR_DATA(IP16_5_3, ADICS_SAMP), |
| PINMUX_IPSR_DATA(IP16_5_3, DU2_CDE), |
| PINMUX_IPSR_DATA(IP16_5_3, QPOLB), |
| - PINMUX_IPSR_MODSEL_DATA(IP16_5_3, HRX0_C, SEL_HSCIF0_2), |
| + PINMUX_IPSR_MODSEL_DATA(IP16_5_3, SCIFA2_RXD_B, SEL_HSCIF0_2), |
| PINMUX_IPSR_DATA(IP16_6, USB1_PWEN), |
| PINMUX_IPSR_DATA(IP16_6, AUDIO_CLKOUT_D), |
| PINMUX_IPSR_DATA(IP16_7, USB1_OVC), |
| @@ -3696,7 +3696,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { |
| FN_MSIOF0_SS1, FN_ADICHS0, FN_DU2_DG5, FN_LCDOUT13, |
| /* IP15_25_23 [3] */ |
| FN_MSIOF0_SYNC, FN_TS_SCK0, FN_SSI_SCK2, FN_ADIDATA, |
| - FN_DU2_DB7, FN_LCDOUT23, FN_SCIFA2_RXD_B, 0, |
| + FN_DU2_DB7, FN_LCDOUT23, FN_HRX0_C, 0, |
| /* IP15_22_20 [3] */ |
| FN_MSIOF0_SCK, FN_TS_SDAT0, FN_ADICLK, |
| FN_DU2_DB6, FN_LCDOUT22, 0, 0, 0, |
| @@ -3747,7 +3747,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { |
| FN_USB1_PWEN, FN_AUDIO_CLKOUT_D, |
| /* IP16_5_3 [3] */ |
| FN_MSIOF0_RXD, FN_TS_SPSYNC0, FN_SSI_WS2, |
| - FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_HRX0_C, 0, |
| + FN_ADICS_SAMP, FN_DU2_CDE, FN_QPOLB, FN_SCIFA2_RXD_B, 0, |
| /* IP16_2_0 [3] */ |
| FN_MSIOF0_SS2, FN_AUDIO_CLKOUT, FN_ADICHS2, |
| FN_DU2_DISP, FN_QPOLA, FN_HTX0_C, FN_SCIFA2_TXD_B, 0, } |
| -- |
| 1.8.4.3.gca3854a |
| |
