pinctrl: renesas: rcar: power-source improvements
Subsystems (3)
Geert Uytterhoeven
maintainercover pinctrl: renesas: rcar: power-source improvements
Hi all,
This patch series contains various improvements related to power-source handling in the Renesas R-Car pin control drivers:
- Retain I/O voltage level configuration across s2ram on R-Car D3,
- Add support for 1.8V/2.5V I/O voltage levels,
- Add support for I/O voltage level configuration for the EtherAVB, Gigabit Ethernet, and Ethernet TSN I/O pins on R-Car V3M, V3H, E3, D3, and V4H.
As I/O voltage level configuration is not something you want to change without consideration, I tested this by verifying that adding e.g.
{
pins = "PIN_VDDQ_AVB0";
power-source = <2500>;
};to the PFC node in DT triggers the right code paths.
As usual, I plan to queue these in renesas-pinctrl-for-v6.4. Thanks for your comments!
Geert Uytterhoeven (8):
pinctrl: renesas: r8a77995: Retain POCCTRL0 register across
suspend/resume
pinctrl: renesas: rcar: Phase out old SH_PFC_PIN_CFG_IO_VOLTAGE flag
pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels
pinctrl: renesas: r8a77970: Add support for AVB power-source
pinctrl: renesas: r8a77980: Add support for AVB/GE power-sources
pinctrl: renesas: r8a77990: Add support for AVB power-source
pinctrl: renesas: r8a77995: Add support for AVB power-source
pinctrl: renesas: r8a779g0: Add support for AVB/TSN power-sources
drivers/pinctrl/renesas/core.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a77470.c | 44 +++++++++++------------ drivers/pinctrl/renesas/pfc-r8a7790.c | 2 +- drivers/pinctrl/renesas/pfc-r8a7791.c | 2 +- drivers/pinctrl/renesas/pfc-r8a7794.c | 48 +++++++++++++------------- drivers/pinctrl/renesas/pfc-r8a77951.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a7796.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a77965.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a77970.c | 34 ++++++++++++------ drivers/pinctrl/renesas/pfc-r8a77980.c | 45 ++++++++++++++++-------- drivers/pinctrl/renesas/pfc-r8a77990.c | 33 +++++++++++------- drivers/pinctrl/renesas/pfc-r8a77995.c | 44 ++++++++++++++--------- drivers/pinctrl/renesas/pfc-r8a779g0.c | 45 +++++++++++++++++++----- drivers/pinctrl/renesas/pinctrl.c | 22 ++++++------ drivers/pinctrl/renesas/sh_pfc.h | 13 +++---- 15 files changed, 211 insertions(+), 137 deletions(-)
Signature · 12 lines
2.34.1
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 TorvaldsGeert Uytterhoeven
maintainerPATCH 1/8 pinctrl: renesas: r8a77995: Retain POCCTRL0 register across suspend/resume
The POC Control Register 0 (POCCTRL0) on R-Car D3 is not registered in the pinmux_ioctrl_regs[] array. Hence it is not saved/restored during suspend/resume, and its contents may be lost after s2ram.
This went unnoticed when improving suspend/resume support in commit d92ee9cf8ec8d7fe ("pinctrl: sh-pfc: rcar-gen3: Retain TDSELCTRL register across suspend/resume").
Fix this by moving the pinmux_ioctrl_regs[] array up, and adding the POCCTRL0 register.
--- drivers/pinctrl/renesas/pfc-r8a77995.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77995.c +13 -10
@@ -2855,11 +2855,23 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { { }, }; +enum ioctrl_regs { +POCCTRL0 , +TDSELCTRL , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [POCCTRL0 ] = {0xe6060380 , }, + [TDSELCTRL ] = {0xe60603c0 , }, + {/* sentinel */ }, +}; + +static int r8a77995_pin_to_pocctrl (unsigned int pin,u32 *pocctrl) {int bit = -EINVAL ; - *pocctrl =0xe6060380 ; + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg;if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,9 )) bit =29 - (pin -RCAR_GP_PIN (3 ,0 ));
@@ -3075,15 +3087,6 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { {/* sentinel */ } }; -enum ioctrl_regs { -TDSELCTRL , -}; - -static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { - [TDSELCTRL ] = {0xe60603c0 , }, - {/* sentinel */ }, -}; -static const struct pinmux_bias_reg *r8a77995_pin_to_bias_reg (const struct sh_pfc *pfc,unsigned int pin,unsigned int *puen_bit,unsigned int *pud_bit)
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 2/8 pinctrl: renesas: rcar: Phase out old SH_PFC_PIN_CFG_IO_VOLTAGE flag
In reply to Geert UytterhoevenCommit 537db25ca330dce0 ("pinctrl: renesas: Add I/O voltage level flag") introduced new flags to support pins that can switch their voltage levels between either 1.8V and 3.3V, or between 2.5V and 3.3V. The old SH_PFC_PIN_CFG_IO_VOLTAGE flag was retained to avoid having to change existing drivers.
Replace SH_PFC_PIN_CFG_IO_VOLTAGE by SH_PFC_PIN_CFG_IO_VOLTAGE_18_33, to make the voltage configuration explicit, and to prepare for the advent of support for more voltage levels.
--- drivers/pinctrl/renesas/pfc-r8a77470.c | 44 +++++++++++------------ drivers/pinctrl/renesas/pfc-r8a7790.c | 2 +- drivers/pinctrl/renesas/pfc-r8a7791.c | 2 +- drivers/pinctrl/renesas/pfc-r8a7794.c | 48 +++++++++++++------------- drivers/pinctrl/renesas/pfc-r8a77951.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a7796.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a77965.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a77970.c | 6 ++-- drivers/pinctrl/renesas/pfc-r8a77980.c | 6 ++-- drivers/pinctrl/renesas/pfc-r8a77990.c | 4 +-- drivers/pinctrl/renesas/pfc-r8a77995.c | 2 +- 11 files changed, 63 insertions(+), 63 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77470.c +22 -22
@@ -13,24 +13,24 @@#define CPU_ALL_GP (fn, sfx) \ PORT_GP_CFG_4(0, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \ PORT_GP_CFG_1(0, 4, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 5, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 6, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 7, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 8, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 9, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 10, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 5, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 6, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 7, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 8, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 9, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 10, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ PORT_GP_CFG_1(0, 11, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \ PORT_GP_CFG_1(0, 12, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 13, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 14, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 15, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 16, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 17, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 18, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 19, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 20, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 21, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ - PORT_GP_CFG_1(0, 22, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 13, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 14, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 15, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 16, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 17, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 18, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 19, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 20, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 21, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ + PORT_GP_CFG_1(0, 22, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP), \ PORT_GP_CFG_23(1, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \ PORT_GP_CFG_32(2, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \ PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \
@@ -38,12 +38,12 @@PORT_GP_CFG_1 (3 ,28 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_1 (3 ,29 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_14 (4 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_1 (4 ,14 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_1 (4 ,15 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_1 (4 ,16 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_1 (4 ,17 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_1 (4 ,18 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_1 (4 ,19 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_1 (4 ,14 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_1 (4 ,15 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_1 (4 ,16 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_1 (4 ,17 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_1 (4 ,18 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_1 (4 ,19 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_1 (4 ,20 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_1 (4 ,21 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \ PORT_GP_CFG_1(4, 22, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \
drivers/pinctrl/renesas/pfc-r8a7790.c +1 -1
@@ -24,7 +24,7 @@PORT_GP_CFG_32 (0 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_30 (1 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_30 (2 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_32 (3 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_32 (3 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_32 (4 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_32 (5 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP )
drivers/pinctrl/renesas/pfc-r8a7791.c +1 -1
@@ -22,7 +22,7 @@PORT_GP_CFG_32 (3 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_32 (4 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_32 (5 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \ -PORT_GP_CFG_24 (6 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP ), \ +PORT_GP_CFG_24 (6 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_1 (6 ,24 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \PORT_GP_CFG_1 (6 ,25 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP ), \ PORT_GP_CFG_1(6, 26, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \
drivers/pinctrl/renesas/pfc-r8a7794.c +24 -24
54 lines not on this page · raw message
drivers/pinctrl/renesas/pfc-r8a77951.c +2 -2
@@ -17,12 +17,12 @@PORT_GP_CFG_16 (0 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_29 (1 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_15 (2 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE ), \ +PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ), \PORT_GP_CFG_1 (3 ,12 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,13 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,14 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,15 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_18 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE ), \ +PORT_GP_CFG_18 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ), \PORT_GP_CFG_26 (5 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_32 (6 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_4 (7 , fn, sfx,CFG_FLAGS )
drivers/pinctrl/renesas/pfc-r8a7796.c +2 -2
@@ -22,12 +22,12 @@PORT_GP_CFG_16 (0 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_29 (1 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_15 (2 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE ), \ +PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ), \PORT_GP_CFG_1 (3 ,12 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,13 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,14 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,15 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_18 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE ), \ +PORT_GP_CFG_18 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ), \PORT_GP_CFG_26 (5 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_32 (6 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_4 (7 , fn, sfx,CFG_FLAGS )
drivers/pinctrl/renesas/pfc-r8a77965.c +2 -2
@@ -23,12 +23,12 @@PORT_GP_CFG_16 (0 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_29 (1 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_15 (2 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE ), \ +PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ), \PORT_GP_CFG_1 (3 ,12 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,13 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,14 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,15 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_18 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE ), \ +PORT_GP_CFG_18 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ), \PORT_GP_CFG_26 (5 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_32 (6 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_4 (7 , fn, sfx,CFG_FLAGS )
drivers/pinctrl/renesas/pfc-r8a77970.c +3 -3
@@ -19,10 +19,10 @@#include "sh_pfc.h" #define CPU_ALL_GP (fn, sfx) \ - PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ + PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ PORT_GP_CFG_28(1, fn, sfx, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ - PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ - PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ + PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ + PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ PORT_GP_CFG_6(4, fn, sfx, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ PORT_GP_CFG_15(5, fn, sfx, SH_PFC_PIN_CFG_PULL_UP_DOWN)
drivers/pinctrl/renesas/pfc-r8a77980.c +3 -3
@@ -19,10 +19,10 @@#include "sh_pfc.h" #define CPU_ALL_GP (fn, sfx) \ - PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ + PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ PORT_GP_CFG_28(1, fn, sfx, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ - PORT_GP_CFG_30(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ - PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ + PORT_GP_CFG_30(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ + PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 | SH_PFC_PIN_CFG_PULL_UP_DOWN), \ PORT_GP_CFG_25(4, fn, sfx, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ PORT_GP_CFG_15(5, fn, sfx, SH_PFC_PIN_CFG_PULL_UP_DOWN)
drivers/pinctrl/renesas/pfc-r8a77990.c +2 -2
@@ -22,12 +22,12 @@PORT_GP_CFG_18 (0 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_23 (1 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_26 (2 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_DRIVE_STRENGTH ), \ +PORT_GP_CFG_12 (3 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_DRIVE_STRENGTH ), \PORT_GP_CFG_1 (3 ,12 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,13 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,14 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_1 (3 ,15 , fn, sfx,CFG_FLAGS ), \ -PORT_GP_CFG_11 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_DRIVE_STRENGTH ), \ +PORT_GP_CFG_11 (4 , fn, sfx,CFG_FLAGS |SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_DRIVE_STRENGTH ), \PORT_GP_CFG_20 (5 , fn, sfx,CFG_FLAGS ), \PORT_GP_CFG_9 (6 , fn, sfx,CFG_FLAGS ), \ PORT_GP_CFG_1(6, 9, fn, sfx, SH_PFC_PIN_CFG_PULL_UP), \
drivers/pinctrl/renesas/pfc-r8a77995.c +1 -1
@@ -21,7 +21,7 @@PORT_GP_CFG_9 (0 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PORT_GP_CFG_32 (1 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PORT_GP_CFG_32 (2 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \ -PORT_GP_CFG_10 (3 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE |SH_PFC_PIN_CFG_PULL_UP_DOWN ), \ +PORT_GP_CFG_10 (3 , fn, sfx,SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 |SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PORT_GP_CFG_32 (4 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PORT_GP_CFG_21 (5 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PORT_GP_CFG_14 (6 , fn, sfx,SH_PFC_PIN_CFG_PULL_UP_DOWN )
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 3/8 pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels
In reply to Geert UytterhoevenCurrently, the Renesas pin control driver supports pins that can switch their I/O voltage levels between either 1.8V and 3.3V, or between 2.5V and 3.3V. However, some SoCs have pins that can switch between 1.8V and 2.5V.
Add support for this by replacing the separate SH_PFC_PIN_CFG_IO_VOLTAGE capability and voltage level flags by a 2-bit field, to cover three possible I/O voltage switching options.
--- drivers/pinctrl/renesas/core.c | 4 ++-- drivers/pinctrl/renesas/pinctrl.c | 22 ++++++++++++---------- drivers/pinctrl/renesas/sh_pfc.h | 13 +++++-------- 3 files changed, 19 insertions(+), 20 deletions(-)
drivers/pinctrl/renesas/core.c +2 -2
@@ -1114,9 +1114,9 @@ static void __init sh_pfc_check_info(const struct sh_pfc_soc_info *info) } } -if (pin->configs &SH_PFC_PIN_CFG_IO_VOLTAGE ) { +if (pin->configs &SH_PFC_PIN_CFG_IO_VOLTAGE_MASK ) {if (!info->ops || !info->ops->pin_to_pocctrl) -sh_pfc_err_once (power,"SH_PFC_PIN_CFG_IO_VOLTAGE flag set but .pin_to_pocctrl() not implemented\n" ); +sh_pfc_err_once (power,"SH_PFC_PIN_CFG_IO_VOLTAGE set but .pin_to_pocctrl() not implemented\n" );else if (info->ops->pin_to_pocctrl (pin->pin, &x) <0 )sh_pfc_err ("pin %s: SH_PFC_PIN_CFG_IO_VOLTAGE set but invalid pin_to_pocctrl()\n" , pin->name);
drivers/pinctrl/renesas/pinctrl.c +12 -10
@@ -580,7 +580,7 @@ static bool sh_pfc_pinconf_validate(struct sh_pfc *pfc, unsigned int _pin,return pin->configs &SH_PFC_PIN_CFG_DRIVE_STRENGTH ;case PIN_CONFIG_POWER_SOURCE : -return pin->configs &SH_PFC_PIN_CFG_IO_VOLTAGE ; +return pin->configs &SH_PFC_PIN_CFG_IO_VOLTAGE_MASK ;default :return false;
@@ -633,7 +633,7 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin,case PIN_CONFIG_POWER_SOURCE : {int idx =sh_pfc_get_pin_index (pfc, _pin);const struct sh_pfc_pin *pin = &pfc->info->pins[idx]; -unsigned int lower_voltage; +unsigned int mode, lo, hi;u32 pocctrl, val;int bit;
@@ -646,10 +646,11 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin, val =sh_pfc_read (pfc, pocctrl); - lower_voltage = (pin->configs &SH_PFC_PIN_VOLTAGE_25_33 ) ? -2500 :1800 ; + mode = pin->configs &SH_PFC_PIN_CFG_IO_VOLTAGE_MASK ; + lo = mode <=SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ?1800 :2500 ; + hi = mode >=SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ?3300 :2500 ; - arg = (val &BIT (bit)) ?3300 : lower_voltage; + arg = (val &BIT (bit)) ? hi : lo;break ; }
@@ -705,7 +706,7 @@ static int sh_pfc_pinconf_set(struct pinctrl_dev *pctldev, unsigned _pin,unsigned int mV =pinconf_to_config_argument (configs[i]);int idx =sh_pfc_get_pin_index (pfc, _pin);const struct sh_pfc_pin *pin = &pfc->info->pins[idx]; -unsigned int lower_voltage; +unsigned int mode, lo, hi;u32 pocctrl, val;int bit;
@@ -716,15 +717,16 @@ static int sh_pfc_pinconf_set(struct pinctrl_dev *pctldev, unsigned _pin,if (WARN (bit <0 ,"invalid pin %#x" , _pin))return bit; - lower_voltage = (pin->configs &SH_PFC_PIN_VOLTAGE_25_33 ) ? -2500 :1800 ; + mode = pin->configs &SH_PFC_PIN_CFG_IO_VOLTAGE_MASK ; + lo = mode <=SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ?1800 :2500 ; + hi = mode >=SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 ?3300 :2500 ; -if (mV != lower_voltage && mV !=3300 ) +if (mV != lo && mV != hi)return -EINVAL ;spin_lock_irqsave (&pfc->lock, flags); val =sh_pfc_read (pfc, pocctrl); -if (mV ==3300 ) +if (mV == hi) val |=BIT (bit);else val &= ~BIT (bit);
drivers/pinctrl/renesas/sh_pfc.h +5 -8
@@ -29,16 +29,13 @@ enum {#define SH_PFC_PIN_CFG_PULL_DOWN (1 << 3)#define SH_PFC_PIN_CFG_PULL_UP_DOWN (SH_PFC_PIN_CFG_PULL_UP | \ SH_PFC_PIN_CFG_PULL_DOWN) -#define SH_PFC_PIN_CFG_IO_VOLTAGE (1 << 4) -#define SH_PFC_PIN_CFG_DRIVE_STRENGTH (1 << 5) -#define SH_PFC_PIN_VOLTAGE_18_33 (0 << 6) -#define SH_PFC_PIN_VOLTAGE_25_33 (1 << 6) +#define SH_PFC_PIN_CFG_IO_VOLTAGE_MASK GENMASK(5, 4) +#define SH_PFC_PIN_CFG_IO_VOLTAGE_18_25 (1 << 4) +#define SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 (2 << 4) +#define SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 (3 << 4) -#define SH_PFC_PIN_CFG_IO_VOLTAGE_18_33 (SH_PFC_PIN_CFG_IO_VOLTAGE | \ - SH_PFC_PIN_VOLTAGE_18_33) -#define SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 (SH_PFC_PIN_CFG_IO_VOLTAGE | \ - SH_PFC_PIN_VOLTAGE_25_33) +#define SH_PFC_PIN_CFG_DRIVE_STRENGTH (1 << 6)#define SH_PFC_PIN_CFG_NO_GPIO (1 << 31)
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH 3/8] pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels
I love your patch! Yet something to improve:
Hi Geert,
I love your patch! Yet something to improve:
[auto build test ERROR on geert-renesas-drivers/renesas-pinctrl]
[also build test ERROR on linusw-pinctrl/devel linusw-pinctrl/for-next linus/master v6.3-rc1 next-20230309] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Geert-Uytterhoeven/pinctrl-renesas-r8a77995-Retain-POCCTRL0-register-across-suspend-resume/20230308-212328 base: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl patch link: https://lore.kernel.org/r/0c04925457bf3f7e78e7e3851528d9a4c29246da.1678271030.git.geert%2Brenesas%40glider.be patch subject: [PATCH 3/8] pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels config: nios2-randconfig-r004-20230309 (https://download.01.org/0day-ci/archive/20230309/[email protected]/config) compiler: nios2-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/513932515f943c5987c5a214520f6875cd507c3e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Geert-Uytterhoeven/pinctrl-renesas-r8a77995-Retain-POCCTRL0-register-across-suspend-resume/20230308-212328 git checkout 513932515f943c5987c5a214520f6875cd507c3e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=nios2 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=nios2 SHELL=/bin/bash drivers/pinctrl/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/pinctrl/renesas/pfc-r8a77950.c:11:
>> drivers/pinctrl/renesas/pfc-r8a77950.c:19:48: error: 'SH_PFC_PIN_CFG_IO_VOLTAGE' undeclared here (not in a function); did you mean 'SH_PFC_PIN_CFG_IO_VOLTAGE_MASK'?
19 | PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:620:20: note: in definition of macro '_GP_GPIO'
620 | .configs = cfg, \
| ^~~
drivers/pinctrl/renesas/sh_pfc.h:447:9: note: in expansion of macro 'PORT_GP_CFG_1'
447 | PORT_GP_CFG_1(bank, 0, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:452:9: note: in expansion of macro 'PORT_GP_CFG_2'
452 | PORT_GP_CFG_2(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:458:9: note: in expansion of macro 'PORT_GP_CFG_4'
458 | PORT_GP_CFG_4(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:464:9: note: in expansion of macro 'PORT_GP_CFG_6'
464 | PORT_GP_CFG_6(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:469:9: note: in expansion of macro 'PORT_GP_CFG_7'
469 | PORT_GP_CFG_7(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:474:9: note: in expansion of macro 'PORT_GP_CFG_8'
474 | PORT_GP_CFG_8(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:479:9: note: in expansion of macro 'PORT_GP_CFG_9'
479 | PORT_GP_CFG_9(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:484:9: note: in expansion of macro 'PORT_GP_CFG_10'
484 | PORT_GP_CFG_10(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:489:9: note: in expansion of macro 'PORT_GP_CFG_11'
489 | PORT_GP_CFG_11(bank, fn, sfx, cfg), \
| ^~~~~~~~~~~~~~
drivers/pinctrl/renesas/pfc-r8a77950.c:19:9: note: in expansion of macro 'PORT_GP_CFG_12'
19 | PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
| ^~~~~~~~~~~~~~
drivers/pinctrl/renesas/sh_pfc.h:622:41: note: in expansion of macro 'CPU_ALL_GP'
622 | #define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
| ^~~~~~~~~~
drivers/pinctrl/renesas/pfc-r8a77950.c:1502:9: note: in expansion of macro 'PINMUX_GPIO_GP_ALL'
1502 | PINMUX_GPIO_GP_ALL(),
| ^~~~~~~~~~~~~~~~~~vim +19 drivers/pinctrl/renesas/pfc-r8a77950.c
b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 14 bd79c92039f117 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2019-03-21 15 #define CPU_ALL_GP(fn, sfx) \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 16 PORT_GP_CFG_16(0, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 17 PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 18 PORT_GP_CFG_15(2, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 @19 PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 20 PORT_GP_CFG_1(3, 12, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 21 PORT_GP_CFG_1(3, 13, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 22 PORT_GP_CFG_1(3, 14, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 23 PORT_GP_CFG_1(3, 15, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 24 PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 25 PORT_GP_CFG_26(5, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 26 PORT_GP_CFG_32(6, fn, sfx, CFG_FLAGS), \ b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 27 PORT_GP_CFG_4(7, fn, sfx, CFG_FLAGS)
4f062bcb588972 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2019-01-15 28
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Re: [PATCH 3/8] pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels
Hi Robot,
Quoted 30 lines · kernel test robot
I love your patch! Yet something to improve:
[auto build test ERROR on geert-renesas-drivers/renesas-pinctrl]
[also build test ERROR on linusw-pinctrl/devel linusw-pinctrl/for-next linus/master v6.3-rc1 next-20230309] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/Geert-Uytterhoeven/pinctrl-renesas-r8a77995-Retain-POCCTRL0-register-across-suspend-resume/20230308-212328 base: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl patch link: https://lore.kernel.org/r/0c04925457bf3f7e78e7e3851528d9a4c29246da.1678271030.git.geert%2Brenesas%40glider.be patch subject: [PATCH 3/8] pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels config: nios2-randconfig-r004-20230309 (https://download.01.org/0day-ci/archive/20230309/[email protected]/config) compiler: nios2-linux-gcc (GCC) 12.1.0reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/513932515f943c5987c5a214520f6875cd507c3e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Geert-Uytterhoeven/pinctrl-renesas-r8a77995-Retain-POCCTRL0-register-across-suspend-resume/20230308-212328 git checkout513932515f943c5987c5a214520f6875cd507c3e
# save the config file
mkdirbuild_dir&& cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=nios2 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=nios2 SHELL=/bin/bashdrivers/pinctrl/If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Quoted 6 lines
All errors (new ones prefixed by >>):
In file included from
drivers/pinctrl/renesas/pfc-r8a77950.c:11:Quoted 1 line
Quoted 1 line
drivers/pinctrl/renesas/pfc-r8a77950.c:19:48: error: 'SH_PFC_PIN_CFG_IO_VOLTAGE' undeclared here (not in a function); did you mean 'SH_PFC_PIN_CFG_IO_VOLTAGE_MASK'?19 | PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ | ^~~~~~~~~~~~~~~~~~~~~~~~~
This driver is scheduled for removal, hence was not updated.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
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
kernel test robot
build botRe: [PATCH 3/8] pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels
In reply to Geert UytterhoevenI love your patch! Yet something to improve:
Hi Geert,
I love your patch! Yet something to improve:
[auto build test ERROR on geert-renesas-drivers/renesas-pinctrl]
[also build test ERROR on linusw-pinctrl/devel linusw-pinctrl/for-next linus/master v6.3-rc1 next-20230309] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Geert-Uytterhoeven/pinctrl-renesas-r8a77995-Retain-POCCTRL0-register-across-suspend-resume/20230308-212328 base: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl patch link: https://lore.kernel.org/r/0c04925457bf3f7e78e7e3851528d9a4c29246da.1678271030.git.geert%2Brenesas%40glider.be patch subject: [PATCH 3/8] pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels config: s390-buildonly-randconfig-r003-20230308 (https://download.01.org/0day-ci/archive/20230309/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 67409911353323ca5edf2049ef0df54132fa1ca7)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install s390 cross compiling tool for clang build
# apt-get install binutils-s390x-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/513932515f943c5987c5a214520f6875cd507c3e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Geert-Uytterhoeven/pinctrl-renesas-r8a77995-Retain-POCCTRL0-register-across-suspend-resume/20230308-212328 git checkout 513932515f943c5987c5a214520f6875cd507c3e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
PINMUX_GPIO_GP_ALL(),
^
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:19:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^
>> drivers/pinctrl/renesas/pfc-r8a77950.c:1502:2: error: use of undeclared identifier 'SH_PFC_PIN_CFG_IO_VOLTAGE'
drivers/pinctrl/renesas/sh_pfc.h:622:31: note: expanded from macro 'PINMUX_GPIO_GP_ALL'
#define PINMUX_GPIO_GP_ALL() CPU_ALL_GP(_GP_GPIO, unused)
^
drivers/pinctrl/renesas/pfc-r8a77950.c:24:41: note: expanded from macro 'CPU_ALL_GP'
PORT_GP_CFG_18(4, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
^fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated.
vim +/SH_PFC_PIN_CFG_IO_VOLTAGE +1502 drivers/pinctrl/renesas/pfc-r8a77950.c
b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 1500
b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 1501 static const struct sh_pfc_pin pinmux_pins[] = {
b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 @1502 PINMUX_GPIO_GP_ALL(),
4f062bcb588972 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2019-01-15 1503 PINMUX_NOGP_ALL(),
b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 1504 };b205914c8f822e drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c Geert Uytterhoeven 2016-10-03 1505
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Geert Uytterhoeven
maintainerPATCH 4/8 pinctrl: renesas: r8a77970: Add support for AVB power-source
In reply to Geert UytterhoevenAdd support for configuring the I/O voltage level of the Ethernet AVB pins on the R-Car V3M SoC. "PIN_VDDQ_AVB0" can be configured for 2.5V or 3.3V operation.
--- drivers/pinctrl/renesas/pfc-r8a77970.c | 28 ++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77970.c +20 -8
@@ -34,7 +34,8 @@PIN_NOGP_CFG (TCK ,"TCK" , fn,SH_PFC_PIN_CFG_PULL_UP ), \PIN_NOGP_CFG (TDI ,"TDI" , fn,SH_PFC_PIN_CFG_PULL_UP ), \PIN_NOGP_CFG (TMS ,"TMS" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ -PIN_NOGP_CFG (TRST_N ,"TRST#" , fn,SH_PFC_PIN_CFG_PULL_UP ) +PIN_NOGP_CFG (TRST_N ,"TRST#" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ +PIN_NOGP_CFG (VDDQ_AVB0 ,"VDDQ_AVB0" , fn,SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 )/* * F_() : just information
@@ -2364,19 +2365,30 @@ static int r8a77970_pin_to_pocctrl(unsigned int pin, u32 *pocctrl) {int bit = pin &0x1f ; - *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; -if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 )) +switch (pin) { + case RCAR_GP_PIN(0, 0) ... RCAR_GP_PIN(0, 21): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg;return bit; -if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 )) + + case RCAR_GP_PIN(2, 0) ... RCAR_GP_PIN(2, 9): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg;return bit +22 ; - *pocctrl = pinmux_ioctrl_regs[POCCTRL1 ].reg; -if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 )) + case RCAR_GP_PIN(2, 10) ... RCAR_GP_PIN(2, 16): + *pocctrl = pinmux_ioctrl_regs[POCCTRL1 ].reg;return bit -10 ; -if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,16 )) + + case RCAR_GP_PIN(3, 0) ... RCAR_GP_PIN(3, 16): + *pocctrl = pinmux_ioctrl_regs[POCCTRL1 ].reg;return bit +7 ; -return -EINVAL ; +case PIN_VDDQ_AVB0 : + *pocctrl = pinmux_ioctrl_regs[POCCTRL2 ].reg; +return 0 ; + +default : +return -EINVAL ; + } }static const struct pinmux_bias_reg pinmux_bias_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 5/8 pinctrl: renesas: r8a77980: Add support for AVB/GE power-sources
In reply to Geert UytterhoevenAdd support for configuring the I/O voltage levels of the Ethernet AVB and Gigabit Ethernet pins on the R-Car V3H SoC. "PIN_VDDQ_AVB" and "PIN_VDDQ_GE" can be configured for 2.5V or 3.3V operation.
--- drivers/pinctrl/renesas/pfc-r8a77980.c | 39 ++++++++++++++++++-------- 1 file changed, 28 insertions(+), 11 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77980.c +28 -11
@@ -35,7 +35,9 @@PIN_NOGP_CFG (EXTALR ,"EXTALR" , fn,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PIN_NOGP_CFG (FSCLKST ,"FSCLKST" , fn,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \PIN_NOGP_CFG (FSCLKST_N ,"FSCLKST#" , fn,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \ -PIN_NOGP_CFG (PRESETOUT_N ,"PRESETOUT#" , fn,SH_PFC_PIN_CFG_PULL_UP_DOWN ) +PIN_NOGP_CFG (PRESETOUT_N ,"PRESETOUT#" , fn,SH_PFC_PIN_CFG_PULL_UP_DOWN ), \ +PIN_NOGP_CFG (VDDQ_AVB ,"VDDQ_AVB" , fn,SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 ), \ +PIN_NOGP_CFG (VDDQ_GE ,"VDDQ_GE" , fn,SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 )/* * F_() : just information
@@ -2837,24 +2839,39 @@ static int r8a77980_pin_to_pocctrl(unsigned int pin, u32 *pocctrl) {int bit = pin &0x1f ; - *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; -if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 )) +switch (pin) { + case RCAR_GP_PIN(0, 0) ... RCAR_GP_PIN(0, 21): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg;return bit; -else if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 )) + + case RCAR_GP_PIN(2, 0) ... RCAR_GP_PIN(2, 9): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg;return bit +22 ; - *pocctrl = pinmux_ioctrl_regs[POCCTRL1 ].reg; -if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 )) + case RCAR_GP_PIN(2, 10) ... RCAR_GP_PIN(2, 16): + *pocctrl = pinmux_ioctrl_regs[POCCTRL1 ].reg;return bit -10 ; -if ((pin >=RCAR_GP_PIN (2 ,17 ) && pin <=RCAR_GP_PIN (2 ,24 )) || - (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,16 ))) + + case RCAR_GP_PIN(2, 17) ... RCAR_GP_PIN(2, 24): + case RCAR_GP_PIN(3, 0) ... RCAR_GP_PIN(3, 16): + *pocctrl = pinmux_ioctrl_regs[POCCTRL1 ].reg;return bit +7 ; - *pocctrl = pinmux_ioctrl_regs[POCCTRL2 ].reg; -if (pin >=RCAR_GP_PIN (2 ,25 ) && pin <=RCAR_GP_PIN (2 ,29 )) + case RCAR_GP_PIN(2, 25) ... RCAR_GP_PIN(2, 29): + *pocctrl = pinmux_ioctrl_regs[POCCTRL2 ].reg;return pin -25 ; -return -EINVAL ; +case PIN_VDDQ_AVB : + *pocctrl = pinmux_ioctrl_regs[POCCTRL3 ].reg; +return 0 ; + +case PIN_VDDQ_GE : + *pocctrl = pinmux_ioctrl_regs[POCCTRL3 ].reg; +return 1 ; + +default : +return -EINVAL ; + } }static const struct pinmux_bias_reg pinmux_bias_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 6/8 pinctrl: renesas: r8a77990: Add support for AVB power-source
In reply to Geert UytterhoevenAdd support for configuring the I/O voltage level of the Ethernet AVB pins on the R-Car E3 SoC. "PIN_VDDQ_AVB0" can be configured for 2.5V or 3.3V operation.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 29 +++++++++++++++++--------- 1 file changed, 19 insertions(+), 10 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +19 -10
@@ -56,7 +56,8 @@PIN_NOGP_CFG (TCK ,"TCK" , fn,SH_PFC_PIN_CFG_PULL_UP ), \PIN_NOGP_CFG (TDI ,"TDI" , fn,SH_PFC_PIN_CFG_PULL_UP ), \PIN_NOGP_CFG (TMS ,"TMS" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ -PIN_NOGP_CFG (TRST_N ,"TRST_N" , fn,SH_PFC_PIN_CFG_PULL_UP ) +PIN_NOGP_CFG (TRST_N ,"TRST_N" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ +PIN_NOGP_CFG (VDDQ_AVB0 ,"VDDQ_AVB0" , fn,SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 )/* * F_() : just information
@@ -507,7 +508,8 @@ MOD_SEL0_1_0FM (AVB_TD3) \FM (PRESETOUT_N )FM (FSCLKST_N )FM (TRST_N )FM (TCK )FM (TMS )FM (TDI ) \FM (ASEBRK ) \ -FM (MLB_REF ) +FM (MLB_REF ) \ +FM (VDDQ_AVB0 ) enum { PINMUX_RESERVED = 0,
@@ -5040,28 +5042,35 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {enum ioctrl_regs {POCCTRL0 , +POCCTRL2 ,TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL0 ] = {0xe6060380 , }, + [POCCTRL2 ] = {0xe6060388 , }, [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };static int r8a77990_pin_to_pocctrl (unsigned int pin,u32 *pocctrl) { -int bit = -EINVAL ; +switch (pin) { + case RCAR_GP_PIN(3, 0) ... RCAR_GP_PIN(3, 11): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; +return pin &0x1f ; - *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; + case RCAR_GP_PIN(4, 0) ... RCAR_GP_PIN(4, 10): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; +return (pin &0x1f ) +19 ; -if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,11 )) - bit = pin &0x1f ; +case PIN_VDDQ_AVB0 : + *pocctrl = pinmux_ioctrl_regs[POCCTRL2 ].reg; +return 0 ; -if (pin >=RCAR_GP_PIN (4 ,0 ) && pin <=RCAR_GP_PIN (4 ,10 )) - bit = (pin &0x1f ) +19 ; - -return bit; +default : +return -EINVAL ; + } }static const struct pinmux_bias_reg pinmux_bias_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 7/8 pinctrl: renesas: r8a77995: Add support for AVB power-source
In reply to Geert UytterhoevenAdd support for configuring the I/O voltage level of the Ethernet AVB pins on the R-Car D3 SoC. "PIN_VDDQ_AVB0" can be configured for 2.5V or 3.3V operation.
--- drivers/pinctrl/renesas/pfc-r8a77995.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77995.c +14 -7
@@ -34,7 +34,8 @@PIN_NOGP_CFG (TCK ,"TCK" , fn,SH_PFC_PIN_CFG_PULL_UP ), \PIN_NOGP_CFG (TDI ,"TDI" , fn,SH_PFC_PIN_CFG_PULL_UP ), \PIN_NOGP_CFG (TMS ,"TMS" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ -PIN_NOGP_CFG (TRST_N ,"TRST#" , fn,SH_PFC_PIN_CFG_PULL_UP ) +PIN_NOGP_CFG (TRST_N ,"TRST#" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ +PIN_NOGP_CFG (VDDQ_AVB0 ,"VDDQ_AVB0" , fn,SH_PFC_PIN_CFG_IO_VOLTAGE_25_33 )/* * F_() : just information
@@ -2857,11 +2858,13 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {enum ioctrl_regs {POCCTRL0 , +POCCTRL2 ,TDSELCTRL , };static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { [POCCTRL0 ] = {0xe6060380 , }, + [POCCTRL2 ] = {0xe6060388 , }, [TDSELCTRL ] = {0xe60603c0 , }, {/* sentinel */ }, };
@@ -2869,14 +2872,18 @@ static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {static int r8a77995_pin_to_pocctrl (unsigned int pin,u32 *pocctrl) { -int bit = -EINVAL ; - - *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; +switch (pin) { + case RCAR_GP_PIN(3, 0) ... RCAR_GP_PIN(3, 9): + *pocctrl = pinmux_ioctrl_regs[POCCTRL0 ].reg; +return 29 - (pin -RCAR_GP_PIN (3 ,0 )); -if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,9 )) - bit =29 - (pin -RCAR_GP_PIN (3 ,0 )); +case PIN_VDDQ_AVB0 : + *pocctrl = pinmux_ioctrl_regs[POCCTRL2 ].reg; +return 0 ; -return bit; +default : +return -EINVAL ; + } }static const struct pinmux_bias_reg pinmux_bias_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 8/8 pinctrl: renesas: r8a779g0: Add support for AVB/TSN power-sources
In reply to Geert UytterhoevenAdd support for configuring the I/O voltage levels of the Ethernet AVB and Ethernet TSN pins on the R-Car V4H SoC. "PIN_VDDQ_AVB[012]" and "PIN_VDDQ_TSN0" can be configured for 1.8V or 2.5V operation.
--- drivers/pinctrl/renesas/pfc-r8a779g0.c | 45 ++++++++++++++++++++------ 1 file changed, 36 insertions(+), 9 deletions(-)
drivers/pinctrl/renesas/pfc-r8a779g0.c +36 -9
@@ -49,6 +49,12 @@PORT_GP_CFG_21 (7 , fn, sfx,CFG_FLAGS ), \ PORT_GP_CFG_14(8, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE_18_33) +#define CPU_ALL_NOGP (fn) \ + PIN_NOGP_CFG(VDDQ_AVB0, "VDDQ_AVB0", fn, SH_PFC_PIN_CFG_IO_VOLTAGE_18_25), \ + PIN_NOGP_CFG(VDDQ_AVB1, "VDDQ_AVB1", fn, SH_PFC_PIN_CFG_IO_VOLTAGE_18_25), \ + PIN_NOGP_CFG(VDDQ_AVB2, "VDDQ_AVB2", fn, SH_PFC_PIN_CFG_IO_VOLTAGE_18_25), \ + PIN_NOGP_CFG(VDDQ_TSN0, "VDDQ_TSN0", fn, SH_PFC_PIN_CFG_IO_VOLTAGE_18_25) +/* GPSR0 */ #define GPSR0_18 F_(MSIOF2_RXD, IP2SR0_11_8)#define GPSR0_17 F_(MSIOF2_SCK, IP2SR0_7_4)
@@ -1221,10 +1227,12 @@ static const u16 pinmux_data[] = {*/ enum { GP_ASSIGN_LAST(), + NOGP_ALL(), };static const struct sh_pfc_pin pinmux_pins[] = {PINMUX_GPIO_GP_ALL (), +PINMUX_NOGP_ALL (), };/* - AUDIO CLOCK ----------------------------------------- */
@@ -4086,23 +4094,42 @@ static int r8a779g0_pin_to_pocctrl(unsigned int pin, u32 *pocctrl) {int bit = pin &0x1f ; - *pocctrl = pinmux_ioctrl_regs[POC0 ].reg; -if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,18 )) +switch (pin) { + case RCAR_GP_PIN(0, 0) ... RCAR_GP_PIN(0, 18): + *pocctrl = pinmux_ioctrl_regs[POC0 ].reg;return bit; - *pocctrl = pinmux_ioctrl_regs[POC1 ].reg; -if (pin >=RCAR_GP_PIN (1 ,0 ) && pin <=RCAR_GP_PIN (1 ,22 )) + case RCAR_GP_PIN(1, 0) ... RCAR_GP_PIN(1, 22): + *pocctrl = pinmux_ioctrl_regs[POC1 ].reg;return bit; - *pocctrl = pinmux_ioctrl_regs[POC3 ].reg; -if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,12 )) + case RCAR_GP_PIN(3, 0) ... RCAR_GP_PIN(3, 12): + *pocctrl = pinmux_ioctrl_regs[POC3 ].reg;return bit; - *pocctrl = pinmux_ioctrl_regs[POC8 ].reg; -if (pin >=RCAR_GP_PIN (8 ,0 ) && pin <=RCAR_GP_PIN (8 ,13 )) +case PIN_VDDQ_TSN0 : + *pocctrl = pinmux_ioctrl_regs[POC4 ].reg; +return 0 ; + +case PIN_VDDQ_AVB2 : + *pocctrl = pinmux_ioctrl_regs[POC5 ].reg; +return 0 ; + +case PIN_VDDQ_AVB1 : + *pocctrl = pinmux_ioctrl_regs[POC6 ].reg; +return 0 ; + +case PIN_VDDQ_AVB0 : + *pocctrl = pinmux_ioctrl_regs[POC7 ].reg; +return 0 ; + + case RCAR_GP_PIN(8, 0) ... RCAR_GP_PIN(8, 13): + *pocctrl = pinmux_ioctrl_regs[POC8 ].reg;return bit; -return -EINVAL ; +default : +return -EINVAL ; + } }static const struct pinmux_bias_reg pinmux_bias_regs[] = {
Signature · 1 line
2.34.1