diff options
| author | Takeshi Kihara <takeshi.kihara.df@renesas.com> | 2017-07-28 07:41:15 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-08-16 08:26:25 -0400 |
| commit | eada11ac23438d368fd431eb8e902caa96b80902 (patch) | |
| tree | 2f861719da447e0b6b310ce4ed3d42d11d54d7ad /drivers/pinctrl | |
| parent | 712f36fbb7738a60df0622e950726b6977dd41f3 (diff) | |
pinctrl: sh-pfc: r8a7795: Fix SCIF_CLK_{A,B} pin's MOD_SEL assignment to MOD_SEL1 bit10
This patch fixes SCIF_CLK_{A,B} pin's MOD_SEL assignment from MOD_SEL1
bit11 to MOD_SEL1 bit10.
This is a correction to the incorrect implementation of IPSR register
pin assignment for R8A7795 ES2.0 SoC specification of R-Car Gen3 Hardware
User's Manual Rev.0.53E or later.
Fixes: b205914c8f822ef2 ("pinctrl: sh-pfc: r8a7795: Add support for R-Car H3 ES2.0")
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 86e3ea0adc55..a688a252b495 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c | |||
| @@ -480,7 +480,7 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28 | |||
| 480 | #define MOD_SEL1_13 FM(SEL_SCIF3_0) FM(SEL_SCIF3_1) | 480 | #define MOD_SEL1_13 FM(SEL_SCIF3_0) FM(SEL_SCIF3_1) |
| 481 | #define MOD_SEL1_12 FM(SEL_SCIF2_0) FM(SEL_SCIF2_1) | 481 | #define MOD_SEL1_12 FM(SEL_SCIF2_0) FM(SEL_SCIF2_1) |
| 482 | #define MOD_SEL1_11 FM(SEL_SCIF1_0) FM(SEL_SCIF1_1) | 482 | #define MOD_SEL1_11 FM(SEL_SCIF1_0) FM(SEL_SCIF1_1) |
| 483 | #define MOD_SEL1_10 FM(SEL_SATA_0) FM(SEL_SATA_1) | 483 | #define MOD_SEL1_10 FM(SEL_SCIF_0) FM(SEL_SCIF_1) |
| 484 | #define MOD_SEL1_9 FM(SEL_REMOCON_0) FM(SEL_REMOCON_1) | 484 | #define MOD_SEL1_9 FM(SEL_REMOCON_0) FM(SEL_REMOCON_1) |
| 485 | #define MOD_SEL1_6 FM(SEL_RCAN0_0) FM(SEL_RCAN0_1) | 485 | #define MOD_SEL1_6 FM(SEL_RCAN0_0) FM(SEL_RCAN0_1) |
| 486 | #define MOD_SEL1_5 FM(SEL_PWM6_0) FM(SEL_PWM6_1) | 486 | #define MOD_SEL1_5 FM(SEL_PWM6_0) FM(SEL_PWM6_1) |
| @@ -1201,7 +1201,7 @@ static const u16 pinmux_data[] = { | |||
| 1201 | PINMUX_IPSR_GPSR(IP12_27_24, ADICHS0), | 1201 | PINMUX_IPSR_GPSR(IP12_27_24, ADICHS0), |
| 1202 | 1202 | ||
| 1203 | PINMUX_IPSR_GPSR(IP12_31_28, SCK2), | 1203 | PINMUX_IPSR_GPSR(IP12_31_28, SCK2), |
| 1204 | PINMUX_IPSR_MSEL(IP12_31_28, SCIF_CLK_B, SEL_SCIF1_1), | 1204 | PINMUX_IPSR_MSEL(IP12_31_28, SCIF_CLK_B, SEL_SCIF_1), |
| 1205 | PINMUX_IPSR_MSEL(IP12_31_28, MSIOF1_SCK_B, SEL_MSIOF1_1), | 1205 | PINMUX_IPSR_MSEL(IP12_31_28, MSIOF1_SCK_B, SEL_MSIOF1_1), |
| 1206 | PINMUX_IPSR_MSEL(IP12_31_28, TS_SCK1_C, SEL_TSIF1_2), | 1206 | PINMUX_IPSR_MSEL(IP12_31_28, TS_SCK1_C, SEL_TSIF1_2), |
| 1207 | PINMUX_IPSR_MSEL(IP12_31_28, STP_ISCLK_1_C, SEL_SSP1_1_2), | 1207 | PINMUX_IPSR_MSEL(IP12_31_28, STP_ISCLK_1_C, SEL_SSP1_1_2), |
| @@ -1416,7 +1416,7 @@ static const u16 pinmux_data[] = { | |||
| 1416 | PINMUX_IPSR_GPSR(IP17_3_0, CC5_OSCOUT), | 1416 | PINMUX_IPSR_GPSR(IP17_3_0, CC5_OSCOUT), |
| 1417 | 1417 | ||
| 1418 | PINMUX_IPSR_MSEL(IP17_7_4, AUDIO_CLKB_B, SEL_ADG_B_1), | 1418 | PINMUX_IPSR_MSEL(IP17_7_4, AUDIO_CLKB_B, SEL_ADG_B_1), |
| 1419 | PINMUX_IPSR_MSEL(IP17_7_4, SCIF_CLK_A, SEL_SCIF1_0), | 1419 | PINMUX_IPSR_MSEL(IP17_7_4, SCIF_CLK_A, SEL_SCIF_0), |
| 1420 | PINMUX_IPSR_MSEL(IP17_7_4, STP_IVCXO27_1_D, SEL_SSP1_1_3), | 1420 | PINMUX_IPSR_MSEL(IP17_7_4, STP_IVCXO27_1_D, SEL_SSP1_1_3), |
| 1421 | PINMUX_IPSR_MSEL(IP17_7_4, REMOCON_A, SEL_REMOCON_0), | 1421 | PINMUX_IPSR_MSEL(IP17_7_4, REMOCON_A, SEL_REMOCON_0), |
| 1422 | PINMUX_IPSR_MSEL(IP17_7_4, TCLK1_A, SEL_TIMER_TMU_0), | 1422 | PINMUX_IPSR_MSEL(IP17_7_4, TCLK1_A, SEL_TIMER_TMU_0), |