pinctrl: sh-pfc: r8a7795,6: Fix pin assignment definitions
cover pinctrl: sh-pfc: r8a7795,6: Fix pin assignment definitions
Hi!
This series contains fixes to the PFC register definitions for r8a7795 and r8a7796 from the BSP that are not upstream yet.
As far as I could tell, these changes check out with the Gen3 datasheet revision 0.80.
CU
Uli
Takeshi Kihara (3):
pinctrl: sh-pfc: r8a7795: Fix MOD_SEL register pin assignment for SSI
pins group
pinctrl: sh-pfc: r8a7796: Fix MOD_SEL register pin assignment for SSI
pins group
pinctrl: sh-pfc: r8a7796: Fix IPSR and MOD_SEL register pin assignment
for NDFC pins group
drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 40 ++++++++++++------------- drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 58 +++++++++++++++++++----------------- 2 files changed, 51 insertions(+), 47 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 pinctrl: sh-pfc: r8a7795: Fix MOD_SEL register pin assignment for SSI pins group
From: Takeshi Kihara <[email protected]>
This patch fixes MOD_SEL1 bit20 and MOD_SEL2 bit20, bit21 pin assignment for SSI pins group.
This is a correction because MOD_SEL register specification for R8A7795 ES2.0 SoC was changed in R-Car Gen3 Hardware User's Manual Rev.0.53E.
--- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a7795.c +20 -20
@@ -1,7 +1,7 @@/* * R8A7795 ES2.0+ processor support - PFC hardware block. * -* Copyright (C) 2015-2016 Renesas Electronics Corporation +* Copyright (C) 2015-2017 Renesas Electronics Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -472,7 +472,7 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#define MOD_SEL1_26 FM(SEL_TIMER_TMU1_0) FM(SEL_TIMER_TMU1_1)#define MOD_SEL1_25_24 FM(SEL_SSP1_1_0) FM(SEL_SSP1_1_1) FM(SEL_SSP1_1_2) FM(SEL_SSP1_1_3)#define MOD_SEL1_23_22_21 FM(SEL_SSP1_0_0) FM(SEL_SSP1_0_1) FM(SEL_SSP1_0_2) FM(SEL_SSP1_0_3) FM(SEL_SSP1_0_4) F_(0, 0) F_(0, 0) F_(0, 0) -#define MOD_SEL1_20 FM(SEL_SSI_0) FM(SEL_SSI_1) +#define MOD_SEL1_20 FM(SEL_SSI1_0) FM(SEL_SSI1_1)#define MOD_SEL1_19 FM(SEL_SPEED_PULSE_0) FM(SEL_SPEED_PULSE_1)#define MOD_SEL1_18_17 FM(SEL_SIMCARD_0) FM(SEL_SIMCARD_1) FM(SEL_SIMCARD_2) FM(SEL_SIMCARD_3)#define MOD_SEL1_16 FM(SEL_SDHI2_0) FM(SEL_SDHI2_1)
@@ -1218,7 +1218,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_11_8 ,HSCK0 ),PINMUX_IPSR_MSEL (IP13_11_8 ,MSIOF1_SCK_D ,SEL_MSIOF1_3 ),PINMUX_IPSR_MSEL (IP13_11_8 ,AUDIO_CLKB_A ,SEL_ADG_B_0 ), -PINMUX_IPSR_MSEL (IP13_11_8 ,SSI_SDATA1_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP13_11_8 ,SSI_SDATA1_B ,SEL_SSI1_1 ),PINMUX_IPSR_MSEL (IP13_11_8 ,TS_SCK0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_11_8 ,STP_ISCLK_0_D ,SEL_SSP1_0_3 ), PINMUX_IPSR_MSEL(IP13_11_8, RIF0_CLK_C, SEL_DRIF0_2),
@@ -1226,14 +1226,14 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_15_12 ,HRX0 ),PINMUX_IPSR_MSEL (IP13_15_12 ,MSIOF1_RXD_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_15_12 ,SSI_SDATA2_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP13_15_12 ,SSI_SDATA2_B ,SEL_SSI2_1 ),PINMUX_IPSR_MSEL (IP13_15_12 ,TS_SDEN0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_15_12 ,STP_ISEN_0_D ,SEL_SSP1_0_3 ),PINMUX_IPSR_MSEL (IP13_15_12 ,RIF0_D0_C ,SEL_DRIF0_2 ),PINMUX_IPSR_GPSR (IP13_19_16 ,HTX0 ),PINMUX_IPSR_MSEL (IP13_19_16 ,MSIOF1_TXD_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_19_16 ,SSI_SDATA9_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP13_19_16 ,SSI_SDATA9_B ,SEL_SSI9_1 ),PINMUX_IPSR_MSEL (IP13_19_16 ,TS_SDAT0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_19_16 ,STP_ISD_0_D ,SEL_SSP1_0_3 ), PINMUX_IPSR_MSEL(IP13_19_16, RIF0_D1_C, SEL_DRIF0_2),
@@ -1241,7 +1241,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_23_20 ,HCTS0_N ),PINMUX_IPSR_MSEL (IP13_23_20 ,RX2_B ,SEL_SCIF2_1 ),PINMUX_IPSR_MSEL (IP13_23_20 ,MSIOF1_SYNC_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_23_20 ,SSI_SCK9_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP13_23_20 ,SSI_SCK9_A ,SEL_SSI9_0 ),PINMUX_IPSR_MSEL (IP13_23_20 ,TS_SPSYNC0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_23_20 ,STP_ISSYNC_0_D ,SEL_SSP1_0_3 ), PINMUX_IPSR_MSEL(IP13_23_20, RIF0_SYNC_C, SEL_DRIF0_2),
@@ -1250,7 +1250,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_27_24 ,HRTS0_N ),PINMUX_IPSR_MSEL (IP13_27_24 ,TX2_B ,SEL_SCIF2_1 ),PINMUX_IPSR_MSEL (IP13_27_24 ,MSIOF1_SS1_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_27_24 ,SSI_WS9_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP13_27_24 ,SSI_WS9_A ,SEL_SSI9_0 ),PINMUX_IPSR_MSEL (IP13_27_24 ,STP_IVCXO27_0_D ,SEL_SSP1_0_3 ),PINMUX_IPSR_MSEL (IP13_27_24 ,BPFCLK_A ,SEL_FM_0 ), PINMUX_IPSR_GPSR(IP13_27_24, AUDIO_CLKOUT2_A),
@@ -1265,7 +1265,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP14_3_0 ,RX5_A ,SEL_SCIF5_0 ),PINMUX_IPSR_GPSR (IP14_3_0 ,NFWP_N_A ),PINMUX_IPSR_MSEL (IP14_3_0 ,AUDIO_CLKA_C ,SEL_ADG_A_2 ), -PINMUX_IPSR_MSEL (IP14_3_0 ,SSI_SCK2_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP14_3_0 ,SSI_SCK2_A ,SEL_SSI2_0 ),PINMUX_IPSR_MSEL (IP14_3_0 ,STP_IVCXO27_0_C ,SEL_SSP1_0_2 ),PINMUX_IPSR_GPSR (IP14_3_0 ,AUDIO_CLKOUT3_A ), PINMUX_IPSR_MSEL(IP14_3_0, TCLK1_B, SEL_TIMER_TMU1_1),
@@ -1274,7 +1274,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP14_7_4 ,TX5_A ,SEL_SCIF5_0 ),PINMUX_IPSR_MSEL (IP14_7_4 ,MSIOF1_SS2_D ,SEL_MSIOF1_3 ),PINMUX_IPSR_MSEL (IP14_7_4 ,AUDIO_CLKC_A ,SEL_ADG_C_0 ), -PINMUX_IPSR_MSEL (IP14_7_4 ,SSI_WS2_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP14_7_4 ,SSI_WS2_A ,SEL_SSI2_0 ),PINMUX_IPSR_MSEL (IP14_7_4 ,STP_OPWM_0_D ,SEL_SSP1_0_3 ),PINMUX_IPSR_GPSR (IP14_7_4 ,AUDIO_CLKOUT_D ), PINMUX_IPSR_MSEL(IP14_7_4, SPEEDIN_B, SEL_SPEED_PULSE_1),
@@ -1302,10 +1302,10 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP14_31_28 ,MSIOF1_SS2_F ,SEL_MSIOF1_5 ),/* IPSR15 */ -PINMUX_IPSR_MSEL (IP15_3_0 ,SSI_SDATA1_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP15_3_0 ,SSI_SDATA1_A ,SEL_SSI1_0 ), -PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SDATA2_A ,SEL_SSI_0 ), -PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SCK1_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SDATA2_A ,SEL_SSI2_0 ), +PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SCK1_B ,SEL_SSI1_1 ),PINMUX_IPSR_GPSR (IP15_11_8 ,SSI_SCK349 ), PINMUX_IPSR_MSEL(IP15_11_8, MSIOF1_SS1_A, SEL_MSIOF1_0),
@@ -1394,11 +1394,11 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP16_27_24 ,RIF1_D1_A ,SEL_DRIF1_0 ),PINMUX_IPSR_MSEL (IP16_27_24 ,RIF3_D1_A ,SEL_DRIF3_0 ), -PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_SDATA9_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_SDATA9_A ,SEL_SSI9_0 ),PINMUX_IPSR_MSEL (IP16_31_28 ,HSCK2_B ,SEL_HSCIF2_1 ),PINMUX_IPSR_MSEL (IP16_31_28 ,MSIOF1_SS1_C ,SEL_MSIOF1_2 ),PINMUX_IPSR_MSEL (IP16_31_28 ,HSCK1_A ,SEL_HSCIF1_0 ), -PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_WS1_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_WS1_B ,SEL_SSI1_1 ),PINMUX_IPSR_GPSR (IP16_31_28 ,SCK1 ),PINMUX_IPSR_MSEL (IP16_31_28 ,STP_IVCXO27_1_A ,SEL_SSP1_1_0 ), PINMUX_IPSR_MSEL(IP16_31_28, SCK5_A, SEL_SCIF5_0),
@@ -1430,7 +1430,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_19_16 ,USB1_PWEN ),PINMUX_IPSR_MSEL (IP17_19_16 ,SIM0_CLK_C ,SEL_SIMCARD_2 ), -PINMUX_IPSR_MSEL (IP17_19_16 ,SSI_SCK1_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP17_19_16 ,SSI_SCK1_A ,SEL_SSI1_0 ),PINMUX_IPSR_MSEL (IP17_19_16 ,TS_SCK0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP17_19_16 ,STP_ISCLK_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP17_19_16, FMCLK_B, SEL_FM_1),
@@ -1440,7 +1440,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_23_20 ,USB1_OVC ),PINMUX_IPSR_MSEL (IP17_23_20 ,MSIOF1_SS2_C ,SEL_MSIOF1_2 ), -PINMUX_IPSR_MSEL (IP17_23_20 ,SSI_WS1_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP17_23_20 ,SSI_WS1_A ,SEL_SSI1_0 ),PINMUX_IPSR_MSEL (IP17_23_20 ,TS_SDAT0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP17_23_20 ,STP_ISD_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP17_23_20, FMIN_B, SEL_FM_1),
@@ -1450,7 +1450,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_27_24 ,USB30_PWEN ),PINMUX_IPSR_GPSR (IP17_27_24 ,AUDIO_CLKOUT_B ), -PINMUX_IPSR_MSEL (IP17_27_24 ,SSI_SCK2_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP17_27_24 ,SSI_SCK2_B ,SEL_SSI2_1 ),PINMUX_IPSR_MSEL (IP17_27_24 ,TS_SDEN1_D ,SEL_TSIF1_3 ),PINMUX_IPSR_MSEL (IP17_27_24 ,STP_ISEN_1_D ,SEL_SSP1_1_3 ), PINMUX_IPSR_MSEL(IP17_27_24, STP_OPWM_0_E, SEL_SSP1_0_4),
@@ -1462,7 +1462,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_31_28 ,USB30_OVC ),PINMUX_IPSR_GPSR (IP17_31_28 ,AUDIO_CLKOUT1_B ), -PINMUX_IPSR_MSEL (IP17_31_28 ,SSI_WS2_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP17_31_28 ,SSI_WS2_B ,SEL_SSI2_1 ),PINMUX_IPSR_MSEL (IP17_31_28 ,TS_SPSYNC1_D ,SEL_TSIF1_3 ),PINMUX_IPSR_MSEL (IP17_31_28 ,STP_ISSYNC_1_D ,SEL_SSP1_1_3 ), PINMUX_IPSR_MSEL(IP17_31_28, STP_IVCXO27_0_E, SEL_SSP1_0_4),
@@ -1473,7 +1473,7 @@ static const u16 pinmux_data[] = {/* IPSR18 */ PINMUX_IPSR_GPSR (IP18_3_0 ,USB2_CH3_PWEN ),PINMUX_IPSR_GPSR (IP18_3_0 ,AUDIO_CLKOUT2_B ), -PINMUX_IPSR_MSEL (IP18_3_0 ,SSI_SCK9_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP18_3_0 ,SSI_SCK9_B ,SEL_SSI9_1 ),PINMUX_IPSR_MSEL (IP18_3_0 ,TS_SDEN0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP18_3_0 ,STP_ISEN_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP18_3_0, RIF2_D0_B, SEL_DRIF2_1),
@@ -1483,7 +1483,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP18_7_4 ,USB2_CH3_OVC ),PINMUX_IPSR_GPSR (IP18_7_4 ,AUDIO_CLKOUT3_B ), -PINMUX_IPSR_MSEL (IP18_7_4 ,SSI_WS9_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP18_7_4 ,SSI_WS9_B ,SEL_SSI9_1 ),PINMUX_IPSR_MSEL (IP18_7_4 ,TS_SPSYNC0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP18_7_4 ,STP_ISSYNC_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP18_7_4, RIF2_D1_B, SEL_DRIF2_1),
Signature · 1 line
2.7.4
Re: [PATCH 1/3] pinctrl: sh-pfc: r8a7795: Fix MOD_SEL register pin assignment for SSI pins group
Quoted 11 lines · Ulrich Hecht
From: Takeshi Kihara <[email protected]>
This patch fixes
MOD_SEL1bit20 andMOD_SEL2bit20, bit21 pin assignment for SSI pins group.This is a correction because
MOD_SELregister specification for R8A7795 ES2.0 SoC was changed in R-Car Gen3 Hardware User's Manual Rev.0.53E.Fixes b205914c8f82 ("pinctrl: sh-pfc: r8a7795: Add support for R-Car H3 ES2.0")Signed-off-by Takeshi Kihara <[email protected]>Signed-off-by Ulrich Hecht <[email protected]>
and queueing in sh-pfc-for-v4.17.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
PATCH 2/3 pinctrl: sh-pfc: r8a7796: Fix MOD_SEL register pin assignment for SSI pins group
In reply to Ulrich HechtFrom: Takeshi Kihara <[email protected]>
This patch fixes MOD_SEL1 bit20 and MOD_SEL2 bit20, bit21 pin assignment for SSI pins group.
This is a correction to the incorrect implementation of MOD_SEL register pin assignment for R8A7796 SoC specification of R-Car Gen3 Hardware User's Manual Rev.0.51E or later.
--- drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a7796.c +20 -20
@@ -1,7 +1,7 @@/* * R8A7796 processor support - PFC hardware block. * -* Copyright (C) 2016 Renesas Electronics Corp. +* Copyright (C) 2016-2017 Renesas Electronics Corp. * * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c *
@@ -477,7 +477,7 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#define MOD_SEL1_26 FM(SEL_TIMER_TMU_0) FM(SEL_TIMER_TMU_1)#define MOD_SEL1_25_24 FM(SEL_SSP1_1_0) FM(SEL_SSP1_1_1) FM(SEL_SSP1_1_2) FM(SEL_SSP1_1_3)#define MOD_SEL1_23_22_21 FM(SEL_SSP1_0_0) FM(SEL_SSP1_0_1) FM(SEL_SSP1_0_2) FM(SEL_SSP1_0_3) FM(SEL_SSP1_0_4) F_(0, 0) F_(0, 0) F_(0, 0) -#define MOD_SEL1_20 FM(SEL_SSI_0) FM(SEL_SSI_1) +#define MOD_SEL1_20 FM(SEL_SSI1_0) FM(SEL_SSI1_1)#define MOD_SEL1_19 FM(SEL_SPEED_PULSE_0) FM(SEL_SPEED_PULSE_1)#define MOD_SEL1_18_17 FM(SEL_SIMCARD_0) FM(SEL_SIMCARD_1) FM(SEL_SIMCARD_2) FM(SEL_SIMCARD_3)#define MOD_SEL1_16 FM(SEL_SDHI2_0) FM(SEL_SDHI2_1)
@@ -1218,7 +1218,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_11_8 ,HSCK0 ),PINMUX_IPSR_MSEL (IP13_11_8 ,MSIOF1_SCK_D ,SEL_MSIOF1_3 ),PINMUX_IPSR_MSEL (IP13_11_8 ,AUDIO_CLKB_A ,SEL_ADG_B_0 ), -PINMUX_IPSR_MSEL (IP13_11_8 ,SSI_SDATA1_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP13_11_8 ,SSI_SDATA1_B ,SEL_SSI1_1 ),PINMUX_IPSR_MSEL (IP13_11_8 ,TS_SCK0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_11_8 ,STP_ISCLK_0_D ,SEL_SSP1_0_3 ), PINMUX_IPSR_MSEL(IP13_11_8, RIF0_CLK_C, SEL_DRIF0_2),
@@ -1226,14 +1226,14 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_15_12 ,HRX0 ),PINMUX_IPSR_MSEL (IP13_15_12 ,MSIOF1_RXD_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_15_12 ,SSI_SDATA2_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP13_15_12 ,SSI_SDATA2_B ,SEL_SSI2_1 ),PINMUX_IPSR_MSEL (IP13_15_12 ,TS_SDEN0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_15_12 ,STP_ISEN_0_D ,SEL_SSP1_0_3 ),PINMUX_IPSR_MSEL (IP13_15_12 ,RIF0_D0_C ,SEL_DRIF0_2 ),PINMUX_IPSR_GPSR (IP13_19_16 ,HTX0 ),PINMUX_IPSR_MSEL (IP13_19_16 ,MSIOF1_TXD_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_19_16 ,SSI_SDATA9_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP13_19_16 ,SSI_SDATA9_B ,SEL_SSI9_1 ),PINMUX_IPSR_MSEL (IP13_19_16 ,TS_SDAT0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_19_16 ,STP_ISD_0_D ,SEL_SSP1_0_3 ), PINMUX_IPSR_MSEL(IP13_19_16, RIF0_D1_C, SEL_DRIF0_2),
@@ -1241,7 +1241,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_23_20 ,HCTS0_N ),PINMUX_IPSR_MSEL (IP13_23_20 ,RX2_B ,SEL_SCIF2_1 ),PINMUX_IPSR_MSEL (IP13_23_20 ,MSIOF1_SYNC_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_23_20 ,SSI_SCK9_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP13_23_20 ,SSI_SCK9_A ,SEL_SSI9_0 ),PINMUX_IPSR_MSEL (IP13_23_20 ,TS_SPSYNC0_D ,SEL_TSIF0_3 ),PINMUX_IPSR_MSEL (IP13_23_20 ,STP_ISSYNC_0_D ,SEL_SSP1_0_3 ), PINMUX_IPSR_MSEL(IP13_23_20, RIF0_SYNC_C, SEL_DRIF0_2),
@@ -1250,7 +1250,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP13_27_24 ,HRTS0_N ),PINMUX_IPSR_MSEL (IP13_27_24 ,TX2_B ,SEL_SCIF2_1 ),PINMUX_IPSR_MSEL (IP13_27_24 ,MSIOF1_SS1_D ,SEL_MSIOF1_3 ), -PINMUX_IPSR_MSEL (IP13_27_24 ,SSI_WS9_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP13_27_24 ,SSI_WS9_A ,SEL_SSI9_0 ),PINMUX_IPSR_MSEL (IP13_27_24 ,STP_IVCXO27_0_D ,SEL_SSP1_0_3 ),PINMUX_IPSR_MSEL (IP13_27_24 ,BPFCLK_A ,SEL_FM_0 ), PINMUX_IPSR_GPSR(IP13_27_24, AUDIO_CLKOUT2_A),
@@ -1265,7 +1265,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP14_3_0 ,RX5_A ,SEL_SCIF5_0 ),PINMUX_IPSR_MSEL (IP14_3_0 ,NFWP_N_A ,SEL_NDF_0 ),PINMUX_IPSR_MSEL (IP14_3_0 ,AUDIO_CLKA_C ,SEL_ADG_A_2 ), -PINMUX_IPSR_MSEL (IP14_3_0 ,SSI_SCK2_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP14_3_0 ,SSI_SCK2_A ,SEL_SSI2_0 ),PINMUX_IPSR_MSEL (IP14_3_0 ,STP_IVCXO27_0_C ,SEL_SSP1_0_2 ),PINMUX_IPSR_GPSR (IP14_3_0 ,AUDIO_CLKOUT3_A ), PINMUX_IPSR_MSEL(IP14_3_0, TCLK1_B, SEL_TIMER_TMU_1),
@@ -1274,7 +1274,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP14_7_4 ,TX5_A ,SEL_SCIF5_0 ),PINMUX_IPSR_MSEL (IP14_7_4 ,MSIOF1_SS2_D ,SEL_MSIOF1_3 ),PINMUX_IPSR_MSEL (IP14_7_4 ,AUDIO_CLKC_A ,SEL_ADG_C_0 ), -PINMUX_IPSR_MSEL (IP14_7_4 ,SSI_WS2_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP14_7_4 ,SSI_WS2_A ,SEL_SSI2_0 ),PINMUX_IPSR_MSEL (IP14_7_4 ,STP_OPWM_0_D ,SEL_SSP1_0_3 ),PINMUX_IPSR_GPSR (IP14_7_4 ,AUDIO_CLKOUT_D ), PINMUX_IPSR_MSEL(IP14_7_4, SPEEDIN_B, SEL_SPEED_PULSE_1),
@@ -1302,10 +1302,10 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP14_31_28 ,MSIOF1_SS2_F ,SEL_MSIOF1_5 ),/* IPSR15 */ -PINMUX_IPSR_MSEL (IP15_3_0 ,SSI_SDATA1_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP15_3_0 ,SSI_SDATA1_A ,SEL_SSI1_0 ), -PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SDATA2_A ,SEL_SSI_0 ), -PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SCK1_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SDATA2_A ,SEL_SSI2_0 ), +PINMUX_IPSR_MSEL (IP15_7_4 ,SSI_SCK1_B ,SEL_SSI1_1 ),PINMUX_IPSR_GPSR (IP15_11_8 ,SSI_SCK349 ), PINMUX_IPSR_MSEL(IP15_11_8, MSIOF1_SS1_A, SEL_MSIOF1_0),
@@ -1391,11 +1391,11 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP16_27_24 ,RIF1_D1_A ,SEL_DRIF1_0 ),PINMUX_IPSR_MSEL (IP16_27_24 ,RIF3_D1_A ,SEL_DRIF3_0 ), -PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_SDATA9_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_SDATA9_A ,SEL_SSI9_0 ),PINMUX_IPSR_MSEL (IP16_31_28 ,HSCK2_B ,SEL_HSCIF2_1 ),PINMUX_IPSR_MSEL (IP16_31_28 ,MSIOF1_SS1_C ,SEL_MSIOF1_2 ),PINMUX_IPSR_MSEL (IP16_31_28 ,HSCK1_A ,SEL_HSCIF1_0 ), -PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_WS1_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP16_31_28 ,SSI_WS1_B ,SEL_SSI1_1 ),PINMUX_IPSR_GPSR (IP16_31_28 ,SCK1 ),PINMUX_IPSR_MSEL (IP16_31_28 ,STP_IVCXO27_1_A ,SEL_SSP1_1_0 ), PINMUX_IPSR_MSEL(IP16_31_28, SCK5_A, SEL_SCIF5_0),
@@ -1427,7 +1427,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_19_16 ,USB1_PWEN ),PINMUX_IPSR_MSEL (IP17_19_16 ,SIM0_CLK_C ,SEL_SIMCARD_2 ), -PINMUX_IPSR_MSEL (IP17_19_16 ,SSI_SCK1_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP17_19_16 ,SSI_SCK1_A ,SEL_SSI1_0 ),PINMUX_IPSR_MSEL (IP17_19_16 ,TS_SCK0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP17_19_16 ,STP_ISCLK_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP17_19_16, FMCLK_B, SEL_FM_1),
@@ -1437,7 +1437,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_23_20 ,USB1_OVC ),PINMUX_IPSR_MSEL (IP17_23_20 ,MSIOF1_SS2_C ,SEL_MSIOF1_2 ), -PINMUX_IPSR_MSEL (IP17_23_20 ,SSI_WS1_A ,SEL_SSI_0 ), +PINMUX_IPSR_MSEL (IP17_23_20 ,SSI_WS1_A ,SEL_SSI1_0 ),PINMUX_IPSR_MSEL (IP17_23_20 ,TS_SDAT0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP17_23_20 ,STP_ISD_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP17_23_20, FMIN_B, SEL_FM_1),
@@ -1447,7 +1447,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_27_24 ,USB30_PWEN ),PINMUX_IPSR_GPSR (IP17_27_24 ,AUDIO_CLKOUT_B ), -PINMUX_IPSR_MSEL (IP17_27_24 ,SSI_SCK2_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP17_27_24 ,SSI_SCK2_B ,SEL_SSI2_1 ),PINMUX_IPSR_MSEL (IP17_27_24 ,TS_SDEN1_D ,SEL_TSIF1_3 ),PINMUX_IPSR_MSEL (IP17_27_24 ,STP_ISEN_1_D ,SEL_SSP1_1_3 ), PINMUX_IPSR_MSEL(IP17_27_24, STP_OPWM_0_E, SEL_SSP1_0_4),
@@ -1459,7 +1459,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP17_31_28 ,USB30_OVC ),PINMUX_IPSR_GPSR (IP17_31_28 ,AUDIO_CLKOUT1_B ), -PINMUX_IPSR_MSEL (IP17_31_28 ,SSI_WS2_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP17_31_28 ,SSI_WS2_B ,SEL_SSI2_1 ),PINMUX_IPSR_MSEL (IP17_31_28 ,TS_SPSYNC1_D ,SEL_TSIF1_3 ),PINMUX_IPSR_MSEL (IP17_31_28 ,STP_ISSYNC_1_D ,SEL_SSP1_1_3 ), PINMUX_IPSR_MSEL(IP17_31_28, STP_IVCXO27_0_E, SEL_SSP1_0_4),
@@ -1470,7 +1470,7 @@ static const u16 pinmux_data[] = {/* IPSR18 */ PINMUX_IPSR_GPSR (IP18_3_0 ,GP6_30 ),PINMUX_IPSR_GPSR (IP18_3_0 ,AUDIO_CLKOUT2_B ), -PINMUX_IPSR_MSEL (IP18_3_0 ,SSI_SCK9_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP18_3_0 ,SSI_SCK9_B ,SEL_SSI9_1 ),PINMUX_IPSR_MSEL (IP18_3_0 ,TS_SDEN0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP18_3_0 ,STP_ISEN_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP18_3_0, RIF2_D0_B, SEL_DRIF2_1),
@@ -1480,7 +1480,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP18_7_4 ,GP6_31 ),PINMUX_IPSR_GPSR (IP18_7_4 ,AUDIO_CLKOUT3_B ), -PINMUX_IPSR_MSEL (IP18_7_4 ,SSI_WS9_B ,SEL_SSI_1 ), +PINMUX_IPSR_MSEL (IP18_7_4 ,SSI_WS9_B ,SEL_SSI9_1 ),PINMUX_IPSR_MSEL (IP18_7_4 ,TS_SPSYNC0_E ,SEL_TSIF0_4 ),PINMUX_IPSR_MSEL (IP18_7_4 ,STP_ISSYNC_0_E ,SEL_SSP1_0_4 ), PINMUX_IPSR_MSEL(IP18_7_4, RIF2_D1_B, SEL_DRIF2_1),
Signature · 1 line
2.7.4
Re: [PATCH 2/3] pinctrl: sh-pfc: r8a7796: Fix MOD_SEL register pin assignment for SSI pins group
Quoted 5 lines · Ulrich Hecht
From: Takeshi Kihara <[email protected]>
This patch fixes
MOD_SEL1bit20 andMOD_SEL2bit20, bit21 pin assignment for SSI pins group.
Quoted 7 lines
This is a correction to the incorrect implementation of
MOD_SELregister pin assignment for R8A7796 SoC specification of R-Car Gen3 Hardware User's Manual Rev.0.51E or later.Fixes f9aece7344bd ("pinctrl: sh-pfc: Initial R8A7796 PFC support")Signed-off-by Takeshi Kihara <[email protected]>Signed-off-by Ulrich Hecht <[email protected]>
and queueing in sh-pfc-for-v4.17.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
PATCH 3/3 pinctrl: sh-pfc: r8a7796: Fix IPSR and MOD_SEL register pin assignment for NDFC pins group
In reply to Ulrich HechtFrom: Takeshi Kihara <[email protected]>
This patch fixes to set IPSR and MOD_SEL when using NFDATA{14,15}_A and NF{RB,WP}_N_A pin function is selected. And renamess MOD_SEL2 bit22 value definition name to SEL_NDFC.
This is a correction to the incorrect implementation of MOD_SEL register pin assignment for R8A7796 SoC specification of R-Car Gen3 Hardware User's Manual Rev.0.53E.
--- drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a7796.c +11 -7
@@ -502,7 +502,7 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#define MOD_SEL2_28_27 FM(SEL_FM_0) FM(SEL_FM_1) FM(SEL_FM_2) FM(SEL_FM_3)#define MOD_SEL2_26 FM(SEL_SCIF5_0) FM(SEL_SCIF5_1)#define MOD_SEL2_25_24_23 FM(SEL_I2C6_0) FM(SEL_I2C6_1) FM(SEL_I2C6_2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define MOD_SEL2_22 FM(SEL_NDF_0) FM(SEL_NDF_1) +#define MOD_SEL2_22 FM(SEL_NDFC_0) FM(SEL_NDFC_1)#define MOD_SEL2_21 FM(SEL_SSI2_0) FM(SEL_SSI2_1)#define MOD_SEL2_20 FM(SEL_SSI9_0) FM(SEL_SSI9_1)#define MOD_SEL2_19 FM(SEL_TIMER_TMU2_0) FM(SEL_TIMER_TMU2_1)
@@ -1016,35 +1016,35 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP8_15_12 ,SD1_CMD ),PINMUX_IPSR_MSEL (IP8_15_12 ,MSIOF1_SYNC_G ,SEL_MSIOF1_6 ), -PINMUX_IPSR_MSEL (IP8_15_12 ,NFCE_N_B ,SEL_NDF_1 ), +PINMUX_IPSR_MSEL (IP8_15_12 ,NFCE_N_B ,SEL_NDFC_1 ),PINMUX_IPSR_MSEL (IP8_15_12 ,SIM0_D_A ,SEL_SIMCARD_0 ),PINMUX_IPSR_MSEL (IP8_15_12 ,STP_IVCXO27_1_B ,SEL_SSP1_1_1 ),PINMUX_IPSR_GPSR (IP8_19_16 ,SD1_DAT0 ),PINMUX_IPSR_GPSR (IP8_19_16 ,SD2_DAT4 ),PINMUX_IPSR_MSEL (IP8_19_16 ,MSIOF1_RXD_G ,SEL_MSIOF1_6 ), -PINMUX_IPSR_MSEL (IP8_19_16 ,NFWP_N_B ,SEL_NDF_1 ), +PINMUX_IPSR_MSEL (IP8_19_16 ,NFWP_N_B ,SEL_NDFC_1 ),PINMUX_IPSR_MSEL (IP8_19_16 ,TS_SCK1_B ,SEL_TSIF1_1 ),PINMUX_IPSR_MSEL (IP8_19_16 ,STP_ISCLK_1_B ,SEL_SSP1_1_1 ),PINMUX_IPSR_GPSR (IP8_23_20 ,SD1_DAT1 ),PINMUX_IPSR_GPSR (IP8_23_20 ,SD2_DAT5 ),PINMUX_IPSR_MSEL (IP8_23_20 ,MSIOF1_TXD_G ,SEL_MSIOF1_6 ), -PINMUX_IPSR_MSEL (IP8_23_20 ,NFDATA14_B ,SEL_NDF_1 ), +PINMUX_IPSR_MSEL (IP8_23_20 ,NFDATA14_B ,SEL_NDFC_1 ),PINMUX_IPSR_MSEL (IP8_23_20 ,TS_SPSYNC1_B ,SEL_TSIF1_1 ),PINMUX_IPSR_MSEL (IP8_23_20 ,STP_ISSYNC_1_B ,SEL_SSP1_1_1 ),PINMUX_IPSR_GPSR (IP8_27_24 ,SD1_DAT2 ),PINMUX_IPSR_GPSR (IP8_27_24 ,SD2_DAT6 ),PINMUX_IPSR_MSEL (IP8_27_24 ,MSIOF1_SS1_G ,SEL_MSIOF1_6 ), -PINMUX_IPSR_MSEL (IP8_27_24 ,NFDATA15_B ,SEL_NDF_1 ), +PINMUX_IPSR_MSEL (IP8_27_24 ,NFDATA15_B ,SEL_NDFC_1 ),PINMUX_IPSR_MSEL (IP8_27_24 ,TS_SDAT1_B ,SEL_TSIF1_1 ),PINMUX_IPSR_MSEL (IP8_27_24 ,STP_ISD_1_B ,SEL_SSP1_1_1 ),PINMUX_IPSR_GPSR (IP8_31_28 ,SD1_DAT3 ),PINMUX_IPSR_GPSR (IP8_31_28 ,SD2_DAT7 ),PINMUX_IPSR_MSEL (IP8_31_28 ,MSIOF1_SS2_G ,SEL_MSIOF1_6 ), -PINMUX_IPSR_MSEL (IP8_31_28 ,NFRB_N_B ,SEL_NDF_1 ), +PINMUX_IPSR_MSEL (IP8_31_28 ,NFRB_N_B ,SEL_NDFC_1 ),PINMUX_IPSR_MSEL (IP8_31_28 ,TS_SDEN1_B ,SEL_TSIF1_1 ), PINMUX_IPSR_MSEL(IP8_31_28, STP_ISEN_1_B, SEL_SSP1_1_1),
@@ -1110,16 +1110,20 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP11_7_4 ,NFCLE ),PINMUX_IPSR_GPSR (IP11_11_8 ,SD0_CD ), +PINMUX_IPSR_MSEL (IP11_11_8 ,NFDATA14_A ,SEL_NDFC_0 ),PINMUX_IPSR_MSEL (IP11_11_8 ,SCL2_B ,SEL_I2C2_1 ),PINMUX_IPSR_MSEL (IP11_11_8 ,SIM0_RST_A ,SEL_SIMCARD_0 ),PINMUX_IPSR_GPSR (IP11_15_12 ,SD0_WP ), +PINMUX_IPSR_MSEL (IP11_15_12 ,NFDATA15_A ,SEL_NDFC_0 ),PINMUX_IPSR_MSEL (IP11_15_12 ,SDA2_B ,SEL_I2C2_1 ),PINMUX_IPSR_GPSR (IP11_19_16 ,SD1_CD ), +PINMUX_IPSR_MSEL (IP11_19_16 ,NFRB_N_A ,SEL_NDFC_0 ),PINMUX_IPSR_MSEL (IP11_19_16 ,SIM0_CLK_B ,SEL_SIMCARD_1 ),PINMUX_IPSR_GPSR (IP11_23_20 ,SD1_WP ), +PINMUX_IPSR_MSEL (IP11_23_20 ,NFCE_N_A ,SEL_NDFC_0 ),PINMUX_IPSR_MSEL (IP11_23_20 ,SIM0_D_B ,SEL_SIMCARD_1 ), PINMUX_IPSR_GPSR(IP11_27_24, SCK0),
@@ -1263,7 +1267,7 @@ static const u16 pinmux_data[] = {/* IPSR14 */ PINMUX_IPSR_GPSR (IP14_3_0 ,MSIOF0_SS1 ),PINMUX_IPSR_MSEL (IP14_3_0 ,RX5_A ,SEL_SCIF5_0 ), -PINMUX_IPSR_MSEL (IP14_3_0 ,NFWP_N_A ,SEL_NDF_0 ), +PINMUX_IPSR_MSEL (IP14_3_0 ,NFWP_N_A ,SEL_NDFC_0 ),PINMUX_IPSR_MSEL (IP14_3_0 ,AUDIO_CLKA_C ,SEL_ADG_A_2 ),PINMUX_IPSR_MSEL (IP14_3_0 ,SSI_SCK2_A ,SEL_SSI2_0 ), PINMUX_IPSR_MSEL(IP14_3_0, STP_IVCXO27_0_C, SEL_SSP1_0_2),
Signature · 1 line
2.7.4
Re: [PATCH 3/3] pinctrl: sh-pfc: r8a7796: Fix IPSR and MOD_SEL register pin assignment for NDFC pins group
Quoted 6 lines · Ulrich Hecht
From: Takeshi Kihara <[email protected]>
This patch fixes to set IPSR and
MOD_SELwhen using NFDATA{14,15}_A and NF{RB,WP}_N_A pin function is selected. And renamessMOD_SEL2bit22 value definition name toSEL_NDFC.
Quoted 7 lines
This is a correction to the incorrect implementation of
MOD_SELregister pin assignment for R8A7796 SoC specification of R-Car Gen3 Hardware User's Manual Rev.0.53E.Fixes f9aece7344bd ("pinctrl: sh-pfc: Initial R8A7796 PFC support")Signed-off-by Takeshi Kihara <[email protected]>Signed-off-by Ulrich Hecht <[email protected]>
and queueing in sh-pfc-for-v4.17.
I guess this applies to M3-N, too?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 6 lines · Ulrich Hecht
Hi!
This series contains fixes to the PFC register definitions for r8a7795 and r8a7796 from the BSP that are not upstream yet.
As far as I could tell, these changes check out with the Gen3 datasheet revision 0.80.
Agreed.