pinctrl: renesas: Fix r8a779{5, 6, 65} assign to GP7_03/02 of GPSR7
Subsystems (2)
PATCH 1/9 pinctrl: renesas: Fix r8a779{5, 6, 65} assign to GP7_03/02 of GPSR7
From: Hiroyuki Yokoyama <[email protected]>
This patch is change the bit assignment of "HDMI1_CEC" to "GP7_03", and "HDMI0_CEC" to "GP7_02". This information was confirmed in the R-Car Gen3 Hardware Manual Rev.1.50.
--- drivers/pinctrl/renesas/pfc-r8a7795.c | 55 ++++++++++++++------------- drivers/pinctrl/renesas/pfc-r8a7796.c | 42 +++++++++++++------- 2 files changed, 58 insertions(+), 39 deletions(-)
drivers/pinctrl/renesas/pfc-r8a7795.c +29 -26
@@ -2,7 +2,7 @@/* * R8A7795 ES2.0+ processor support - PFC hardware block. * -* Copyright (C) 2015-2016 Renesas Electronics Corporation +* Copyright (C) 2015-2019 Renesas Electronics Corporation */ #include <common.h>
@@ -202,8 +202,8 @@#define GPSR6_0 F_(SSI_SCK01239, IP14_23_20)/* GPSR7 */ -#define GPSR7_3 FM(HDMI1_CEC) -#define GPSR7_2 FM(HDMI0_CEC) +#define GPSR7_3 FM(GP7_03) +#define GPSR7_2 FM(GP7_02)#define GPSR7_1 FM(AVS2)#define GPSR7_0 FM(AVS1)
@@ -588,8 +588,8 @@ static const u16 pinmux_data[] = {PINMUX_SINGLE (AVS1 ),PINMUX_SINGLE (AVS2 ),PINMUX_SINGLE (CLKOUT ), -PINMUX_SINGLE (HDMI0_CEC ), -PINMUX_SINGLE (HDMI1_CEC ), +PINMUX_SINGLE (GP7_02 ), +PINMUX_SINGLE (GP7_03 ),PINMUX_SINGLE (I2C_SEL_0_1 ),PINMUX_SINGLE (I2C_SEL_3_1 ), PINMUX_SINGLE(I2C_SEL_5_1),
@@ -2126,20 +2126,23 @@ static const unsigned int du_disp_mux[] = { DU_DISP_MARK, }; -/* - HDMI ------------------------------------------------------------------- */ -static const unsigned int hdmi0_cec_pins[] = { -/* HDMI0_CEC */ +/* - GP7_02/03 -------------------------------------------------------------- */ +static const unsigned int gp7_02_pins[] = { +/* GP7_02 */ RCAR_GP_PIN (7 ,2 ), }; -static const unsigned int hdmi0_cec_mux[] = { -HDMI0_CEC_MARK , + +static const unsigned int gp7_02_mux[] = { +GP7_02_MARK , }; -static const unsigned int hdmi1_cec_pins[] = { -/* HDMI1_CEC */ + +static const unsigned int gp7_03_pins[] = { +/* GP7_03 */ RCAR_GP_PIN (7 ,3 ), }; -static const unsigned int hdmi1_cec_mux[] = { -HDMI1_CEC_MARK , + +static const unsigned int gp7_03_mux[] = { +GP7_03_MARK , };/* - HSCIF0 ----------------------------------------------------------------- */
@@ -4230,8 +4233,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (du_oddf),SH_PFC_PIN_GROUP (du_cde),SH_PFC_PIN_GROUP (du_disp), -SH_PFC_PIN_GROUP (hdmi0_cec), -SH_PFC_PIN_GROUP (hdmi1_cec), +SH_PFC_PIN_GROUP (gp7_02), +SH_PFC_PIN_GROUP (gp7_03),SH_PFC_PIN_GROUP (hscif0_data),SH_PFC_PIN_GROUP (hscif0_clk), SH_PFC_PIN_GROUP(hscif0_ctrl),
@@ -4613,12 +4616,12 @@ static const char * const du_groups[] = { "du_disp", }; -static const char *const hdmi0_groups[] = { -"hdmi0_cec" , +static const char *const gp7_02_groups[] = { +"gp7_02" , }; -static const char *const hdmi1_groups[] = { -"hdmi1_cec" , +static const char *const gp7_03_groups[] = { +"gp7_03" , };static const char *const hscif0_groups[] = {
@@ -5027,8 +5030,8 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (drif2),SH_PFC_FUNCTION (drif3),SH_PFC_FUNCTION (du), -SH_PFC_FUNCTION (hdmi0), -SH_PFC_FUNCTION (hdmi1), +SH_PFC_FUNCTION (gp7_02), +SH_PFC_FUNCTION (gp7_03),SH_PFC_FUNCTION (hscif0),SH_PFC_FUNCTION (hscif1), SH_PFC_FUNCTION(hscif2),
@@ -5749,8 +5752,8 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = { { RCAR_GP_PIN(0, 15), 24, 3 }, /* D15 */ { RCAR_GP_PIN(7, 0), 20, 3 }, /* AVS1 */ { RCAR_GP_PIN(7, 1), 16, 3 }, /* AVS2 */ - { RCAR_GP_PIN(7, 2), 12, 3 }, /* HDMI0_CEC */ - { RCAR_GP_PIN(7, 3), 8, 3 }, /* HDMI1_CEC */ + { RCAR_GP_PIN(7, 2), 12, 3 }, /* GP7_02 */ + { RCAR_GP_PIN(7, 3), 8, 3 }, /* GP7_03 */ { PIN_A_NUMBER('P', 7), 4, 2 }, /* DU_DOTCLKIN0 */ { PIN_A_NUMBER('P', 8), 0, 2 }, /* DU_DOTCLKIN1 */ } },
@@ -6004,8 +6007,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { [25] = RCAR_GP_PIN(0, 15), /* D15 */ [26] = RCAR_GP_PIN(7, 0), /* AVS1 */ [27] = RCAR_GP_PIN(7, 1), /* AVS2 */ - [28] = RCAR_GP_PIN(7, 2), /* HDMI0_CEC */ - [29] = RCAR_GP_PIN(7, 3), /* HDMI1_CEC */ + [28] = RCAR_GP_PIN(7, 2), /* GP7_02 */ + [29] = RCAR_GP_PIN(7, 3), /* GP7_03 */ [30] = PIN_A_NUMBER('P', 7), /* DU_DOTCLKIN0 */ [31] = PIN_A_NUMBER('P', 8), /* DU_DOTCLKIN1 */ } },
drivers/pinctrl/renesas/pfc-r8a7796.c +29 -13
92 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH 2/9 pinctrl: renesas: Fix r8a779{5, 6, 65} rename sel_adg_ to sel_adg
From: Hiroyuki Yokoyama <[email protected]>
This patch fixes to the correct names, and "_" is not include after "adg" for r8a7795/r8a7796/r8a77965. This information was confirmed in the R-Car Gen3 Hardware Manual Rev.1.50.
--- drivers/pinctrl/renesas/pfc-r8a7795.c | 20 ++++++++++---------- drivers/pinctrl/renesas/pfc-r8a7796.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-)
drivers/pinctrl/renesas/pfc-r8a7795.c +10 -10
@@ -463,7 +463,7 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#define MOD_SEL0_9_8 FM(SEL_DRIF1_0) FM(SEL_DRIF1_1) FM(SEL_DRIF1_2) F_(0, 0)#define MOD_SEL0_7_6 FM(SEL_DRIF0_0) FM(SEL_DRIF0_1) FM(SEL_DRIF0_2) F_(0, 0)#define MOD_SEL0_5 FM(SEL_CANFD0_0) FM(SEL_CANFD0_1) -#define MOD_SEL0_4_3 FM(SEL_ADG_A_0) FM(SEL_ADG_A_1) FM(SEL_ADG_A_2) FM(SEL_ADG_A_3) +#define MOD_SEL0_4_3 FM(SEL_ADGA_0) FM(SEL_ADGA_1) FM(SEL_ADGA_2) FM(SEL_ADGA_3)/* MOD_SEL1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ #define MOD_SEL1_31_30 FM(SEL_TSIF1_0) FM(SEL_TSIF1_1) FM(SEL_TSIF1_2) FM(SEL_TSIF1_3)
@@ -499,8 +499,8 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#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) -#define MOD_SEL2_18 FM(SEL_ADG_B_0) FM(SEL_ADG_B_1) -#define MOD_SEL2_17 FM(SEL_ADG_C_0) FM(SEL_ADG_C_1) +#define MOD_SEL2_18 FM(SEL_ADGB_0) FM(SEL_ADGB_1) +#define MOD_SEL2_17 FM(SEL_ADGC_0) FM(SEL_ADGC_1)#define MOD_SEL2_0 FM(SEL_VIN4_0) FM(SEL_VIN4_1)#define PINMUX_MOD_SELS \
@@ -1124,7 +1124,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP11_27_24 ,SCK0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,HSCK1_B ,SEL_HSCIF1_1 ),PINMUX_IPSR_MSEL (IP11_27_24 ,MSIOF1_SS2_B ,SEL_MSIOF1_1 ), -PINMUX_IPSR_MSEL (IP11_27_24 ,AUDIO_CLKC_B ,SEL_ADG_C_1 ), +PINMUX_IPSR_MSEL (IP11_27_24 ,AUDIO_CLKC_B ,SEL_ADGC_1 ),PINMUX_IPSR_MSEL (IP11_27_24 ,SDA2_A ,SEL_I2C2_0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,SIM0_RST_B ,SEL_SIMCARD_1 ), PINMUX_IPSR_MSEL(IP11_27_24, STP_OPWM_0_C, SEL_SSP1_0_2),
@@ -1157,7 +1157,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP12_11_8 ,RTS0_N ),PINMUX_IPSR_MSEL (IP12_11_8 ,HRTS1_N_B ,SEL_HSCIF1_1 ),PINMUX_IPSR_MSEL (IP12_11_8 ,MSIOF1_SS1_B ,SEL_MSIOF1_1 ), -PINMUX_IPSR_MSEL (IP12_11_8 ,AUDIO_CLKA_B ,SEL_ADG_A_1 ), +PINMUX_IPSR_MSEL (IP12_11_8 ,AUDIO_CLKA_B ,SEL_ADGA_1 ),PINMUX_IPSR_MSEL (IP12_11_8 ,SCL2_A ,SEL_I2C2_0 ),PINMUX_IPSR_MSEL (IP12_11_8 ,STP_IVCXO27_1_C ,SEL_SSP1_1_2 ), PINMUX_IPSR_MSEL(IP12_11_8, RIF0_SYNC_B, SEL_DRIF0_1),
@@ -1216,7 +1216,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 ,AUDIO_CLKB_A ,SEL_ADGB_0 ),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),
@@ -1263,7 +1263,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP14_3_0 ,MSIOF0_SS1 ),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 ,AUDIO_CLKA_C ,SEL_ADGA_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 ), PINMUX_IPSR_GPSR(IP14_3_0, AUDIO_CLKOUT3_A),
@@ -1272,7 +1272,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP14_7_4 ,MSIOF0_SS2 ),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 ,AUDIO_CLKC_A ,SEL_ADGC_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),
@@ -1403,10 +1403,10 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP16_31_28 ,SCK5_A ,SEL_SCIF5_0 ),/* IPSR17 */ -PINMUX_IPSR_MSEL (IP17_3_0 ,AUDIO_CLKA_A ,SEL_ADG_A_0 ), +PINMUX_IPSR_MSEL (IP17_3_0 ,AUDIO_CLKA_A ,SEL_ADGA_0 ),PINMUX_IPSR_GPSR (IP17_3_0 ,CC5_OSCOUT ), -PINMUX_IPSR_MSEL (IP17_7_4 ,AUDIO_CLKB_B ,SEL_ADG_B_1 ), +PINMUX_IPSR_MSEL (IP17_7_4 ,AUDIO_CLKB_B ,SEL_ADGB_1 ),PINMUX_IPSR_MSEL (IP17_7_4 ,SCIF_CLK_A ,SEL_SCIF_0 ),PINMUX_IPSR_MSEL (IP17_7_4 ,STP_IVCXO27_1_D ,SEL_SSP1_1_3 ), PINMUX_IPSR_MSEL(IP17_7_4, REMOCON_A, SEL_REMOCON_0),
drivers/pinctrl/renesas/pfc-r8a7796.c +10 -10
@@ -469,7 +469,7 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#define MOD_SEL0_9_8 FM(SEL_DRIF1_0) FM(SEL_DRIF1_1) FM(SEL_DRIF1_2) F_(0, 0)#define MOD_SEL0_7_6 FM(SEL_DRIF0_0) FM(SEL_DRIF0_1) FM(SEL_DRIF0_2) F_(0, 0)#define MOD_SEL0_5 FM(SEL_CANFD0_0) FM(SEL_CANFD0_1) -#define MOD_SEL0_4_3 FM(SEL_ADG_A_0) FM(SEL_ADG_A_1) FM(SEL_ADG_A_2) FM(SEL_ADG_A_3) +#define MOD_SEL0_4_3 FM(SEL_ADGA_0) FM(SEL_ADGA_1) FM(SEL_ADGA_2) FM(SEL_ADGA_3)/* MOD_SEL1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ #define MOD_SEL1_31_30 FM(SEL_TSIF1_0) FM(SEL_TSIF1_1) FM(SEL_TSIF1_2) FM(SEL_TSIF1_3)
@@ -506,8 +506,8 @@ FM(IP16_31_28) IP16_31_28 FM(IP17_31_28) IP17_31_28#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) -#define MOD_SEL2_18 FM(SEL_ADG_B_0) FM(SEL_ADG_B_1) -#define MOD_SEL2_17 FM(SEL_ADG_C_0) FM(SEL_ADG_C_1) +#define MOD_SEL2_18 FM(SEL_ADGB_0) FM(SEL_ADGB_1) +#define MOD_SEL2_17 FM(SEL_ADGC_0) FM(SEL_ADGC_1)#define MOD_SEL2_0 FM(SEL_VIN4_0) FM(SEL_VIN4_1)#define PINMUX_MOD_SELS \
@@ -1129,7 +1129,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP11_27_24 ,SCK0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,HSCK1_B ,SEL_HSCIF1_1 ),PINMUX_IPSR_MSEL (IP11_27_24 ,MSIOF1_SS2_B ,SEL_MSIOF1_1 ), -PINMUX_IPSR_MSEL (IP11_27_24 ,AUDIO_CLKC_B ,SEL_ADG_C_1 ), +PINMUX_IPSR_MSEL (IP11_27_24 ,AUDIO_CLKC_B ,SEL_ADGC_1 ),PINMUX_IPSR_MSEL (IP11_27_24 ,SDA2_A ,SEL_I2C2_0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,SIM0_RST_B ,SEL_SIMCARD_1 ), PINMUX_IPSR_MSEL(IP11_27_24, STP_OPWM_0_C, SEL_SSP1_0_2),
@@ -1162,7 +1162,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP12_11_8 ,RTS0_N ),PINMUX_IPSR_MSEL (IP12_11_8 ,HRTS1_N_B ,SEL_HSCIF1_1 ),PINMUX_IPSR_MSEL (IP12_11_8 ,MSIOF1_SS1_B ,SEL_MSIOF1_1 ), -PINMUX_IPSR_MSEL (IP12_11_8 ,AUDIO_CLKA_B ,SEL_ADG_A_1 ), +PINMUX_IPSR_MSEL (IP12_11_8 ,AUDIO_CLKA_B ,SEL_ADGA_1 ),PINMUX_IPSR_MSEL (IP12_11_8 ,SCL2_A ,SEL_I2C2_0 ),PINMUX_IPSR_MSEL (IP12_11_8 ,STP_IVCXO27_1_C ,SEL_SSP1_1_2 ), PINMUX_IPSR_MSEL(IP12_11_8, RIF0_SYNC_B, SEL_DRIF0_1),
@@ -1221,7 +1221,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 ,AUDIO_CLKB_A ,SEL_ADGB_0 ),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),
@@ -1268,7 +1268,7 @@ static const u16 pinmux_data[] = {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_NDFC_0 ), -PINMUX_IPSR_MSEL (IP14_3_0 ,AUDIO_CLKA_C ,SEL_ADG_A_2 ), +PINMUX_IPSR_MSEL (IP14_3_0 ,AUDIO_CLKA_C ,SEL_ADGA_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 ), PINMUX_IPSR_GPSR(IP14_3_0, AUDIO_CLKOUT3_A),
@@ -1277,7 +1277,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP14_7_4 ,MSIOF0_SS2 ),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 ,AUDIO_CLKC_A ,SEL_ADGC_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),
@@ -1405,10 +1405,10 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP16_31_28 ,SCK5_A ,SEL_SCIF5_0 ),/* IPSR17 */ -PINMUX_IPSR_MSEL (IP17_3_0 ,AUDIO_CLKA_A ,SEL_ADG_A_0 ), +PINMUX_IPSR_MSEL (IP17_3_0 ,AUDIO_CLKA_A ,SEL_ADGA_0 ),PINMUX_IPSR_GPSR (IP17_3_0 ,CC5_OSCOUT ), -PINMUX_IPSR_MSEL (IP17_7_4 ,AUDIO_CLKB_B ,SEL_ADG_B_1 ), +PINMUX_IPSR_MSEL (IP17_7_4 ,AUDIO_CLKB_B ,SEL_ADGB_1 ),PINMUX_IPSR_MSEL (IP17_7_4 ,SCIF_CLK_A ,SEL_SCIF_0 ),PINMUX_IPSR_MSEL (IP17_7_4 ,STP_IVCXO27_1_D ,SEL_SSP1_1_3 ), PINMUX_IPSR_MSEL(IP17_7_4, REMOCON_A, SEL_REMOCON_0),
Signature · 1 line
2.19.2
PATCH 3/9 pinctrl: renesas: Remove r8a779{5, 6, 65} CC5_OSCOUT of IP17
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
This patch removes CC5_OSCOUT assignment of IP17[3:0] of r8a7795
/ r8a7796 / r8a77965. This information was confirmed in the R-Car
Gen3 Hardware Manual Rev.1.50.
--- drivers/pinctrl/renesas/pfc-r8a7795.c | 3 +-- drivers/pinctrl/renesas/pfc-r8a7796.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/pinctrl/renesas/pfc-r8a7795.c +1 -2
@@ -352,7 +352,7 @@#define IP16_23_20 FM(SSI_SDATA7) FM(HCTS2_N_B) FM(MSIOF1_RXD_C) F_(0, 0) F_(0, 0) FM(TS_SDEN1_A) FM(STP_ISEN_1_A) FM(RIF1_D0_A) FM(RIF3_D0_A) F_(0, 0) FM(TCLK2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP16_27_24 FM(SSI_SDATA8) FM(HRTS2_N_B) FM(MSIOF1_TXD_C) F_(0, 0) F_(0, 0) FM(TS_SPSYNC1_A)FM(STP_ISSYNC_1_A) FM(RIF1_D1_A) FM(RIF3_D1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP16_31_28 FM(SSI_SDATA9_A) FM(HSCK2_B) FM(MSIOF1_SS1_C) FM(HSCK1_A) FM(SSI_WS1_B) FM(SCK1) FM(STP_IVCXO27_1_A) FM(SCK5_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP17_3_0 FM(AUDIO_CLKA_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(CC5_OSCOUT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP17_3_0 FM(AUDIO_CLKA_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP17_7_4 FM(AUDIO_CLKB_B) FM(SCIF_CLK_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(STP_IVCXO27_1_D) FM(REMOCON_A) F_(0, 0) F_(0, 0) FM(TCLK1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP17_11_8 FM(USB0_PWEN) F_(0, 0) F_(0, 0) FM(SIM0_RST_C) F_(0, 0) FM(TS_SCK1_D) FM(STP_ISCLK_1_D) FM(BPFCLK_B) FM(RIF3_CLK_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(HSCK2_C) F_(0, 0) F_(0, 0)#define IP17_15_12 FM(USB0_OVC) F_(0, 0) F_(0, 0) FM(SIM0_D_C) F_(0, 0) FM(TS_SDAT1_D) FM(STP_ISD_1_D) F_(0, 0) FM(RIF3_SYNC_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(HRX2_C) F_(0, 0) F_(0, 0)
@@ -1404,7 +1404,6 @@ static const u16 pinmux_data[] = {/* IPSR17 */ PINMUX_IPSR_MSEL (IP17_3_0 ,AUDIO_CLKA_A ,SEL_ADGA_0 ), -PINMUX_IPSR_GPSR (IP17_3_0 ,CC5_OSCOUT ),PINMUX_IPSR_MSEL (IP17_7_4 ,AUDIO_CLKB_B ,SEL_ADGB_1 ), PINMUX_IPSR_MSEL(IP17_7_4, SCIF_CLK_A, SEL_SCIF_0),
drivers/pinctrl/renesas/pfc-r8a7796.c +1 -2
@@ -358,7 +358,7 @@#define IP16_23_20 FM(SSI_SDATA7) FM(HCTS2_N_B) FM(MSIOF1_RXD_C) F_(0, 0) F_(0, 0) FM(TS_SDEN1_A) FM(STP_ISEN_1_A) FM(RIF1_D0_A) FM(RIF3_D0_A) F_(0, 0) FM(TCLK2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP16_27_24 FM(SSI_SDATA8) FM(HRTS2_N_B) FM(MSIOF1_TXD_C) F_(0, 0) F_(0, 0) FM(TS_SPSYNC1_A)FM(STP_ISSYNC_1_A) FM(RIF1_D1_A) FM(RIF3_D1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP16_31_28 FM(SSI_SDATA9_A) FM(HSCK2_B) FM(MSIOF1_SS1_C) FM(HSCK1_A) FM(SSI_WS1_B) FM(SCK1) FM(STP_IVCXO27_1_A) FM(SCK5_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP17_3_0 FM(AUDIO_CLKA_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(CC5_OSCOUT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP17_3_0 FM(AUDIO_CLKA_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP17_7_4 FM(AUDIO_CLKB_B) FM(SCIF_CLK_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(STP_IVCXO27_1_D) FM(REMOCON_A) F_(0, 0) F_(0, 0) FM(TCLK1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP17_11_8 FM(USB0_PWEN) F_(0, 0) F_(0, 0) FM(SIM0_RST_C) F_(0, 0) FM(TS_SCK1_D) FM(STP_ISCLK_1_D) FM(BPFCLK_B) FM(RIF3_CLK_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(HSCK2_C) F_(0, 0) F_(0, 0)#define IP17_15_12 FM(USB0_OVC) F_(0, 0) F_(0, 0) FM(SIM0_D_C) F_(0, 0) FM(TS_SDAT1_D) FM(STP_ISD_1_D) F_(0, 0) FM(RIF3_SYNC_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) FM(HRX2_C) F_(0, 0) F_(0, 0)
@@ -1406,7 +1406,6 @@ static const u16 pinmux_data[] = {/* IPSR17 */ PINMUX_IPSR_MSEL (IP17_3_0 ,AUDIO_CLKA_A ,SEL_ADGA_0 ), -PINMUX_IPSR_GPSR (IP17_3_0 ,CC5_OSCOUT ),PINMUX_IPSR_MSEL (IP17_7_4 ,AUDIO_CLKB_B ,SEL_ADGB_1 ), PINMUX_IPSR_MSEL(IP17_7_4, SCIF_CLK_A, SEL_SCIF_0),
Signature · 1 line
2.19.2
PATCH 4/9 pinctrl: renesas: Fix r8a779{6, 65} rename sel_ndfc to sel_ndf
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
This patch fixes the allocation name "sel_ndfc" of MOD_SEL2[22] of r8a7796 / r8a77965 to "sel_ndf". This information was confirmed in the R-Car Gen3 Hardware Manual Rev.1.50.
--- drivers/pinctrl/renesas/pfc-r8a7796.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/pinctrl/renesas/pfc-r8a7796.c +11 -11
@@ -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_NDFC_0) FM(SEL_NDFC_1) +#define MOD_SEL2_22 FM(SEL_NDF_0) FM(SEL_NDF_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_NDFC_1 ), +PINMUX_IPSR_MSEL (IP8_15_12 ,NFCE_N_B ,SEL_NDF_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_NDFC_1 ), +PINMUX_IPSR_MSEL (IP8_19_16 ,NFWP_N_B ,SEL_NDF_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_NDFC_1 ), +PINMUX_IPSR_MSEL (IP8_23_20 ,NFDATA14_B ,SEL_NDF_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_NDFC_1 ), +PINMUX_IPSR_MSEL (IP8_27_24 ,NFDATA15_B ,SEL_NDF_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_NDFC_1 ), +PINMUX_IPSR_MSEL (IP8_31_28 ,NFRB_N_B ,SEL_NDF_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,20 +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 ,NFDATA14_A ,SEL_NDF_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 ,NFDATA15_A ,SEL_NDF_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 ,NFRB_N_A ,SEL_NDF_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 ,NFCE_N_A ,SEL_NDF_0 ),PINMUX_IPSR_MSEL (IP11_23_20 ,SIM0_D_B ,SEL_SIMCARD_1 ), PINMUX_IPSR_GPSR(IP11_27_24, SCK0),
@@ -1267,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_NDFC_0 ), +PINMUX_IPSR_MSEL (IP14_3_0 ,NFWP_N_A ,SEL_NDF_0 ),PINMUX_IPSR_MSEL (IP14_3_0 ,AUDIO_CLKA_C ,SEL_ADGA_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.19.2
PATCH 5/9 pinctrl: renesas: r8a77990: Fix rename RTSx_N_TANS_x to RTSx_N_x
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
This patch fixes the allocation name "RTSx_N_TANS_x" of IPSR /
MOD_SEL0/1 of r8a77990 to "RTSx_N_x". This information was
confirmed in the R-Car Gen3 Hardware Manual Rev.1.50.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +17 -17
@@ -2,7 +2,7 @@/* * R8A77990 processor support - PFC hardware block. * -* Copyright (C) 2018 Renesas Electronics Corp. +* Copyright (C) 2018-2019 Renesas Electronics Corp. * * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c *
@@ -159,7 +159,7 @@#define GPSR5_7 F_(SCK2_A, IP12_7_4)#define GPSR5_6 F_(TX1, IP12_3_0)#define GPSR5_5 F_(RX1, IP11_31_28) -#define GPSR5_4 F_(RTS0_N_TANS_A, IP11_23_20) +#define GPSR5_4 F_(RTS0_N_A, IP11_23_20)#define GPSR5_3 F_(CTS0_N_A, IP11_19_16)#define GPSR5_2 F_(TX0_A, IP11_15_12)#define GPSR5_1 F_(RX0_A, IP11_11_8)
@@ -213,7 +213,7 @@#define IP3_3_0 FM(A1) FM(IRQ1) FM(PWM3_A) FM(DU_DOTCLKIN1) FM(VI5_DATA0_A) FM(DU_DISP_CDE) FM(SDA6_B) FM(IETX) FM(QCPV_QDE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP3_7_4 FM(A2) FM(IRQ2) FM(AVB_AVTP_PPS) FM(VI4_CLKENB) FM(VI5_DATA1_A) FM(DU_DISP) FM(SCL6_B) F_(0, 0) FM(QSTVB_QVE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP3_11_8 FM(A3) FM(CTS4_N_A) FM(PWM4_A) FM(VI4_DATA12) F_(0, 0) FM(DU_DOTCLKOUT0) FM(HTX3_D) FM(IECLK) FM(LCDOUT12) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3_15_12 FM(A4) FM(RTS4_N_TANS_A) FM(MSIOF3_SYNC_B) FM(VI4_DATA8) FM(PWM2_B) FM(DU_DG4) FM(RIF2_CLK_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3_15_12 FM(A4) FM(RTS4_N_A) FM(MSIOF3_SYNC_B) FM(VI4_DATA8) FM(PWM2_B) FM(DU_DG4) FM(RIF2_CLK_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP3_19_16 FM(A5) FM(SCK4_A) FM(MSIOF3_SCK_B) FM(VI4_DATA9) FM(PWM3_B) F_(0, 0) FM(RIF2_SYNC_B) F_(0, 0) FM(QPOLA) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP3_23_20 FM(A6) FM(RX4_A) FM(MSIOF3_RXD_B) FM(VI4_DATA10) F_(0, 0) F_(0, 0) FM(RIF2_D0_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP3_27_24 FM(A7) FM(TX4_A) FM(MSIOF3_TXD_B) FM(VI4_DATA11) F_(0, 0) F_(0, 0) FM(RIF2_D1_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
@@ -234,10 +234,10 @@#define IP5_15_12 FM(CS0_N) FM(SCL5) F_(0, 0) F_(0, 0) F_(0, 0) FM(DU_DR0) FM(VI4_DATA2_B) F_(0, 0) FM(LCDOUT16) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP5_19_16 FM(WE0_N) FM(SDA5) F_(0, 0) F_(0, 0) F_(0, 0) FM(DU_DR1) FM(VI4_DATA3_B) F_(0, 0) FM(LCDOUT17) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP5_23_20 FM(D0) FM(MSIOF3_SCK_A) F_(0, 0) F_(0, 0) F_(0, 0) FM(DU_DR2) FM(CTS4_N_C) F_(0, 0) FM(LCDOUT18) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP5_27_24 FM(D1) FM(MSIOF3_SYNC_A) FM(SCK3_A) FM(VI4_DATA23) FM(VI5_CLKENB_A) FM(DU_DB7) FM(RTS4_N_TANS_C) F_(0, 0) FM(LCDOUT7) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP5_27_24 FM(D1) FM(MSIOF3_SYNC_A) FM(SCK3_A) FM(VI4_DATA23) FM(VI5_CLKENB_A) FM(DU_DB7) FM(RTS4_N_C) F_(0, 0) FM(LCDOUT7) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP5_31_28 FM(D2) FM(MSIOF3_RXD_A) FM(RX5_C) F_(0, 0) FM(VI5_DATA14_A) FM(DU_DR3) FM(RX4_C) F_(0, 0) FM(LCDOUT19) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP6_3_0 FM(D3) FM(MSIOF3_TXD_A) FM(TX5_C) F_(0, 0) FM(VI5_DATA15_A) FM(DU_DR4) FM(TX4_C) F_(0, 0) FM(LCDOUT20) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP6_7_4 FM(D4) FM(CANFD1_TX) FM(HSCK3_B) FM(CAN1_TX) FM(RTS3_N_TANS_A) FM(MSIOF3_SS2_A) F_(0, 0) FM(VI5_DATA1_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP6_7_4 FM(D4) FM(CANFD1_TX) FM(HSCK3_B) FM(CAN1_TX) FM(RTS3_N_A) FM(MSIOF3_SS2_A) F_(0, 0) FM(VI5_DATA1_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP6_11_8 FM(D5) FM(RX3_A) FM(HRX3_B) F_(0, 0) F_(0, 0) FM(DU_DR5) FM(VI4_DATA4_B) F_(0, 0) FM(LCDOUT21) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP6_15_12 FM(D6) FM(TX3_A) FM(HTX3_B) F_(0, 0) F_(0, 0) FM(DU_DR6) FM(VI4_DATA5_B) F_(0, 0) FM(LCDOUT22) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP6_19_16 FM(D7) FM(CANFD1_RX) FM(IRQ5) FM(CAN1_RX) FM(CTS3_N_A) F_(0, 0) F_(0, 0) FM(VI5_DATA2_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
@@ -283,8 +283,8 @@#define IP11_11_8 FM(RX0_A) FM(HRX1_A) FM(SSI_SCK2_A) FM(RIF1_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) FM(TS_SCK1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP11_15_12 FM(TX0_A) FM(HTX1_A) FM(SSI_WS2_A) FM(RIF1_D0) F_(0, 0) F_(0, 0) F_(0, 0) FM(TS_SDAT1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP11_19_16 FM(CTS0_N_A) FM(NFDATA14_A) FM(AUDIO_CLKOUT_A) FM(RIF1_D1) FM(SCIF_CLK_A) FM(FMCLK_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP11_23_20 FM(RTS0_N_TANS_A) FM(NFDATA15_A) FM(AUDIO_CLKOUT1_A) FM(RIF1_CLK) FM(SCL2_A) FM(FMIN_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP11_27_24 FM(SCK0_A) FM(HSCK1_A) FM(USB3HS0_ID) FM(RTS1_N_TANS) FM(SDA2_A) FM(FMCLK_C) F_(0, 0) F_(0, 0) FM(USB1_ID) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP11_23_20 FM(RTS0_N_A) FM(NFDATA15_A) FM(AUDIO_CLKOUT1_A) FM(RIF1_CLK) FM(SCL2_A) FM(FMIN_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP11_27_24 FM(SCK0_A) FM(HSCK1_A) FM(USB3HS0_ID) FM(RTS1_N) FM(SDA2_A) FM(FMCLK_C) F_(0, 0) F_(0, 0) FM(USB1_ID) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP11_31_28 FM(RX1) FM(HRX2_B) FM(SSI_SCK9_B) FM(AUDIO_CLKOUT1_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 - F */
@@ -661,7 +661,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP3_11_8 ,LCDOUT12 ),PINMUX_IPSR_GPSR (IP3_15_12 ,A4 ), -PINMUX_IPSR_MSEL (IP3_15_12 ,RTS4_N_TANS_A ,SEL_SCIF4_0 ), +PINMUX_IPSR_MSEL (IP3_15_12 ,RTS4_N_A ,SEL_SCIF4_0 ),PINMUX_IPSR_MSEL (IP3_15_12 ,MSIOF3_SYNC_B ,SEL_MSIOF3_1 ),PINMUX_IPSR_GPSR (IP3_15_12 ,VI4_DATA8 ), PINMUX_IPSR_MSEL(IP3_15_12, PWM2_B, SEL_PWM2_1),
@@ -811,7 +811,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP5_27_24 ,VI4_DATA23 ),PINMUX_IPSR_MSEL (IP5_27_24 ,VI5_CLKENB_A ,SEL_VIN5_0 ),PINMUX_IPSR_GPSR (IP5_27_24 ,DU_DB7 ), -PINMUX_IPSR_MSEL (IP5_27_24 ,RTS4_N_TANS_C ,SEL_SCIF4_2 ), +PINMUX_IPSR_MSEL (IP5_27_24 ,RTS4_N_C ,SEL_SCIF4_2 ),PINMUX_IPSR_GPSR (IP5_27_24 ,LCDOUT7 ), PINMUX_IPSR_GPSR(IP5_31_28, D2),
@@ -835,7 +835,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP6_7_4 ,CANFD1_TX ),PINMUX_IPSR_MSEL (IP6_7_4 ,HSCK3_B ,SEL_HSCIF3_1 ),PINMUX_IPSR_GPSR (IP6_7_4 ,CAN1_TX ), -PINMUX_IPSR_MSEL (IP6_7_4 ,RTS3_N_TANS_A ,SEL_SCIF3_0 ), +PINMUX_IPSR_MSEL (IP6_7_4 ,RTS3_N_A ,SEL_SCIF3_0 ),PINMUX_IPSR_GPSR (IP6_7_4 ,MSIOF3_SS2_A ), PINMUX_IPSR_MSEL(IP6_7_4, VI5_DATA1_B, SEL_VIN5_1),
@@ -1076,7 +1076,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP11_19_16 ,SCIF_CLK_A ,SEL_SCIF_0 ),PINMUX_IPSR_MSEL (IP11_19_16 ,FMCLK_A ,SEL_FM_0 ), -PINMUX_IPSR_MSEL (IP11_23_20 ,RTS0_N_TANS_A ,SEL_SCIF0_0 ), +PINMUX_IPSR_MSEL (IP11_23_20 ,RTS0_N_A ,SEL_SCIF0_0 ),PINMUX_IPSR_MSEL (IP11_23_20 ,NFDATA15_A ,SEL_NDFC_0 ),PINMUX_IPSR_GPSR (IP11_23_20 ,AUDIO_CLKOUT1_A ), PINMUX_IPSR_GPSR(IP11_23_20, RIF1_CLK),
@@ -1086,7 +1086,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP11_27_24 ,SCK0_A ,SEL_SCIF0_0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,HSCK1_A ,SEL_HSCIF1_0 ),PINMUX_IPSR_GPSR (IP11_27_24 ,USB3HS0_ID ), -PINMUX_IPSR_GPSR (IP11_27_24 ,RTS1_N_TANS ), +PINMUX_IPSR_GPSR (IP11_27_24 ,RTS1_N ),PINMUX_IPSR_MSEL (IP11_27_24 ,SDA2_A ,SEL_I2C2_0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,FMCLK_C ,SEL_FM_2 ), PINMUX_IPSR_GPSR(IP11_27_24, USB1_ID),
@@ -2812,7 +2812,7 @@ static const unsigned int scif0_ctrl_a_pins[] = { };static const unsigned int scif0_ctrl_a_mux[] = { -RTS0_N_TANS_A_MARK ,CTS0_N_A_MARK , +RTS0_N_A_MARK ,CTS0_N_A_MARK , };static const unsigned int scif0_data_b_pins[] = {
@@ -2858,7 +2858,7 @@ static const unsigned int scif1_ctrl_pins[] = { };static const unsigned int scif1_ctrl_mux[] = { -RTS1_N_TANS_MARK ,CTS1_N_MARK , +RTS1_N_MARK ,CTS1_N_MARK , };/* - SCIF2 ------------------------------------------------------------------ */
@@ -2914,7 +2914,7 @@ static const unsigned int scif3_ctrl_a_pins[] = { };static const unsigned int scif3_ctrl_a_mux[] = { -RTS3_N_TANS_A_MARK ,CTS3_N_A_MARK , +RTS3_N_A_MARK ,CTS3_N_A_MARK , };static const unsigned int scif3_data_b_pins[] = {
@@ -2969,7 +2969,7 @@ static const unsigned int scif4_ctrl_a_pins[] = { };static const unsigned int scif4_ctrl_a_mux[] = { -RTS4_N_TANS_A_MARK ,CTS4_N_A_MARK , +RTS4_N_A_MARK ,CTS4_N_A_MARK , };static const unsigned int scif4_data_b_pins[] = {
@@ -3005,7 +3005,7 @@ static const unsigned int scif4_ctrl_c_pins[] = { };static const unsigned int scif4_ctrl_c_mux[] = { -RTS4_N_TANS_C_MARK ,CTS4_N_C_MARK , +RTS4_N_C_MARK ,CTS4_N_C_MARK , };/* - SCIF5 ------------------------------------------------------------------ */
Signature · 1 line
2.19.2
PATCH 6/9 pinctrl: renesas: r8a77990: Fix MOD_SEL0 bit2 when using RX2, TX2 and SCK2
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
According to the R-Car Gen3 Hardware Manual Rev 1.50, the MOD_SEL0 bit2 is set when RX2_{A,B}, TX2_{A,B} and SCK2_A pin functions are selected.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +5 -5
@@ -1102,7 +1102,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP12_3_0 ,SSI_WS9_B ,SEL_SSI9_1 ),PINMUX_IPSR_GPSR (IP12_3_0 ,AUDIO_CLKOUT3_B ), -PINMUX_IPSR_GPSR (IP12_7_4 ,SCK2_A ), +PINMUX_IPSR_MSEL (IP12_7_4 ,SCK2_A ,SEL_SCIF2_0 ),PINMUX_IPSR_MSEL (IP12_7_4 ,HSCK0_A ,SEL_HSCIF0_0 ),PINMUX_IPSR_MSEL (IP12_7_4 ,AUDIO_CLKB_A ,SEL_ADGB_0 ), PINMUX_IPSR_GPSR(IP12_7_4, CTS1_N),
@@ -1110,14 +1110,14 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP12_7_4 ,REMOCON_A ,SEL_REMOCON_0 ),PINMUX_IPSR_MSEL (IP12_7_4 ,SCIF_CLK_B ,SEL_SCIF_1 ), -PINMUX_IPSR_GPSR (IP12_11_8 ,TX2_A ), +PINMUX_IPSR_MSEL (IP12_11_8 ,TX2_A ,SEL_SCIF2_0 ),PINMUX_IPSR_MSEL (IP12_11_8 ,HRX0_A ,SEL_HSCIF0_0 ),PINMUX_IPSR_GPSR (IP12_11_8 ,AUDIO_CLKOUT2_A ),PINMUX_IPSR_MSEL (IP12_11_8 ,SCL1_A ,SEL_I2C1_0 ),PINMUX_IPSR_MSEL (IP12_11_8 ,FSO_CFE_0_N_A ,SEL_FSO_0 ),PINMUX_IPSR_GPSR (IP12_11_8 ,TS_SDEN1 ), -PINMUX_IPSR_GPSR (IP12_15_12 ,RX2_A ), +PINMUX_IPSR_MSEL (IP12_15_12 ,RX2_A ,SEL_SCIF2_0 ),PINMUX_IPSR_GPSR (IP12_15_12 ,HTX0_A ),PINMUX_IPSR_GPSR (IP12_15_12 ,AUDIO_CLKOUT3_A ), PINMUX_IPSR_MSEL(IP12_15_12, SDA1_A, SEL_I2C1_0),
@@ -1129,11 +1129,11 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP12_23_20 ,MSIOF0_RXD ),PINMUX_IPSR_GPSR (IP12_23_20 ,SSI_WS78 ), -PINMUX_IPSR_GPSR (IP12_23_20 ,TX2_B ), +PINMUX_IPSR_MSEL (IP12_23_20 ,TX2_B ,SEL_SCIF2_1 ),PINMUX_IPSR_GPSR (IP12_27_24 ,MSIOF0_TXD ),PINMUX_IPSR_GPSR (IP12_27_24 ,SSI_SDATA7 ), -PINMUX_IPSR_GPSR (IP12_27_24 ,RX2_B ), +PINMUX_IPSR_MSEL (IP12_27_24 ,RX2_B ,SEL_SCIF2_1 ),PINMUX_IPSR_GPSR (IP12_31_28 ,MSIOF0_SYNC ), PINMUX_IPSR_GPSR(IP12_31_28, AUDIO_CLKOUT_B),
Signature · 1 line
2.19.2
PATCH 7/9 pinctrl: renesas: r8a77990: Fix MOD_SEL0 bit16 when using NFALE and NFRB_N
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
According to the R-Car Gen3 Hardware Manual Rev.1.50, the MOD_SEL0 bit16 is set to 0 when NFALE_A and NFRB_N_A pin functions are selected.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +2 -2
@@ -1027,7 +1027,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP10_23_20 ,NFCLE ),PINMUX_IPSR_GPSR (IP10_27_24 ,SD0_CD ), -PINMUX_IPSR_GPSR (IP10_27_24 ,NFALE_A ), +PINMUX_IPSR_MSEL (IP10_27_24 ,NFALE_A ,SEL_NDFC_0 ),PINMUX_IPSR_GPSR (IP10_27_24 ,SD3_CD ),PINMUX_IPSR_MSEL (IP10_27_24 ,RIF0_CLK_B ,SEL_DRIF0_1 ), PINMUX_IPSR_MSEL(IP10_27_24, SCL2_B, SEL_I2C2_1),
@@ -1036,7 +1036,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP10_27_24 ,TS_SCK0 ),PINMUX_IPSR_GPSR (IP10_31_28 ,SD0_WP ), -PINMUX_IPSR_GPSR (IP10_31_28 ,NFRB_N_A ), +PINMUX_IPSR_MSEL (IP10_31_28 ,NFRB_N_A ,SEL_NDFC_0 ),PINMUX_IPSR_GPSR (IP10_31_28 ,SD3_WP ),PINMUX_IPSR_MSEL (IP10_31_28 ,RIF0_D0_B ,SEL_DRIF0_1 ), PINMUX_IPSR_MSEL(IP10_31_28, SDA2_B, SEL_I2C2_1),
Signature · 1 line
2.19.2
PATCH 8/9 pinctrl: renesas: r8a77990: Fix MOD_SEL0 bit3 when using TX0
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
According to the R-Car Gen3 Hardware Manual Errata for Rev 1.50, the MOD_SEL0 bit3 is set to 0 when TX0_A pin function is selected, and the MOD_SEL0 bit3 is set to 1 when TX0_B pin function is selected.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +2 -2
@@ -1063,7 +1063,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP11_11_8 ,RIF1_SYNC ),PINMUX_IPSR_GPSR (IP11_11_8 ,TS_SCK1 ), -PINMUX_IPSR_GPSR (IP11_15_12 ,TX0_A ), +PINMUX_IPSR_MSEL (IP11_15_12 ,TX0_A ,SEL_SCIF0_0 ),PINMUX_IPSR_GPSR (IP11_15_12 ,HTX1_A ),PINMUX_IPSR_MSEL (IP11_15_12 ,SSI_WS2_A ,SEL_SSI2_0 ), PINMUX_IPSR_GPSR(IP11_15_12, RIF1_D0),
@@ -1173,7 +1173,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP13_19_16 ,SIM0_D_A ,SEL_SIMCARD_0 ),PINMUX_IPSR_GPSR (IP13_23_20 ,MLB_DAT ), -PINMUX_IPSR_GPSR (IP13_23_20 ,TX0_B ), +PINMUX_IPSR_MSEL (IP13_23_20 ,TX0_B ,SEL_SCIF0_0 ),PINMUX_IPSR_MSEL (IP13_23_20 ,RIF0_SYNC_A ,SEL_DRIF0_0 ), PINMUX_IPSR_GPSR(IP13_23_20, SIM0_CLK_A),
Signature · 1 line
2.19.2
PATCH 9/9 pinctrl: renesas: r8a77990: Reivse USB ID pin name
In reply to Marek VasutFrom: Hiroyuki Yokoyama <[email protected]>
Since the datasheet Rev.1.00 has an error about the USB ID pin name, this patch revises it.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +3 -3
@@ -284,7 +284,7 @@#define IP11_15_12 FM(TX0_A) FM(HTX1_A) FM(SSI_WS2_A) FM(RIF1_D0) F_(0, 0) F_(0, 0) F_(0, 0) FM(TS_SDAT1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP11_19_16 FM(CTS0_N_A) FM(NFDATA14_A) FM(AUDIO_CLKOUT_A) FM(RIF1_D1) FM(SCIF_CLK_A) FM(FMCLK_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP11_23_20 FM(RTS0_N_A) FM(NFDATA15_A) FM(AUDIO_CLKOUT1_A) FM(RIF1_CLK) FM(SCL2_A) FM(FMIN_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP11_27_24 FM(SCK0_A) FM(HSCK1_A) FM(USB3HS0_ID) FM(RTS1_N) FM(SDA2_A) FM(FMCLK_C) F_(0, 0) F_(0, 0) FM(USB1_ID) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP11_27_24 FM(SCK0_A) FM(HSCK1_A) FM(USB3HS0_ID) FM(RTS1_N) FM(SDA2_A) FM(FMCLK_C) F_(0, 0) F_(0, 0) FM(USB0_ID) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP11_31_28 FM(RX1) FM(HRX2_B) FM(SSI_SCK9_B) FM(AUDIO_CLKOUT1_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* IPSRx */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 - F */
@@ -1089,7 +1089,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP11_27_24 ,RTS1_N ),PINMUX_IPSR_MSEL (IP11_27_24 ,SDA2_A ,SEL_I2C2_0 ),PINMUX_IPSR_MSEL (IP11_27_24 ,FMCLK_C ,SEL_FM_2 ), -PINMUX_IPSR_GPSR (IP11_27_24 ,USB1_ID ), +PINMUX_IPSR_GPSR (IP11_27_24 ,USB0_ID ),PINMUX_IPSR_GPSR (IP11_31_28 ,RX1 ), PINMUX_IPSR_MSEL(IP11_31_28, HRX2_B, SEL_HSCIF2_1),
@@ -3484,7 +3484,7 @@ static const unsigned int usb0_id_pins[] = { };static const unsigned int usb0_id_mux[] = { -USB1_ID_MARK , +USB0_ID_MARK , };/* - USB30 ------------------------------------------------------------------ */
Signature · 1 line
2.19.2