Add Renesas R8A77980 PFC driver
Subsystems (4)
v2 cover Add Renesas R8A77980 PFC driver
Hello!
Here's a set of 2 patches against the 'sh-pfc' branch of Geert Uytterhoeven's 'renesas-drivers.git' repo. These patches add the basic support for the R8A77980 PFC.
[1/2] pinctrl: sh-pfc: add PORT_GP_CFG_25() helper macro [2/2] pinctrl: sh-pfc: add R8A77980 PFC support
MBR, Sergei
PATCH v2 1/2 pinctrl: sh-pfc: add PORT_GP_CFG_25() helper macro
They follow the style of the existing PORT_GP_CFG_<n>() macros and will be used by a follow-up patch for the R8A77980 SoC.
Based on the original (and large) patch by Vladimir Barinov.
---
Changes in version 2:
- added Geert's tag.
drivers/pinctrl/sh-pfc/sh_pfc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pinctrl/sh-pfc/sh_pfc.h +6 -2
@@ -471,9 +471,13 @@ extern const struct sh_pfc_soc_info shx3 PORT_GP_CFG_1(bank, 23, fn, sfx, cfg)#define PORT_GP_24 (bank, fn, sfx) PORT_GP_CFG_24(bank, fn, sfx, 0) -#define PORT_GP_CFG_26 (bank, fn, sfx, cfg) \ +#define PORT_GP_CFG_25 (bank, fn, sfx, cfg) \ PORT_GP_CFG_24(bank, fn, sfx, cfg), \ - PORT_GP_CFG_1(bank, 24, fn, sfx, cfg), \ + PORT_GP_CFG_1(bank, 24, fn, sfx, cfg) +#define PORT_GP_25 (bank, fn, sfx) PORT_GP_CFG_25(bank, fn, sfx, 0) + +#define PORT_GP_CFG_26 (bank, fn, sfx, cfg) \ + PORT_GP_CFG_25(bank, fn, sfx, cfg), \ PORT_GP_CFG_1(bank, 25, fn, sfx, cfg)#define PORT_GP_26 (bank, fn, sfx) PORT_GP_CFG_26(bank, fn, sfx, 0)
PATCH v2 2/2 pinctrl: sh-pfc: add R8A77980 PFC support
In reply to Sergei ShtylyovAdd the PFC support for the R8A77980 SoC including pin groups for some on-chip devices such as AVB, CAN-FD, GETHER, [H]SCIF, I2C, INTC-EX, MMC, MSIOF, PWM, and VIN...
Based on the original (and large) patch by Vladimir Barinov.
---
Changes in version 2:
- moved the CANFD_CLK and SCIF_CLK pin groups to their own functions;
- added the DU RGB-888 pin group;
- added the VIN0 RGB-666 pin group;
- swapped HSYNC/VSYNC in the initializer of vin{0|1}_sync_mux[];
- fixed up the comments to the initializer of du_rgb666_pins[];
- added Rob's tag.
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 drivers/pinctrl/sh-pfc/Kconfig | 5 drivers/pinctrl/sh-pfc/Makefile | 1 drivers/pinctrl/sh-pfc/core.c | 6 drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 2799 ++++++++++ drivers/pinctrl/sh-pfc/sh_pfc.h | 1 6 files changed, 2813 insertions(+)
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt +1 -0
@@ -26,6 +26,7 @@ Required Properties: - "renesas,pfc-r8a7796": for R8A7796 (R-Car M3-W) compatible pin-controller. - "renesas,pfc-r8a77965": for R8A77965 (R-Car M3-N) compatible pin-controller. - "renesas,pfc-r8a77970": for R8A77970 (R-Car V3M) compatible pin-controller. + - "renesas,pfc-r8a77980": for R8A77980 (R-Car V3H) compatible pin-controller. - "renesas,pfc-r8a77995": for R8A77995 (R-Car D3) compatible pin-controller. - "renesas,pfc-sh73a0": for SH73A0 (SH-Mobile AG5) compatible pin-controller.
drivers/pinctrl/sh-pfc/Kconfig +5 -0
@@ -99,6 +99,11 @@ config PINCTRL_PFC_R8A77970 depends on ARCH_R8A77970 select PINCTRL_SH_PFC +config PINCTRL_PFC_R8A77980 + def_bool y + depends on ARCH_R8A77980 + select PINCTRL_SH_PFC + config PINCTRL_PFC_R8A77995 def_bool y depends on ARCH_R8A77995
drivers/pinctrl/sh-pfc/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7795) += pfc obj-$(CONFIG_PINCTRL_PFC_R8A7796) += pfc-r8a7796.o obj-$(CONFIG_PINCTRL_PFC_R8A77965) += pfc-r8a77965.o obj-$(CONFIG_PINCTRL_PFC_R8A77970) += pfc-r8a77970.o +obj-$(CONFIG_PINCTRL_PFC_R8A77980) += pfc-r8a77980.o obj-$(CONFIG_PINCTRL_PFC_R8A77995) += pfc-r8a77995.o obj-$(CONFIG_PINCTRL_PFC_SH7203) += pfc-sh7203.o obj-$(CONFIG_PINCTRL_PFC_SH7264) += pfc-sh7264.o
drivers/pinctrl/sh-pfc/core.c +6 -0
@@ -569,6 +569,12 @@ static const struct of_device_id sh_pfc_ .data = &r8a77970_pinmux_info, },#endif +#ifdef CONFIG_PINCTRL_PFC_R8A77980 + { + .compatible = "renesas,pfc-r8a77980", + .data = &r8a77980_pinmux_info, + }, +#endif #ifdef CONFIG_PINCTRL_PFC_R8A77995 { .compatible = "renesas,pfc-r8a77995",
drivers/pinctrl/sh-pfc/pfc-r8a77980.c new file +2799 -0
2,799 lines not on this page · raw message
drivers/pinctrl/sh-pfc/sh_pfc.h +1 -0
@@ -285,6 +285,7 @@ extern const struct sh_pfc_soc_info r8a7extern const struct sh_pfc_soc_info r8a7796_pinmux_info;extern const struct sh_pfc_soc_info r8a77965_pinmux_info;extern const struct sh_pfc_soc_info r8a77970_pinmux_info; +extern const struct sh_pfc_soc_info r8a77980_pinmux_info;extern const struct sh_pfc_soc_info r8a77995_pinmux_info;extern const struct sh_pfc_soc_info sh7203_pinmux_info;extern const struct sh_pfc_soc_info sh7264_pinmux_info;
Re: [PATCH v2 2/2] pinctrl: sh-pfc: add R8A77980 PFC support
Hi Sergei,
Quoted 10 lines · Sergei Shtylyov
Add the PFC support for the R8A77980 SoC including pin groups for some on-chip devices such as AVB, CAN-FD, GETHER, [H]SCIF, I2C, INTC-EX, MMC, MSIOF, PWM, and VIN...
Based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>Reviewed-by Rob Herring <[email protected]>
Quoted 7 lines
Changes in version 2:
- moved theCANFD_CLKandSCIF_CLKpin groups to their own functions;
- added the DU RGB-888 pin group;
- added the VIN0 RGB-666 pin group;
- swapped HSYNC/VSYNC in the initializer of vin{0|1}_sync_mux[];
- fixed up the comments to the initializer of du_rgb666_pins[];
- added Rob's tag.
Thanks for the update!
i.e. will queue 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 1/1 pinctrl: sh-pfc: r8a77970: add EtherAVB pin groups
In reply to Sergei ShtylyovAdd the EtherAVB pin groups to the R8A77970 PFC driver.
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 98 ++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +98 -0
@@ -728,6 +728,82 @@ static const struct sh_pfc_pin pinmux_pi PINMUX_GPIO_GP_ALL(), }; +/* - AVB0 ------------------------------------------------------------------- */ +static const unsigned int avb0_link_pins[] = { +/* AVB0_LINK */ +RCAR_GP_PIN (1 ,18 ), +}; +static const unsigned int avb0_link_mux[] = { +AVB0_LINK_MARK , +}; +static const unsigned int avb0_magic_pins[] = { +/* AVB0_MAGIC */ +RCAR_GP_PIN (1 ,16 ), +}; +static const unsigned int avb0_magic_mux[] = { +AVB0_MAGIC_MARK , +}; +static const unsigned int avb0_phy_int_pins[] = { +/* AVB0_PHY_INT */ +RCAR_GP_PIN (1 ,17 ), +}; +static const unsigned int avb0_phy_int_mux[] = { +AVB0_PHY_INT_MARK , +}; +static const unsigned int avb0_mdio_pins[] = { +/* AVB0_MDC, AVB0_MDIO */ +RCAR_GP_PIN (1 ,15 ),RCAR_GP_PIN (1 ,14 ), +}; +static const unsigned int avb0_mdio_mux[] = { +AVB0_MDC_MARK ,AVB0_MDIO_MARK , +}; +static const unsigned int avb0_rgmii_pins[] = { +/* +* AVB0_TX_CTL, AVB0_TXC, AVB0_TD0, AVB0_TD1, AVB0_TD2, AVB0_TD3, +* AVB0_RX_CTL, AVB0_RXC, AVB0_RD0, AVB0_RD1, AVB0_RD2, AVB0_RD3 +*/ +RCAR_GP_PIN (1 ,7 ),RCAR_GP_PIN (1 ,8 ), +RCAR_GP_PIN (1 ,9 ),RCAR_GP_PIN (1 ,10 ), +RCAR_GP_PIN (1 ,11 ),RCAR_GP_PIN (1 ,12 ), +RCAR_GP_PIN (1 ,1 ),RCAR_GP_PIN (1 ,2 ), +RCAR_GP_PIN (1 ,3 ),RCAR_GP_PIN (1 ,4 ), +RCAR_GP_PIN (1 ,5 ),RCAR_GP_PIN (1 ,6 ), +}; +static const unsigned int avb0_rgmii_mux[] = { +AVB0_TX_CTL_MARK ,AVB0_TXC_MARK , +AVB0_TD0_MARK ,AVB0_TD1_MARK ,AVB0_TD2_MARK ,AVB0_TD3_MARK , +AVB0_RX_CTL_MARK ,AVB0_RXC_MARK , +AVB0_RD0_MARK ,AVB0_RD1_MARK ,AVB0_RD2_MARK ,AVB0_RD3_MARK , +}; +static const unsigned int avb0_txcrefclk_pins[] = { +/* AVB0_TXCREFCLK */ +RCAR_GP_PIN (1 ,13 ), +}; +static const unsigned int avb0_txcrefclk_mux[] = { +AVB0_TXCREFCLK_MARK , +}; +static const unsigned int avb0_avtp_pps_pins[] = { +/* AVB0_AVTP_PPS */ +RCAR_GP_PIN (2 ,6 ), +}; +static const unsigned int avb0_avtp_pps_mux[] = { +AVB0_AVTP_PPS_MARK , +}; +static const unsigned int avb0_avtp_capture_pins[] = { +/* AVB0_AVTP_CAPTURE */ +RCAR_GP_PIN (1 ,20 ), +}; +static const unsigned int avb0_avtp_capture_mux[] = { +AVB0_AVTP_CAPTURE_MARK , +}; +static const unsigned int avb0_avtp_match_pins[] = { +/* AVB0_AVTP_MATCH */ +RCAR_GP_PIN (1 ,19 ), +}; +static const unsigned int avb0_avtp_match_mux[] = { +AVB0_AVTP_MATCH_MARK , +}; +/* - CANFD Clock ------------------------------------------------------------ */ static const unsigned int canfd_clk_a_pins[] = {/* CANFD_CLK */
@@ -1599,6 +1675,15 @@ static const unsigned int vin1_clk_mux[] };static const struct sh_pfc_pin_group pinmux_groups[] = { +SH_PFC_PIN_GROUP (avb0_link), +SH_PFC_PIN_GROUP (avb0_magic), +SH_PFC_PIN_GROUP (avb0_phy_int), +SH_PFC_PIN_GROUP (avb0_mdio), +SH_PFC_PIN_GROUP (avb0_rgmii), +SH_PFC_PIN_GROUP (avb0_txcrefclk), +SH_PFC_PIN_GROUP (avb0_avtp_pps), +SH_PFC_PIN_GROUP (avb0_avtp_capture), +SH_PFC_PIN_GROUP (avb0_avtp_match),SH_PFC_PIN_GROUP (canfd_clk_a),SH_PFC_PIN_GROUP (canfd_clk_b),SH_PFC_PIN_GROUP (canfd0_data_a),
@@ -1709,6 +1794,18 @@ static const struct sh_pfc_pin_group pin SH_PFC_PIN_GROUP(vin1_clk), }; +static const char *const avb0_groups[] = { +"avb0_link" , +"avb0_magic" , +"avb0_phy_int" , +"avb0_mdio" , +"avb0_rgmii" , +"avb0_txcrefclk" , +"avb0_avtp_pps" , +"avb0_avtp_capture" , +"avb0_avtp_match" , +}; +static const char *const canfd_clk_groups[] = {"canfd_clk_a" ,"canfd_clk_b" ,
@@ -1914,6 +2011,7 @@ static const char * const vin1_groups[] };static const struct sh_pfc_function pinmux_functions[] = { +SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (canfd_clk),SH_PFC_FUNCTION (canfd0),SH_PFC_FUNCTION (canfd1),
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add EtherAVB pin groups
Hi Sergei,
Quoted 3 lines · Sergei Shtylyov
Add the EtherAVB pin groups to the R8A77970 PFC driver.
Signed-off-by Sergei Shtylyov <[email protected]>
Thanks!
and queued 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 1/1 pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
In reply to Sergei ShtylyovAdd the pin I/O voltage level control to the R8A77980 PFC driver.
Loosely based on the original (and large) patch by Vladimir Barinov.
--- drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 50 +++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +47 -3
@@ -19,10 +19,10 @@#include "sh_pfc.h" #define CPU_ALL_PORT (fn, sfx) \ - PORT_GP_22(0, fn, sfx), \ + PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE), \ PORT_GP_28(1, fn, sfx), \ - PORT_GP_30(2, fn, sfx), \ - PORT_GP_17(3, fn, sfx), \ + PORT_GP_CFG_30(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE), \ PORT_GP_25(4, fn, sfx), \ PORT_GP_15(5, fn, sfx)
@@ -2779,8 +2779,51 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 , }, + [IOCTRL31 ] = {0xe6060384 , }, + [IOCTRL32 ] = {0xe6060388 , }, + {/* sentinel */ }, +}; + +static int r8a77980_pin_to_pocctrl (struct sh_pfc *pfc,unsigned int pin, +u32 *pocctrl) +{ +int bit = pin &0x1f ; + + *pocctrl = pinmux_ioctrl_regs[IOCTRL30 ].reg; +if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 )) +return bit; +else if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 )) +return bit +22 ; + + *pocctrl = pinmux_ioctrl_regs[IOCTRL31 ].reg; +if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 )) +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 ))) +return bit +7 ; + + *pocctrl = pinmux_ioctrl_regs[IOCTRL32 ].reg; +if (pin >=RCAR_GP_PIN (2 ,25 ) && pin <=RCAR_GP_PIN (2 ,29 )) +return pin -25 ; + +return -EINVAL ; +} + +static const struct sh_pfc_soc_operations pinmux_ops = { + .pin_to_pocctrl = r8a77980_pin_to_pocctrl, +}; +const struct sh_pfc_soc_info r8a77980_pinmux_info = { .name ="r8a77980_pfc" , + .ops = &pinmux_ops, .unlock_reg =0xe6060000 ,/* PMMR */ .function = {PINMUX_FUNCTION_BEGIN ,PINMUX_FUNCTION_END },
@@ -2793,6 +2836,7 @@ const struct sh_pfc_soc_info r8a77980_pi .nr_functions = ARRAY_SIZE(pinmux_functions), .cfg_regs = pinmux_config_regs, + .ioctrl_regs = pinmux_ioctrl_regs, .pinmux_data = pinmux_data, .pinmux_data_size = ARRAY_SIZE(pinmux_data),
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
Quoted 6 lines · Sergei Shtylyov
Add the pin I/O voltage level control to the R8A77980 PFC driver.
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>
Oops, forgot to mention that the patch was against the 'sj-pfc' branch
of Geert's 'renesas-drivers.git' repo...
[...]
MBR, Sergei
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
Quoted 8 lines · Sergei Shtylyov
Quoted 6 lines
Add the pin I/O voltage level control to the R8A77980 PFC driver.
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>Oops, forgot to mention that the patch was against the 'sj-pfc' branch
The branch is called 'sh-pfc', of course. Sigh...
Quoted 3 lines
of Geert's 'renesas-drivers.git' repo...
[...]
MBR, Sergei
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
In reply to Sergei ShtylyovHi Sergei,
Thanks for your patch!
Quoted 1 line · Sergei Shtylyov
Add the pin I/O voltage level control to the R8A77980 PFC driver.
Subject says r8a77970?
drivers/pinctrl/sh-pfc/pfc-r8a77980.c
Quoted 13 lines
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>--- drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 50 +++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)Index:
renesas-drivers/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
===================================================================drivers/pinctrl/sh-pfc/pfc-r8a77980.c +0
-0
Ah, pfc-r8a77980.c it is.
Quoted 5 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +1
-0@@ -2779,8 +2779,51 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs {
drivers/pinctrl/sh-pfc/pfc-r8a77980.c static const struct pinmux_cfg_reg pinmu · line 2792
Quoted 10 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +10
-0+IOCTRL30 , +IOCTRL31 , + IOCTRL32, +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 , }, + [IOCTRL31 ] = {0xe6060384 , }, + [IOCTRL32 ] = {0xe6060388 , }, + { /* sentinel */ },
However, r8a77980 has 4 IOCTRL3x registers (r8a77970 has three)?
Something is wrong: which SoC source file is this patch for?
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
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
Hello!
Quoted 3 lines · Geert Uytterhoeven
Quoted 1 line
Add the pin I/O voltage level control to the R8A77980 PFC driver.
Subject says r8a77970?
Typo, I guess. :-)
Quoted 20 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c
Quoted 13 lines
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>--- drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 50 +++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)Index:
renesas-drivers/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
===================================================================drivers/pinctrl/sh-pfc/pfc-r8a77980.c +0
-0Ah,
pfc-r8a77980.cit is.Quoted 4 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +0
-0@@ -2779,8 +2779,51 @@ static const struct pinmux_cfg_reg pinmu { }, };
Quoted 13 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c static const struct pinmux_cfg_reg pinmu · line 2792
Quoted 11 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +11
-0+enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 , }, + [IOCTRL31 ] = {0xe6060384 , }, + [IOCTRL32 ] = {0xe6060388 , }, + {/* sentinel */ },However, r8a77980 has 4 IOCTRL3x registers (r8a77970 has three)?
I thought that since we don't change it, no need to list it for save/restore
either. I was wrong?
Quoted 1 line
Something is wrong: which SoC source file is this patch for?
R8A77980.
Quoted 3 lines
Gr{oetje,eeting}s,
Geert
MBR, Sergei
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
Hi Sergei,
Quoted 41 lines · Sergei Shtylyov
Quoted 3 lines · Geert Uytterhoeven
Quoted 1 line
Add the pin I/O voltage level control to the R8A77980 PFC driver.
Subject says r8a77970?
Typo, I guess. :-)Quoted 20 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c
Quoted 13 lines
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>--- drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 50 +++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)Index:
renesas-drivers/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
===================================================================drivers/pinctrl/sh-pfc/pfc-r8a77980.c +0
-0Ah,
pfc-r8a77980.cit is.Quoted 4 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +0
-0@@ -2779,8 +2779,51 @@ static const struct pinmux_cfg_reg pinmu { }, };Quoted 13 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c static const struct pinmux_cfg_reg pinmu · line 2792
Quoted 11 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +11
-0+enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 , }, + [IOCTRL31 ] = {0xe6060384 , }, + [IOCTRL32 ] = {0xe6060388 , }, + {/* sentinel */ },However, r8a77980 has 4 IOCTRL3x registers (r8a77970 has three)?
Quoted 2 lines
I thought that since we don't change it, no need to list it for save/restore
either. I was wrong?
Given the system resume path differs from the boot path (resume skips the boot loader, and thus all PFC initialization it performs), I think it is safest to list it anyway, so it is saved and restored.
Quoted 3 lines
Quoted 1 line
Something is wrong: which SoC source file is this patch for?
R8A77980.
Thanks for confirming, will resume reviewing (either this version, or v2 ;-)
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
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add pin I/O voltage control
In reply to Sergei ShtylyovHi Sergei,
Quoted 6 lines · Sergei Shtylyov
Add the pin I/O voltage level control to the R8A77980 PFC driver.
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>
Thanks for your patch!
Quoted 7 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +0
-0@@ -2779,8 +2779,51 @@ static const struct pinmux_cfg_reg pinmu { }, };
drivers/pinctrl/sh-pfc/pfc-r8a77980.c static const struct pinmux_cfg_reg pinmu · line 2791
Quoted 10 lines
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +10
-0+enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 , }, + [IOCTRL31 ] = {0xe6060384 , }, + [IOCTRL32 ] = {0xe6060388 , },
I'd add IOCTRL33, so it is saved/restored during system suspend/resume. You never know what U-Boot wrote to it, which is skipped on system resume.
Note for the future: unlike all other current pocctrl handling, IOCTRL33 is used to select between 2.5V and 3.3V (instead of 1.8V and 3.3V. Handling that will require changes to the r8a77980_pin_to_pocctrl() interface (add two output parameters returning supported voltages?).
With IOCTRL33 added:
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
PATCH 1/1 pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
In reply to Sergei ShtylyovI've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
- SH_PFC_PIN_CFG_IO_VOLTAGE pin flags weren't set properly;
- sh_pfc_soc_info::ioctrl_regs wasn't set at all...
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +26 -8
@@ -21,13 +21,15 @@#include "core.h" #include "sh_pfc.h" +#define CFG_FLAGS SH_PFC_PIN_CFG_DRIVE_STRENGTH +#define CPU_ALL_PORT (fn, sfx) \ - PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_28(1, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_6(4, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_15(5, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH) + PORT_GP_CFG_22(0, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_17(2, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_17(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_6(4, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_15(5, fn, sfx, CFG_FLAGS)/* * F_() : just information * FM() : macro for FN_xxx / xxx_MARK
@@ -2382,18 +2384,33 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +IOCTRL40 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 }, + [IOCTRL31 ] = {0xe6060384 }, + [IOCTRL32 ] = {0xe6060388 }, + [IOCTRL40 ] = {0xe60603c0 }, + {/* sentinel */ }, +}; +static int r8a77970_pin_to_pocctrl (struct sh_pfc *pfc,unsigned int pin,u32 *pocctrl) {int bit = pin &0x1f ; - *pocctrl =0xe6060380 ; + *pocctrl = pinmux_ioctrl_regs[IOCTRL30 ].reg;if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 ))return bit;if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 ))return bit +22 ; - *pocctrl +=4 ; + *pocctrl = pinmux_ioctrl_regs[IOCTRL31 ].reg;if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 ))return bit -10 ;if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,16 ))
@@ -2421,6 +2438,7 @@ const struct sh_pfc_soc_info r8a77970_pi .nr_functions = ARRAY_SIZE(pinmux_functions), .cfg_regs = pinmux_config_regs, + .ioctrl_regs = pinmux_ioctrl_regs, .pinmux_data = pinmux_data, .pinmux_data_size = ARRAY_SIZE(pinmux_data),
Re: [PATCH] pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
Quoted 6 lines · Sergei Shtylyov
I've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
-SH_PFC_PIN_CFG_IO_VOLTAGEpin flags weren't set properly;
-sh_pfc_soc_info::ioctrl_regswasn't set at all...Fixes b92ac66a181 ("pinctrl: sh-pfc: Add R8A77970 PFC support")
Oops, only 11 digits... will repost!
Quoted 1 line
Signed-off-by Sergei Shtylyov <[email protected]>
[...]
MBR, Sergei
PATCH v2 1/1 pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
In reply to Sergei ShtylyovI've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
- SH_PFC_PIN_CFG_IO_VOLTAGE pin flags weren't set properly;
- sh_pfc_soc_info::ioctrl_regs wasn't set at all...
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
Changes in version 2:
- fixed the commit SHA1 in the "Fixes:" tag.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +26 -8
@@ -21,13 +21,15 @@#include "core.h" #include "sh_pfc.h" +#define CFG_FLAGS SH_PFC_PIN_CFG_DRIVE_STRENGTH +#define CPU_ALL_PORT (fn, sfx) \ - PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_28(1, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_6(4, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_15(5, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH) + PORT_GP_CFG_22(0, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_17(2, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_17(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_6(4, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_15(5, fn, sfx, CFG_FLAGS)/* * F_() : just information * FM() : macro for FN_xxx / xxx_MARK
@@ -2382,18 +2384,33 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +IOCTRL40 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 }, + [IOCTRL31 ] = {0xe6060384 }, + [IOCTRL32 ] = {0xe6060388 }, + [IOCTRL40 ] = {0xe60603c0 }, + {/* sentinel */ }, +}; +static int r8a77970_pin_to_pocctrl (struct sh_pfc *pfc,unsigned int pin,u32 *pocctrl) {int bit = pin &0x1f ; - *pocctrl =0xe6060380 ; + *pocctrl = pinmux_ioctrl_regs[IOCTRL30 ].reg;if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 ))return bit;if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 ))return bit +22 ; - *pocctrl +=4 ; + *pocctrl = pinmux_ioctrl_regs[IOCTRL31 ].reg;if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 ))return bit -10 ;if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,16 ))
@@ -2421,6 +2438,7 @@ const struct sh_pfc_soc_info r8a77970_pi .nr_functions = ARRAY_SIZE(pinmux_functions), .cfg_regs = pinmux_config_regs, + .ioctrl_regs = pinmux_ioctrl_regs, .pinmux_data = pinmux_data, .pinmux_data_size = ARRAY_SIZE(pinmux_data),
Re: [PATCH v2] pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
Hi Sergei,
Quoted 4 lines · Sergei Shtylyov
I've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
-SH_PFC_PIN_CFG_IO_VOLTAGEpin flags weren't set properly;
-sh_pfc_soc_info::ioctrl_regswasn't set at all...
Thanks for your patch!
Quoted 2 lines
Fixes b92ac66a1819 ("pinctrl: sh-pfc: Add R8A77970 PFC support")Signed-off-by Sergei Shtylyov <[email protected]>
Minor nit below...
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const struct pinmux_cfg_reg pinmu · line 2391
Quoted 12 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +5
-0@@ -2382,18 +2384,33 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +IOCTRL40 ,
Note for the future: unlike all other current pocctrl handling, IOCTRL32 is used to select between 2.5V and 3.3V (instead of 1.8V and 3.3V). Handling that will require changes to the r8a77980_pin_to_pocctrl() interface (add two output parameters returning supported voltages?).
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const struct pinmux_cfg_reg pinmu · line 2391
Quoted 1 line
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +1
-0+ IOCTRL40,
That's TDSEL, and thus not related to I/O voltage. But I agree it should be saved during suspend/resume. ;-)
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
Re: [PATCH v2] pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
Quoted 5 lines · Geert Uytterhoeven
Quoted 4 lines
I've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
-SH_PFC_PIN_CFG_IO_VOLTAGEpin flags weren't set properly;
-sh_pfc_soc_info::ioctrl_regswasn't set at all...
Quoted 8 lines
Thanks for your patch!
Quoted 2 lines
Fixes b92ac66a1819 ("pinctrl: sh-pfc: Add R8A77970 PFC support")Signed-off-by Sergei Shtylyov <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Minor nit below...
Not sure which of your multiple comments was this nit... :-)
Quoted 7 lines
Quoted 7 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +0
-0@@ -2382,18 +2384,33 @@ static const struct pinmux_cfg_reg pinmu { }, };
Quoted 8 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const struct pinmux_cfg_reg pinmu · line 2391
Quoted 5 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +5
-0+enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +IOCTRL40 ,Note for the future: unlike all other current pocctrl handling, IOCTRL32 is used to select between 2.5V and 3.3V (instead of 1.8V and 3.3V).
It also controls a group of pins instead of the individual pins, isn't it?
Quoted 1 line
Handling that will require changes to the
r8a77980_pin_to_pocctrl()
I'm afraid we'd need a new method, other than pin_to_pocctrl...
Quoted 5 lines
interface (add two output parameters returning supported voltages?).
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const struct pinmux_cfg_reg pinmu · line 2391
Quoted 1 line
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +1
-0+ IOCTRL40,That's TDSEL, and thus not related to I/O voltage.
It's still an IOCTRL<n> register, no?
Quoted 1 line
But I agree it should be saved during suspend/resume. ;-)
You mean we shouldn't use the sh_pfc_soc_info::ioctrl_regs mechanism for it?
Quoted 3 lines
Gr{oetje,eeting}s,
Geert
MBR, Sergei
Re: [PATCH v2] pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
In reply to Geert UytterhoevenQuoted 5 lines · Geert Uytterhoeven
Quoted 4 lines
I've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
-SH_PFC_PIN_CFG_IO_VOLTAGEpin flags weren't set properly;
-sh_pfc_soc_info::ioctrl_regswasn't set at all...
Quoted 8 lines
Thanks for your patch!
Quoted 2 lines
Fixes b92ac66a1819 ("pinctrl: sh-pfc: Add R8A77970 PFC support")Signed-off-by Sergei Shtylyov <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>Minor nit below...
Not sure which of your multiple comments was this nit... :-)
Quoted 7 lines
Quoted 7 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +0
-0@@ -2382,18 +2384,33 @@ static const struct pinmux_cfg_reg pinmu { }, };
Quoted 8 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const struct pinmux_cfg_reg pinmu · line 2391
Quoted 5 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +5
-0+enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +IOCTRL40 ,Note for the future: unlike all other current pocctrl handling, IOCTRL32 is used to select between 2.5V and 3.3V (instead of 1.8V and 3.3V).
It also controls a group of pins instead of the individual pins, doesn't it?
Quoted 1 line
Handling that will require changes to the
r8a77980_pin_to_pocctrl()
I'm afraid we'd need a new method, other than pin_to_pocctrl...
Quoted 5 lines
interface (add two output parameters returning supported voltages?).
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const struct pinmux_cfg_reg pinmu · line 2391
Quoted 1 line
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +1
-0+ IOCTRL40,That's TDSEL, and thus not related to I/O voltage.
It's still an IOCTRL<n> register, no?
Quoted 1 line
But I agree it should be saved during suspend/resume. ;-)
You mean we shouldn't use the sh_pfc_soc_info::ioctrl_regs mechanism for it?
Quoted 3 lines
Gr{oetje,eeting}s,
Geert
MBR, Sergei
PATCH v2 1/1 pinctrl: sh-pfc: r8a77980: add pin I/O voltage control support
In reply to Sergei ShtylyovAdd the pin I/O voltage level control support to the R8A77980 PFC driver.
Loosely based on the original (and large) patch by Vladimir Barinov.
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
Changes in version 2:
- added IOCTRL33 to *enum* ioctrl_regs and its address to pinmux_ioctrl_regs[];
- fixed the subject;
- added Geert's tag.
drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 52 ++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +49 -3
@@ -19,10 +19,10 @@#include "sh_pfc.h" #define CPU_ALL_PORT (fn, sfx) \ - PORT_GP_22(0, fn, sfx), \ + PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE), \ PORT_GP_28(1, fn, sfx), \ - PORT_GP_30(2, fn, sfx), \ - PORT_GP_17(3, fn, sfx), \ + PORT_GP_CFG_30(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE), \ PORT_GP_25(4, fn, sfx), \ PORT_GP_15(5, fn, sfx)
@@ -2779,8 +2779,53 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +IOCTRL33 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 , }, + [IOCTRL31 ] = {0xe6060384 , }, + [IOCTRL32 ] = {0xe6060388 , }, + [IOCTRL33 ] = {0xe606038c , }, + {/* sentinel */ }, +}; + +static int r8a77980_pin_to_pocctrl (struct sh_pfc *pfc,unsigned int pin, +u32 *pocctrl) +{ +int bit = pin &0x1f ; + + *pocctrl = pinmux_ioctrl_regs[IOCTRL30 ].reg; +if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 )) +return bit; +else if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 )) +return bit +22 ; + + *pocctrl = pinmux_ioctrl_regs[IOCTRL31 ].reg; +if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 )) +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 ))) +return bit +7 ; + + *pocctrl = pinmux_ioctrl_regs[IOCTRL32 ].reg; +if (pin >=RCAR_GP_PIN (2 ,25 ) && pin <=RCAR_GP_PIN (2 ,29 )) +return pin -25 ; + +return -EINVAL ; +} + +static const struct sh_pfc_soc_operations pinmux_ops = { + .pin_to_pocctrl = r8a77980_pin_to_pocctrl, +}; +const struct sh_pfc_soc_info r8a77980_pinmux_info = { .name ="r8a77980_pfc" , + .ops = &pinmux_ops, .unlock_reg =0xe6060000 ,/* PMMR */ .function = {PINMUX_FUNCTION_BEGIN ,PINMUX_FUNCTION_END },
@@ -2793,6 +2838,7 @@ const struct sh_pfc_soc_info r8a77980_pi .nr_functions = ARRAY_SIZE(pinmux_functions), .cfg_regs = pinmux_config_regs, + .ioctrl_regs = pinmux_ioctrl_regs, .pinmux_data = pinmux_data, .pinmux_data_size = ARRAY_SIZE(pinmux_data),
Re: [PATCH v2] pinctrl: sh-pfc: r8a77980: add pin I/O voltage control support
Quoted 8 lines · Sergei Shtylyov
Add the pin I/O voltage level control support to the R8A77980 PFC driver.
Loosely based on the original (and large) patch by Vladimir Barinov.
Signed-off-by Vladimir Barinov <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>
Quoted 7 lines
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.Changes in version 2:
- added IOCTRL33 to *enum*ioctrl_regsand its address to pinmux_ioctrl_regs[];
- fixed the subject;
- added Geert's tag.
Thanks, queued in sh-pfc-for-v4.18 (with the first character capitalized, as usual).
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
PATCH v3 1/1 pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
In reply to Sergei ShtylyovI've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
- SH_PFC_PIN_CFG_IO_VOLTAGE pin flags weren't set properly;
- sh_pfc_soc_info::ioctrl_regs wasn't set at all...
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
Changes in version 3:
- removed IOCTRL40 from *enum* ioctrl_regs and its address from pinmux_ioctrl_regs[].
Changes in version 2:
- fixed the commit SHA1 in the "Fixes:" tag.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +24 -8
@@ -21,13 +21,15 @@#include "core.h" #include "sh_pfc.h" +#define CFG_FLAGS SH_PFC_PIN_CFG_DRIVE_STRENGTH +#define CPU_ALL_PORT (fn, sfx) \ - PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_28(1, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_6(4, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH), \ - PORT_GP_CFG_15(5, fn, sfx, SH_PFC_PIN_CFG_DRIVE_STRENGTH) + PORT_GP_CFG_22(0, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_17(2, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_17(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ + PORT_GP_CFG_6(4, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_15(5, fn, sfx, CFG_FLAGS)/* * F_() : just information * FM() : macro for FN_xxx / xxx_MARK
@@ -2382,18 +2384,31 @@ static const struct pinmux_cfg_reg pinmu { }, }; +enum ioctrl_regs { +IOCTRL30 , +IOCTRL31 , +IOCTRL32 , +}; + +static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { + [IOCTRL30 ] = {0xe6060380 }, + [IOCTRL31 ] = {0xe6060384 }, + [IOCTRL32 ] = {0xe6060388 }, + {/* sentinel */ }, +}; +static int r8a77970_pin_to_pocctrl (struct sh_pfc *pfc,unsigned int pin,u32 *pocctrl) {int bit = pin &0x1f ; - *pocctrl =0xe6060380 ; + *pocctrl = pinmux_ioctrl_regs[IOCTRL30 ].reg;if (pin >=RCAR_GP_PIN (0 ,0 ) && pin <=RCAR_GP_PIN (0 ,21 ))return bit;if (pin >=RCAR_GP_PIN (2 ,0 ) && pin <=RCAR_GP_PIN (2 ,9 ))return bit +22 ; - *pocctrl +=4 ; + *pocctrl = pinmux_ioctrl_regs[IOCTRL31 ].reg;if (pin >=RCAR_GP_PIN (2 ,10 ) && pin <=RCAR_GP_PIN (2 ,16 ))return bit -10 ;if (pin >=RCAR_GP_PIN (3 ,0 ) && pin <=RCAR_GP_PIN (3 ,16 ))
@@ -2421,6 +2436,7 @@ const struct sh_pfc_soc_info r8a77970_pi .nr_functions = ARRAY_SIZE(pinmux_functions), .cfg_regs = pinmux_config_regs, + .ioctrl_regs = pinmux_ioctrl_regs, .pinmux_data = pinmux_data, .pinmux_data_size = ARRAY_SIZE(pinmux_data),
Re: [PATCH v3] pinctrl: sh-pfc: r8a77970: fix pin I/O voltage control support
Quoted 7 lines · Sergei Shtylyov
I've included the pin I/O voltage control into the R8A77970 PFC driver but it was incomplete because:
-SH_PFC_PIN_CFG_IO_VOLTAGEpin flags weren't set properly;
-sh_pfc_soc_info::ioctrl_regswasn't set at all...Fixes b92ac66a1819 ("pinctrl: sh-pfc: Add R8A77970 PFC support")Signed-off-by Sergei Shtylyov <[email protected]>
i.e. queued in sh-pfc-for-v4.18.
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
PATCH 1/1 pinctrl: sh-pfc: r8a77970: add QSPI pins, groups, and functions
In reply to Sergei ShtylyovFrom: Dmitry Shifrin <[email protected]>
Add the QSPI{0|1} pins/groups/functions to the R8A77970 PFC driver.
[Sergei: ported to the upstream driver, fixed up the swapped QSPI0 SPCLK/ SSL pins, fixed up the comments, moved the QSPI pins/groups/functions to be in the alphanumeric order, removed unneeded empty lines, renamed the patch.]
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 70 ++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +70 -0
@@ -1382,6 +1382,56 @@ static const unsigned int pwm4_b_mux[] = PWM4_B_MARK, }; +/* - QSPI0 ------------------------------------------------------------------ */ +static const unsigned int qspi0_ctrl_pins[] = { +/* SPCLK, SSL */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,5 ), +}; +static const unsigned int qspi0_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK , +}; +static const unsigned int qspi0_data2_pins[] = { +/* MOSI_IO0, MISO_IO1 */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +}; +static const unsigned int qspi0_data2_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +}; +static const unsigned int qspi0_data4_pins[] = { +/* MOSI_IO0, MISO_IO1, IO2, IO3 */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +RCAR_GP_PIN (5 ,3 ),RCAR_GP_PIN (5 ,4 ), +}; +static const unsigned int qspi0_data4_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +QSPI0_IO2_MARK ,QSPI0_IO3_MARK +}; + +/* - QSPI1 ------------------------------------------------------------------ */ +static const unsigned int qspi1_ctrl_pins[] = { +/* SPCLK, SSL */ +RCAR_GP_PIN (5 ,6 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int qspi1_ctrl_mux[] = { +QSPI1_SPCLK_MARK ,QSPI1_SSL_MARK , +}; +static const unsigned int qspi1_data2_pins[] = { +/* MOSI_IO0, MISO_IO1 */ +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +}; +static const unsigned int qspi1_data2_mux[] = { +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +}; +static const unsigned int qspi1_data4_pins[] = { +/* MOSI_IO0, MISO_IO1, IO2, IO3 */ +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +RCAR_GP_PIN (5 ,9 ),RCAR_GP_PIN (5 ,10 ), +}; +static const unsigned int qspi1_data4_mux[] = { +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +QSPI1_IO2_MARK ,QSPI1_IO3_MARK +}; +/* - SCIF Clock ------------------------------------------------------------- */ static const unsigned int scif_clk_a_pins[] = {/* SCIF_CLK */
@@ -1756,6 +1806,12 @@ static const struct sh_pfc_pin_group pinSH_PFC_PIN_GROUP (pwm3_b),SH_PFC_PIN_GROUP (pwm4_a),SH_PFC_PIN_GROUP (pwm4_b), +SH_PFC_PIN_GROUP (qspi0_ctrl), +SH_PFC_PIN_GROUP (qspi0_data2), +SH_PFC_PIN_GROUP (qspi0_data4), +SH_PFC_PIN_GROUP (qspi1_ctrl), +SH_PFC_PIN_GROUP (qspi1_data2), +SH_PFC_PIN_GROUP (qspi1_data4),SH_PFC_PIN_GROUP (scif_clk_a),SH_PFC_PIN_GROUP (scif_clk_b), SH_PFC_PIN_GROUP(scif0_data),
@@ -1950,6 +2006,18 @@ static const char * const pwm4_groups[] "pwm4_b", }; +static const char *const qspi0_groups[] = { +"qspi0_ctrl" , +"qspi0_data2" , +"qspi0_data4" , +}; + +static const char *const qspi1_groups[] = { +"qspi1_ctrl" , +"qspi1_data2" , +"qspi1_data4" , +}; +static const char *const scif_clk_groups[] = {"scif_clk_a" ,"scif_clk_b" ,
@@ -2033,6 +2101,8 @@ static const struct sh_pfc_function pinmSH_PFC_FUNCTION (pwm2),SH_PFC_FUNCTION (pwm3),SH_PFC_FUNCTION (pwm4), +SH_PFC_FUNCTION (qspi0), +SH_PFC_FUNCTION (qspi1),SH_PFC_FUNCTION (scif_clk),SH_PFC_FUNCTION (scif0), SH_PFC_FUNCTION(scif1),
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add QSPI pins, groups, and functions
Quoted 11 lines · Sergei Shtylyov
From: Dmitry Shifrin <[email protected]>
Add the QSPI{0|1} pins/groups/functions to the R8A77970 PFC driver.
[Sergei: ported to the upstream driver, fixed up the swapped QSPI0 SPCLK/ SSL pins, fixed up the comments, moved the QSPI pins/groups/functions to be in the alphanumeric order, removed unneeded empty lines, renamed the patch.]
Signed-off-by Dmitry Shifrin <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add QSPI pins, groups, and functions
In reply to Sergei ShtylyovQuoted 11 lines · Sergei Shtylyov
From: Dmitry Shifrin <[email protected]>
Add the QSPI{0|1} pins/groups/functions to the R8A77970 PFC driver.
[Sergei: ported to the upstream driver, fixed up the swapped QSPI0 SPCLK/ SSL pins, fixed up the comments, moved the QSPI pins/groups/functions to be in the alphanumeric order, removed unneeded empty lines, renamed the patch.]
Signed-off-by Dmitry Shifrin <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>
i.e. will queue in sh-pfc-for-v4.21.
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
PATCH 1/1 pinctrl: sh-pfc: r8a77980: add QSPI pins, groups, and functions
In reply to Sergei ShtylyovFrom: Dmitry Shifrin <[email protected]>
Add the QSPI{0|1} pins/groups/functions to the R8A77980 PFC driver.
[Sergei: ported to the upstream driver, fixed up the swapped QSPI0 SPCLK/ SSL pins, fixed up the comments, moved the QSPI pins/groups/functions to be in the alphanumeric order, removed unneeded empty lines, renamed the patch.]
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 70 ++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +70 -0
@@ -1660,6 +1660,56 @@ static const unsigned int pwm4_b_mux[] = PWM4_B_MARK, }; +/* - QSPI0 ------------------------------------------------------------------ */ +static const unsigned int qspi0_ctrl_pins[] = { +/* SPCLK, SSL */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,5 ), +}; +static const unsigned int qspi0_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK , +}; +static const unsigned int qspi0_data2_pins[] = { +/* MOSI_IO0, MISO_IO1 */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +}; +static const unsigned int qspi0_data2_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +}; +static const unsigned int qspi0_data4_pins[] = { +/* MOSI_IO0, MISO_IO1, IO2, IO3 */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +RCAR_GP_PIN (5 ,3 ),RCAR_GP_PIN (5 ,4 ), +}; +static const unsigned int qspi0_data4_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +QSPI0_IO2_MARK ,QSPI0_IO3_MARK +}; + +/* - QSPI1 ------------------------------------------------------------------ */ +static const unsigned int qspi1_ctrl_pins[] = { +/* SPCLK, SSL */ +RCAR_GP_PIN (5 ,6 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int qspi1_ctrl_mux[] = { +QSPI1_SPCLK_MARK ,QSPI1_SSL_MARK , +}; +static const unsigned int qspi1_data2_pins[] = { +/* MOSI_IO0, MISO_IO1 */ +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +}; +static const unsigned int qspi1_data2_mux[] = { +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +}; +static const unsigned int qspi1_data4_pins[] = { +/* MOSI_IO0, MISO_IO1, IO2, IO3 */ +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +RCAR_GP_PIN (5 ,9 ),RCAR_GP_PIN (5 ,10 ), +}; +static const unsigned int qspi1_data4_mux[] = { +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +QSPI1_IO2_MARK ,QSPI1_IO3_MARK +}; +/* - SCIF0 ------------------------------------------------------------------ */ static const unsigned int scif0_data_pins[] = {/* RX0, TX0 */
@@ -2092,6 +2142,12 @@ static const struct sh_pfc_pin_group pinSH_PFC_PIN_GROUP (pwm3_b),SH_PFC_PIN_GROUP (pwm4_a),SH_PFC_PIN_GROUP (pwm4_b), +SH_PFC_PIN_GROUP (qspi0_ctrl), +SH_PFC_PIN_GROUP (qspi0_data2), +SH_PFC_PIN_GROUP (qspi0_data4), +SH_PFC_PIN_GROUP (qspi1_ctrl), +SH_PFC_PIN_GROUP (qspi1_data2), +SH_PFC_PIN_GROUP (qspi1_data4),SH_PFC_PIN_GROUP (scif0_data),SH_PFC_PIN_GROUP (scif0_clk), SH_PFC_PIN_GROUP(scif0_ctrl),
@@ -2316,6 +2372,18 @@ static const char * const pwm4_groups[] "pwm4_b", }; +static const char *const qspi0_groups[] = { +"qspi0_ctrl" , +"qspi0_data2" , +"qspi0_data4" , +}; + +static const char *const qspi1_groups[] = { +"qspi1_ctrl" , +"qspi1_data2" , +"qspi1_data4" , +}; +static const char *const scif0_groups[] = {"scif0_data" ,"scif0_clk" ,
@@ -2412,6 +2480,8 @@ static const struct sh_pfc_function pinmSH_PFC_FUNCTION (pwm2),SH_PFC_FUNCTION (pwm3),SH_PFC_FUNCTION (pwm4), +SH_PFC_FUNCTION (qspi0), +SH_PFC_FUNCTION (qspi1),SH_PFC_FUNCTION (scif0),SH_PFC_FUNCTION (scif1), SH_PFC_FUNCTION(scif3),
Re: [PATCH] pinctrl: sh-pfc: r8a77980: add QSPI pins, groups, and functions
Quoted 11 lines · Sergei Shtylyov
From: Dmitry Shifrin <[email protected]>
Add the QSPI{0|1} pins/groups/functions to the R8A77980 PFC driver.
[Sergei: ported to the upstream driver, fixed up the swapped QSPI0 SPCLK/ SSL pins, fixed up the comments, moved the QSPI pins/groups/functions to be in the alphanumeric order, removed unneeded empty lines, renamed the patch.]
Signed-off-by Dmitry Shifrin <[email protected]>Signed-off-by Sergei Shtylyov <[email protected]>
i.e. queuing in sh-pfc-for-v4.21.
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
PATCH 1/1 pinctrl: sh-pfc: r8a77980: add RPC pins, groups, and functions
In reply to Sergei ShtylyovAdd the RPC pins/groups/functions to the R8A77980 PFC driver. They can be used if an Octal-SPI flash or HyperFlash is connected.
Based on the patch by Dmitry Shifrin <[email protected]>.
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a77980.c +76 -0
@@ -1710,6 +1710,64 @@ static const unsigned int qspi1_data4_muQSPI1_IO2_MARK ,QSPI1_IO3_MARK }; +/* - RPC -------------------------------------------------------------------- */ +static const unsigned int rpc_clk1_pins[] = { +/* Octal-SPI flash: C/SCLK */ +RCAR_GP_PIN (5 ,0 ), +}; +static const unsigned int rpc_clk1_mux[] = { +QSPI0_SPCLK_MARK , +}; +static const unsigned int rpc_clk2_pins[] = { +/* HyperFlash: CK, CK# */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,6 ), +}; +static const unsigned int rpc_clk2_mux[] = { +QSPI0_SPCLK_MARK ,QSPI1_SPCLK_MARK , +}; +static const unsigned int rpc_ctrl_pins[] = { +/* Octal-SPI flash: S#/CS, DQS */ +/* HyperFlash: CS#, RDS */ +RCAR_GP_PIN (5 ,5 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int rpc_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK , +}; +static const unsigned int rpc_data_pins[] = { +/* DQ[0:7] */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +RCAR_GP_PIN (5 ,3 ),RCAR_GP_PIN (5 ,4 ), +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +RCAR_GP_PIN (5 ,9 ),RCAR_GP_PIN (5 ,10 ), +}; +static const unsigned int rpc_data_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +QSPI0_IO2_MARK ,QSPI0_IO3_MARK , +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +QSPI1_IO2_MARK ,QSPI1_IO3_MARK , +}; +static const unsigned int rpc_reset_pins[] = { +/* RPC_RESET# */ +RCAR_GP_PIN (5 ,12 ), +}; +static const unsigned int rpc_reset_mux[] = { +RPC_RESET_N_MARK , +}; +static const unsigned int rpc_int_pins[] = { +/* RPC_INT# */ +RCAR_GP_PIN (5 ,14 ), +}; +static const unsigned int rpc_int_mux[] = { +RPC_INT_N_MARK , +}; +static const unsigned int rpc_wp_pins[] = { +/* RPC_WP# */ +RCAR_GP_PIN (5 ,13 ), +}; +static const unsigned int rpc_wp_mux[] = { +RPC_WP_N_MARK , +}; +/* - SCIF0 ------------------------------------------------------------------ */ static const unsigned int scif0_data_pins[] = { /* RX0, TX0 */
@@ -2126,6 +2184,13 @@ static const struct sh_pfc_pin_group pinSH_PFC_PIN_GROUP (qspi1_ctrl),SH_PFC_PIN_GROUP (qspi1_data2),SH_PFC_PIN_GROUP (qspi1_data4), +SH_PFC_PIN_GROUP (rpc_clk1), +SH_PFC_PIN_GROUP (rpc_clk2), +SH_PFC_PIN_GROUP (rpc_ctrl), +SH_PFC_PIN_GROUP (rpc_data), +SH_PFC_PIN_GROUP (rpc_reset), +SH_PFC_PIN_GROUP (rpc_int), +SH_PFC_PIN_GROUP (rpc_wp),SH_PFC_PIN_GROUP (scif0_data),SH_PFC_PIN_GROUP (scif0_clk), SH_PFC_PIN_GROUP(scif0_ctrl),
@@ -2362,6 +2427,16 @@ static const char * const qspi1_groups[] "qspi1_data4", }; +static const char *const rpc_groups[] = { +"rpc_clk1" , +"rpc_clk2" , +"rpc_ctrl" , +"rpc_data" , +"rpc_reset" , +"rpc_int" , +"rpc_wp" , +}; +static const char *const scif0_groups[] = {"scif0_data" ,"scif0_clk" ,
@@ -2460,6 +2535,7 @@ static const struct sh_pfc_function pinmSH_PFC_FUNCTION (pwm4),SH_PFC_FUNCTION (qspi0),SH_PFC_FUNCTION (qspi1), +SH_PFC_FUNCTION (rpc),SH_PFC_FUNCTION (scif0),SH_PFC_FUNCTION (scif1), SH_PFC_FUNCTION(scif3),
Re: [PATCH] pinctrl: sh-pfc: r8a77980: add RPC pins, groups, and functions
Quoted 6 lines · Sergei Shtylyov
Add the RPC pins/groups/functions to the R8A77980 PFC driver. They can be used if an Octal-SPI flash or HyperFlash is connected.
Based on the patch by Dmitry Shifrin <[email protected]>.
Signed-off-by Sergei Shtylyov <[email protected]>
i.e. will queue in sh-pfc-for-v5.9.
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
PATCH 1/1 pinctrl: sh-pfc: r8a77970: add RPC pins, groups, and functions
In reply to Sergei ShtylyovFrom: Sergei Shtylyov <[email protected]>
Subject: pinctrl: sh-pfc: r8a77970: Add RPC pins, groups, and functions
Add the RPC pins/groups/functions to the R8A77970 PFC driver. They can be used if an Octal-SPI flash or HyperFlash is connected.
Based on the patch by Dmitry Shifrin <[email protected]>.
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +76 -0
@@ -1416,6 +1416,64 @@ static const unsigned int qspi1_data4_muQSPI1_IO2_MARK ,QSPI1_IO3_MARK }; +/* - RPC -------------------------------------------------------------------- */ +static const unsigned int rpc_clk1_pins[] = { +/* Octal-SPI flash: C/SCLK */ +RCAR_GP_PIN (5 ,0 ), +}; +static const unsigned int rpc_clk1_mux[] = { +QSPI0_SPCLK_MARK , +}; +static const unsigned int rpc_clk2_pins[] = { +/* HyperFlash: CK, CK# */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,6 ), +}; +static const unsigned int rpc_clk2_mux[] = { +QSPI0_SPCLK_MARK ,QSPI1_SPCLK_MARK , +}; +static const unsigned int rpc_ctrl_pins[] = { +/* Octal-SPI flash: S#/CS, DQS */ +/* HyperFlash: CS#, RDS */ +RCAR_GP_PIN (5 ,5 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int rpc_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK , +}; +static const unsigned int rpc_data_pins[] = { +/* DQ[0:7] */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +RCAR_GP_PIN (5 ,3 ),RCAR_GP_PIN (5 ,4 ), +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +RCAR_GP_PIN (5 ,9 ),RCAR_GP_PIN (5 ,10 ), +}; +static const unsigned int rpc_data_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +QSPI0_IO2_MARK ,QSPI0_IO3_MARK , +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +QSPI1_IO2_MARK ,QSPI1_IO3_MARK , +}; +static const unsigned int rpc_reset_pins[] = { +/* RPC_RESET# */ +RCAR_GP_PIN (5 ,12 ), +}; +static const unsigned int rpc_reset_mux[] = { +RPC_RESET_N_MARK , +}; +static const unsigned int rpc_int_pins[] = { +/* RPC_INT# */ +RCAR_GP_PIN (5 ,14 ), +}; +static const unsigned int rpc_int_mux[] = { +RPC_INT_N_MARK , +}; +static const unsigned int rpc_wp_pins[] = { +/* RPC_WP# */ +RCAR_GP_PIN (5 ,13 ), +}; +static const unsigned int rpc_wp_mux[] = { +RPC_WP_N_MARK , +}; +/* - SCIF Clock ------------------------------------------------------------- */ static const unsigned int scif_clk_a_pins[] = { /* SCIF_CLK */
@@ -1750,6 +1808,13 @@ static const struct sh_pfc_pin_group pinSH_PFC_PIN_GROUP (qspi1_ctrl),SH_PFC_PIN_GROUP (qspi1_data2),SH_PFC_PIN_GROUP (qspi1_data4), +SH_PFC_PIN_GROUP (rpc_clk1), +SH_PFC_PIN_GROUP (rpc_clk2), +SH_PFC_PIN_GROUP (rpc_ctrl), +SH_PFC_PIN_GROUP (rpc_data), +SH_PFC_PIN_GROUP (rpc_reset), +SH_PFC_PIN_GROUP (rpc_int), +SH_PFC_PIN_GROUP (rpc_wp),SH_PFC_PIN_GROUP (scif_clk_a),SH_PFC_PIN_GROUP (scif_clk_b), SH_PFC_PIN_GROUP(scif0_data),
@@ -1954,6 +2019,16 @@ static const char * const qspi1_groups[] "qspi1_data4", }; +static const char *const rpc_groups[] = { +"rpc_clk1" , +"rpc_clk2" , +"rpc_ctrl" , +"rpc_data" , +"rpc_reset" , +"rpc_int" , +"rpc_wp" , +}; +static const char *const scif_clk_groups[] = {"scif_clk_a" ,"scif_clk_b" ,
@@ -2039,6 +2114,7 @@ static const struct sh_pfc_function pinmSH_PFC_FUNCTION (pwm4),SH_PFC_FUNCTION (qspi0),SH_PFC_FUNCTION (qspi1), +SH_PFC_FUNCTION (rpc),SH_PFC_FUNCTION (scif_clk),SH_PFC_FUNCTION (scif0), SH_PFC_FUNCTION(scif1),
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add RPC pins, groups, and functions
Hi Sergei,
Quoted 9 lines · Sergei Shtylyov
From: Sergei Shtylyov <[email protected]>
Subject: pinctrl: sh-pfc: r8a77970: Add RPC pins, groups, and functionsAdd the RPC pins/groups/functions to the R8A77970 PFC driver. They can be used if an Octal-SPI flash or HyperFlash is connected.
Based on the patch by Dmitry Shifrin <[email protected]>.
Signed-off-by Sergei Shtylyov <[email protected]>
Thanks for your patch!
Quoted 18 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +12
-0@@ -1416,6 +1416,64 @@ static const unsigned int qspi1_data4_mu QSPI1_IO2_MARK, QSPI1_IO3_MARK }; +/* - RPC -------------------------------------------------------------------- */ +static const unsigned int rpc_clk1_pins[] = { +/* Octal-SPI flash: C/SCLK */ +RCAR_GP_PIN (5 ,0 ), +}; +static const unsigned int rpc_clk1_mux[] = { +QSPI0_SPCLK_MARK , +}; +static const unsigned int rpc_clk2_pins[] = { +/* HyperFlash: CK, CK# */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,6 ), +};
drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const unsigned int qspi1_data4_mu · line 1440
Quoted 10 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +10
-0+static const unsigned int rpc_clk2_mux[] = { +QSPI0_SPCLK_MARK ,QSPI1_SPCLK_MARK , +}; +static const unsigned int rpc_ctrl_pins[] = { +/* Octal-SPI flash: S#/CS, DQS */ +/* HyperFlash: CS#, RDS */ +RCAR_GP_PIN (5 ,5 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int rpc_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK ,
Shouldn't the above read
QSPI0_SSL_MARK, QSPI1_SSL_MARK,
?
I seem to have overlooked the same issue in commit aa2165cf2ece9176 ("pinctrl: sh-pfc: r8a77980: Add RPC pins, groups, and functions") in sh-pfc-for-v5.9, which I can fix myself.
With the above sorted out:
and will queue in sh-pfc-for-v5.9 after fixing.
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
Re: [PATCH] pinctrl: sh-pfc: r8a77970: add RPC pins, groups, and functions
Quoted 43 lines · Geert Uytterhoeven
Quoted 9 lines
From: Sergei Shtylyov <[email protected]>
Subject: pinctrl: sh-pfc: r8a77970: Add RPC pins, groups, and functionsAdd the RPC pins/groups/functions to the R8A77970 PFC driver. They can be used if an Octal-SPI flash or HyperFlash is connected.
Based on the patch by Dmitry Shifrin <[email protected]>.
Signed-off-by Sergei Shtylyov <[email protected]>Thanks for your patch!
Quoted 18 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +12
-0@@ -1416,6 +1416,64 @@ static const unsigned int qspi1_data4_mu QSPI1_IO2_MARK, QSPI1_IO3_MARK }; +/* - RPC -------------------------------------------------------------------- */ +static const unsigned int rpc_clk1_pins[] = { +/* Octal-SPI flash: C/SCLK */ +RCAR_GP_PIN (5 ,0 ), +}; +static const unsigned int rpc_clk1_mux[] = { +QSPI0_SPCLK_MARK , +}; +static const unsigned int rpc_clk2_pins[] = { +/* HyperFlash: CK, CK# */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,6 ), +};drivers/pinctrl/sh-pfc/pfc-r8a77970.c static const unsigned int qspi1_data4_mu · line 1440
Quoted 10 lines
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +10
-0+static const unsigned int rpc_clk2_mux[] = { +QSPI0_SPCLK_MARK ,QSPI1_SPCLK_MARK , +}; +static const unsigned int rpc_ctrl_pins[] = { +/* Octal-SPI flash: S#/CS, DQS */ +/* HyperFlash: CS#, RDS */ +RCAR_GP_PIN (5 ,5 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int rpc_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK ,Shouldn't the above read
Quoted 3 lines
QSPI0_SSL_MARK, QSPI1_SSL_MARK,?
Indeed! Stupid copy&paste error... :-(
Quoted 7 lines
I seem to have overlooked the same issue in commit
aa2165cf2ece9176("pinctrl: sh-pfc: r8a77980: Add RPC pins, groups, and functions") in sh-pfc-for-v5.9, which I can fix myself.With the above sorted out:
Reviewed-by Geert Uytterhoeven <[email protected]>and will queue in sh-pfc-for-v5.9 after fixing.
So I do need to repost? OK...
Quoted 3 lines
Gr{oetje,eeting}s,
Geert
MBR, Sergei
PATCH 1/1 pinctrl: sh-pfc: r8a77970: add RPC pins, groups, and functions
In reply to Sergei ShtylyovAdd the RPC pins/groups/functions to the R8A77970 PFC driver. They can be used if an Octal-SPI flash or HyperFlash is connected.
Based on the patch by Dmitry Shifrin <[email protected]>.
---
The patch is against the 'sh-pfc' branch of Geert's 'renesas-drivers.git' repo.
Changes in version 2:
- fixed up the initializer for rpc_ctrl_mux[];
- added Geert's tag.
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
drivers/pinctrl/sh-pfc/pfc-r8a77970.c +76 -0
@@ -1416,6 +1416,64 @@ static const unsigned int qspi1_data4_muQSPI1_IO2_MARK ,QSPI1_IO3_MARK }; +/* - RPC -------------------------------------------------------------------- */ +static const unsigned int rpc_clk1_pins[] = { +/* Octal-SPI flash: C/SCLK */ +RCAR_GP_PIN (5 ,0 ), +}; +static const unsigned int rpc_clk1_mux[] = { +QSPI0_SPCLK_MARK , +}; +static const unsigned int rpc_clk2_pins[] = { +/* HyperFlash: CK, CK# */ +RCAR_GP_PIN (5 ,0 ),RCAR_GP_PIN (5 ,6 ), +}; +static const unsigned int rpc_clk2_mux[] = { +QSPI0_SPCLK_MARK ,QSPI1_SPCLK_MARK , +}; +static const unsigned int rpc_ctrl_pins[] = { +/* Octal-SPI flash: S#/CS, DQS */ +/* HyperFlash: CS#, RDS */ +RCAR_GP_PIN (5 ,5 ),RCAR_GP_PIN (5 ,11 ), +}; +static const unsigned int rpc_ctrl_mux[] = { +QSPI0_SSL_MARK ,QSPI1_SSL_MARK , +}; +static const unsigned int rpc_data_pins[] = { +/* DQ[0:7] */ +RCAR_GP_PIN (5 ,1 ),RCAR_GP_PIN (5 ,2 ), +RCAR_GP_PIN (5 ,3 ),RCAR_GP_PIN (5 ,4 ), +RCAR_GP_PIN (5 ,7 ),RCAR_GP_PIN (5 ,8 ), +RCAR_GP_PIN (5 ,9 ),RCAR_GP_PIN (5 ,10 ), +}; +static const unsigned int rpc_data_mux[] = { +QSPI0_MOSI_IO0_MARK ,QSPI0_MISO_IO1_MARK , +QSPI0_IO2_MARK ,QSPI0_IO3_MARK , +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +QSPI1_IO2_MARK ,QSPI1_IO3_MARK , +}; +static const unsigned int rpc_reset_pins[] = { +/* RPC_RESET# */ +RCAR_GP_PIN (5 ,12 ), +}; +static const unsigned int rpc_reset_mux[] = { +RPC_RESET_N_MARK , +}; +static const unsigned int rpc_int_pins[] = { +/* RPC_INT# */ +RCAR_GP_PIN (5 ,14 ), +}; +static const unsigned int rpc_int_mux[] = { +RPC_INT_N_MARK , +}; +static const unsigned int rpc_wp_pins[] = { +/* RPC_WP# */ +RCAR_GP_PIN (5 ,13 ), +}; +static const unsigned int rpc_wp_mux[] = { +RPC_WP_N_MARK , +}; +/* - SCIF Clock ------------------------------------------------------------- */ static const unsigned int scif_clk_a_pins[] = { /* SCIF_CLK */
@@ -1750,6 +1808,13 @@ static const struct sh_pfc_pin_group pinSH_PFC_PIN_GROUP (qspi1_ctrl),SH_PFC_PIN_GROUP (qspi1_data2),SH_PFC_PIN_GROUP (qspi1_data4), +SH_PFC_PIN_GROUP (rpc_clk1), +SH_PFC_PIN_GROUP (rpc_clk2), +SH_PFC_PIN_GROUP (rpc_ctrl), +SH_PFC_PIN_GROUP (rpc_data), +SH_PFC_PIN_GROUP (rpc_reset), +SH_PFC_PIN_GROUP (rpc_int), +SH_PFC_PIN_GROUP (rpc_wp),SH_PFC_PIN_GROUP (scif_clk_a),SH_PFC_PIN_GROUP (scif_clk_b), SH_PFC_PIN_GROUP(scif0_data),
@@ -1954,6 +2019,16 @@ static const char * const qspi1_groups[] "qspi1_data4", }; +static const char *const rpc_groups[] = { +"rpc_clk1" , +"rpc_clk2" , +"rpc_ctrl" , +"rpc_data" , +"rpc_reset" , +"rpc_int" , +"rpc_wp" , +}; +static const char *const scif_clk_groups[] = {"scif_clk_a" ,"scif_clk_b" ,
@@ -2039,6 +2114,7 @@ static const struct sh_pfc_function pinmSH_PFC_FUNCTION (pwm4),SH_PFC_FUNCTION (qspi0),SH_PFC_FUNCTION (qspi1), +SH_PFC_FUNCTION (rpc),SH_PFC_FUNCTION (scif_clk),SH_PFC_FUNCTION (scif0), SH_PFC_FUNCTION(scif1),