pinctrl: renesas: Add support for R-Car V4M
Subsystems (4)
Geert Uytterhoeven
maintainercover pinctrl: renesas: Add support for R-Car V4M
Hi all,
This patch series adds pin control support for the R-Car V4M (R8A779H0) SoC.
Some, but not all, of this has been tested on the Gray Hawk Single development board.
There are also a few unresolved questions:
- According to the documentation, using I2C requires setting
SEL_S{CL,DA}[0-3]_1 instead of SEL_S{CL,DA}[0-3]_0 in the MOD_SEL
register. However, I2C works regardless of this setting, just like
on R-Car V4H (see commit 42cbd16e7c547499 ("pinctrl: renesas:
r8a779g0: Fixup MODSEL8")), - Using i2c-gpio instead of i2c-rcar for I2C0 does not work, even when using a similar scheme like on R-Car S4 and V3U (see e.g. commit 8bdd369dba7ff2f8 ("pinctrl: renesas: r8a779f0: Fix GPIO function on I2C-capable pins").
For testing, I have updated [1] accordingly.
Thanks for your comments!
Cong Dang (13):
pinctrl: renesas: Initial R8A779H0 (R-Car V4M) PFC support
pinctrl: renesas: r8a779h0: Add Ethernet AVB pins, groups, functions
pinctrl: renesas: r8a779h0: Add SD/MMC pins, groups, functions
pinctrl: renesas: r8a779h0: Add QSPI pins, groups, functions
pinctrl: renesas: r8a779h0: Add SCIF pins, groups, functions
pinctrl: renesas: r8a779h0: Add SCIF_CLK pins, groups, functions
pinctrl: renesas: r8a779h0: Add HSCIF pins, groups, functions
pinctrl: renesas: r8a779h0: Add I2C pins, groups, functions
pinctrl: renesas: r8a779h0: Add MSIOF pins, groups, functions
pinctrl: renesas: r8a779h0: Add PWM/TPU pins, groups, functions
pinctrl: renesas: r8a779h0: Add CANFD pins, groups, functions
pinctrl: renesas: r8a779h0: Add PCIe pins, groups, functions
pinctrl: renesas: r8a779h0: Add Audio pins, groups, functions
Geert Uytterhoeven (1):
dt-bindings: pinctrl: renesas,pfc: Document R-Car V4M support
.../bindings/pinctrl/renesas,pfc.yaml | 1 + drivers/pinctrl/renesas/Kconfig | 5 + drivers/pinctrl/renesas/Makefile | 1 + drivers/pinctrl/renesas/core.c | 6 + drivers/pinctrl/renesas/pfc-r8a779h0.c | 3967 +++++++++++++++++ drivers/pinctrl/renesas/sh_pfc.h | 1 + 6 files changed, 3981 insertions(+) create mode 100644 drivers/pinctrl/renesas/pfc-r8a779h0.c
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/14 dt-bindings: pinctrl: renesas,pfc: Document R-Car V4M support
Document support for the Pin Function Controller (PFC) in the Renesas R-Car V4M (R8A779H0) SoC.
--- Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml +1 -0
@@ -46,6 +46,7 @@ properties: - renesas,pfc-r8a779a0 # R-Car V3U - renesas,pfc-r8a779f0 # R-Car S4-8 - renesas,pfc-r8a779g0 # R-Car V4H + - renesas,pfc-r8a779h0 # R-Car V4M - renesas,pfc-sh73a0 # SH-Mobile AG5 reg:
Signature · 1 line
2.34.1
Re: [PATCH 01/14] dt-bindings: pinctrl: renesas,pfc: Document R-Car V4M support
Quoted 4 lines · Geert Uytterhoeven
Document support for the Pin Function Controller (PFC) in the Renesas R-Car V4M (R8A779H0) SoC.
Signed-off-by Geert Uytterhoeven <[email protected]>
Cheers,
Conor.
Quoted 19 lines
--- Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml +1
-0@@ -46,6 +46,7 @@ properties: - renesas,pfc-r8a779a0 # R-Car V3U - renesas,pfc-r8a779f0 # R-Car S4-8 - renesas,pfc-r8a779g0 # R-Car V4H + - renesas,pfc-r8a779h0 # R-Car V4M - renesas,pfc-sh73a0 # SH-Mobile AG5 reg:Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 2/14 pinctrl: renesas: Initial R8A779H0 (R-Car V4M) PFC support
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add initial pin control support for the R-Car V4M (R8A779H0) SoC, including bias, drive strength and voltage control.
---
Changes compared to the BSP:
- Combine multiple commits,
- s/R8A779A0/R8A779H0/,
- s/Copyright (C) 2021/Copyright (C) 2023/,
- Use TABs instead of spaces for alignment in Makefile,
- Fix issues flagged by sh_pfc checker (CONFIG_DEBUG_PINCTRL=y):
- Remove non-existent GP2_16 and GP2_18,
- s/IP2SR4_27_24/IP2SR4_23_20/ in GPSR4_21 definition,
- Remove empty IP2SR2_* and IP2SR4_* definitions,
- Fix GPSR2/IP3SR1/IP3SR4/IP2SR5 variable-width description,
- Use more variable-width reserved field descriptions,
- s/IP2SR3/IP3SR3/ in IP3SR3 config register description,
- Fix TCLK4/TCLK3 in DRV3CTRL3 config register description,
- Fix GP1_23-28 and GP4_13 POC descriptions.
- Remove unneeded TABs in macros to reduce line width,
- Change IP1SR5 to IP2SR5 in comment,
- Change FXR_TXENA_N_A to FXR_TXENA_N_B,
- Add missing "_A" suffix to FXR_TXEN[AB]_N,
- Add missing PINMUX_IPSR_GPSR() for ERROROUTC_N_A, TX4, and RX4,
- Add missing Ether_GPTP_PPS1.
--- drivers/pinctrl/renesas/Kconfig | 5 + drivers/pinctrl/renesas/Makefile | 1 + drivers/pinctrl/renesas/core.c | 6 + drivers/pinctrl/renesas/pfc-r8a779h0.c | 2321 ++++++++++++++++++++++++ drivers/pinctrl/renesas/sh_pfc.h | 1 + 5 files changed, 2334 insertions(+) create mode 100644 drivers/pinctrl/renesas/pfc-r8a779h0.c
drivers/pinctrl/renesas/Kconfig +5 -0
@@ -38,6 +38,7 @@ config PINCTRL_RENESAS select PINCTRL_PFC_R8A779A0 if ARCH_R8A779A0 select PINCTRL_PFC_R8A779F0 if ARCH_R8A779F0 select PINCTRL_PFC_R8A779G0 if ARCH_R8A779G0 + select PINCTRL_PFC_R8A779H0 if ARCH_R8A779H0 select PINCTRL_RZG2L if ARCH_RZG2L select PINCTRL_RZV2M if ARCH_R9A09G011 select PINCTRL_PFC_SH7203 if CPU_SUBTYPE_SH7203
@@ -154,6 +155,10 @@ config PINCTRL_PFC_R8A779G0 bool "pin control support for R-Car V4H" if COMPILE_TEST select PINCTRL_SH_PFC +config PINCTRL_PFC_R8A779H0 + bool "pin control support for R-Car V4M" if COMPILE_TEST + select PINCTRL_SH_PFC + config PINCTRL_PFC_R8A7740 bool "pin control support for R-Mobile A1" if COMPILE_TEST select PINCTRL_SH_PFC_GPIO
drivers/pinctrl/renesas/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A77995) += pfc-r8a77995.o obj-$(CONFIG_PINCTRL_PFC_R8A779A0) += pfc-r8a779a0.o obj-$(CONFIG_PINCTRL_PFC_R8A779F0) += pfc-r8a779f0.o obj-$(CONFIG_PINCTRL_PFC_R8A779G0) += pfc-r8a779g0.o +obj-$(CONFIG_PINCTRL_PFC_R8A779H0) += pfc-r8a779h0.o obj-$(CONFIG_PINCTRL_PFC_SH7203) += pfc-sh7203.o obj-$(CONFIG_PINCTRL_PFC_SH7264) += pfc-sh7264.o obj-$(CONFIG_PINCTRL_PFC_SH7269) += pfc-sh7269.o
drivers/pinctrl/renesas/core.c +6 -0
@@ -638,6 +638,12 @@ static const struct of_device_id sh_pfc_of_table[] = { .data = &r8a779g0_pinmux_info, },#endif +#ifdef CONFIG_PINCTRL_PFC_R8A779H0 + { + .compatible = "renesas,pfc-r8a779h0", + .data = &r8a779h0_pinmux_info, + }, +#endif #ifdef CONFIG_PINCTRL_PFC_SH73A0 { .compatible = "renesas,pfc-sh73a0",
drivers/pinctrl/renesas/pfc-r8a779h0.c new file +2321 -0
2,321 lines not on this page · raw message
drivers/pinctrl/renesas/sh_pfc.h +1 -0
@@ -322,6 +322,7 @@ extern const struct sh_pfc_soc_info r8a77995_pinmux_info;extern const struct sh_pfc_soc_info r8a779a0_pinmux_info;extern const struct sh_pfc_soc_info r8a779f0_pinmux_info;extern const struct sh_pfc_soc_info r8a779g0_pinmux_info; +extern const struct sh_pfc_soc_info r8a779h0_pinmux_info;extern const struct sh_pfc_soc_info sh7203_pinmux_info;extern const struct sh_pfc_soc_info sh7264_pinmux_info;extern const struct sh_pfc_soc_info sh7269_pinmux_info;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 3/14 pinctrl: renesas: r8a779h0: Add Ethernet AVB pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for Ethernet AVB on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 302 ++++++++++++++++++++++++- 1 file changed, 301 insertions(+), 1 deletion(-)
drivers/pinctrl/renesas/pfc-r8a779h0.c +301 -1
@@ -1191,12 +1191,312 @@ static const struct sh_pfc_pin pinmux_pins[] = { PINMUX_NOGP_ALL(), }; +/* - AVB0 ------------------------------------------------ */ +static const unsigned int avb0_link_pins[] = { +/* AVB0_LINK */ +RCAR_GP_PIN (7 ,4 ), +}; +static const unsigned int avb0_link_mux[] = { +AVB0_LINK_MARK , +}; +static const unsigned int avb0_magic_pins[] = { +/* AVB0_MAGIC */ +RCAR_GP_PIN (7 ,10 ), +}; +static const unsigned int avb0_magic_mux[] = { +AVB0_MAGIC_MARK , +}; +static const unsigned int avb0_phy_int_pins[] = { +/* AVB0_PHY_INT */ +RCAR_GP_PIN (7 ,5 ), +}; +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 (7 ,13 ),RCAR_GP_PIN (7 ,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 (7 ,16 ),RCAR_GP_PIN (7 ,15 ), +RCAR_GP_PIN (7 ,11 ),RCAR_GP_PIN (7 ,7 ), +RCAR_GP_PIN (7 ,6 ),RCAR_GP_PIN (7 ,3 ), +RCAR_GP_PIN (7 ,20 ),RCAR_GP_PIN (7 ,19 ), +RCAR_GP_PIN (7 ,18 ),RCAR_GP_PIN (7 ,17 ), +RCAR_GP_PIN (7 ,12 ),RCAR_GP_PIN (7 ,8 ), +}; +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 (7 ,9 ), +}; +static const unsigned int avb0_txcrefclk_mux[] = { +AVB0_TXCREFCLK_MARK , +}; +static const unsigned int avb0_avtp_pps_pins[] = { +/* AVB0_AVTP_PPS */ +RCAR_GP_PIN (7 ,0 ), +}; +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 (7 ,1 ), +}; +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 (7 ,2 ), +}; +static const unsigned int avb0_avtp_match_mux[] = { +AVB0_AVTP_MATCH_MARK , +}; + +/* - AVB1 ------------------------------------------------ */ +static const unsigned int avb1_link_pins[] = { +/* AVB1_LINK */ +RCAR_GP_PIN (6 ,4 ), +}; +static const unsigned int avb1_link_mux[] = { +AVB1_LINK_MARK , +}; +static const unsigned int avb1_magic_pins[] = { +/* AVB1_MAGIC */ +RCAR_GP_PIN (6 ,1 ), +}; +static const unsigned int avb1_magic_mux[] = { +AVB1_MAGIC_MARK , +}; +static const unsigned int avb1_phy_int_pins[] = { +/* AVB1_PHY_INT */ +RCAR_GP_PIN (6 ,3 ), +}; +static const unsigned int avb1_phy_int_mux[] = { +AVB1_PHY_INT_MARK , +}; +static const unsigned int avb1_mdio_pins[] = { +/* AVB1_MDC, AVB1_MDIO */ +RCAR_GP_PIN (6 ,2 ),RCAR_GP_PIN (6 ,0 ), +}; +static const unsigned int avb1_mdio_mux[] = { +AVB1_MDC_MARK ,AVB1_MDIO_MARK , +}; +static const unsigned int avb1_rgmii_pins[] = { +/* +* AVB1_TX_CTL, AVB1_TXC, AVB1_TD0, AVB1_TD1, AVB1_TD2, AVB1_TD3, +* AVB1_RX_CTL, AVB1_RXC, AVB1_RD0, AVB1_RD1, AVB1_RD2, AVB1_RD3, +*/ +RCAR_GP_PIN (6 ,7 ),RCAR_GP_PIN (6 ,6 ), +RCAR_GP_PIN (6 ,13 ),RCAR_GP_PIN (6 ,12 ), +RCAR_GP_PIN (6 ,16 ),RCAR_GP_PIN (6 ,18 ), +RCAR_GP_PIN (6 ,9 ),RCAR_GP_PIN (6 ,8 ), +RCAR_GP_PIN (6 ,15 ),RCAR_GP_PIN (6 ,14 ), +RCAR_GP_PIN (6 ,17 ),RCAR_GP_PIN (6 ,19 ), +}; +static const unsigned int avb1_rgmii_mux[] = { +AVB1_TX_CTL_MARK ,AVB1_TXC_MARK , +AVB1_TD0_MARK ,AVB1_TD1_MARK , +AVB1_TD2_MARK ,AVB1_TD3_MARK , +AVB1_RX_CTL_MARK ,AVB1_RXC_MARK , +AVB1_RD0_MARK ,AVB1_RD1_MARK , +AVB1_RD2_MARK ,AVB1_RD3_MARK , +}; +static const unsigned int avb1_txcrefclk_pins[] = { +/* AVB1_TXCREFCLK */ +RCAR_GP_PIN (6 ,20 ), +}; +static const unsigned int avb1_txcrefclk_mux[] = { +AVB1_TXCREFCLK_MARK , +}; +static const unsigned int avb1_avtp_pps_pins[] = { +/* AVB1_AVTP_PPS */ +RCAR_GP_PIN (6 ,10 ), +}; +static const unsigned int avb1_avtp_pps_mux[] = { +AVB1_AVTP_PPS_MARK , +}; +static const unsigned int avb1_avtp_capture_pins[] = { +/* AVB1_AVTP_CAPTURE */ +RCAR_GP_PIN (6 ,11 ), +}; +static const unsigned int avb1_avtp_capture_mux[] = { +AVB1_AVTP_CAPTURE_MARK , +}; +static const unsigned int avb1_avtp_match_pins[] = { +/* AVB1_AVTP_MATCH */ +RCAR_GP_PIN (6 ,5 ), +}; +static const unsigned int avb1_avtp_match_mux[] = { +AVB1_AVTP_MATCH_MARK , +}; + +/* - AVB2 ------------------------------------------------ */ +static const unsigned int avb2_link_pins[] = { +/* AVB2_LINK */ +RCAR_GP_PIN (5 ,3 ), +}; +static const unsigned int avb2_link_mux[] = { +AVB2_LINK_MARK , +}; +static const unsigned int avb2_magic_pins[] = { +/* AVB2_MAGIC */ +RCAR_GP_PIN (5 ,5 ), +}; +static const unsigned int avb2_magic_mux[] = { +AVB2_MAGIC_MARK , +}; +static const unsigned int avb2_phy_int_pins[] = { +/* AVB2_PHY_INT */ +RCAR_GP_PIN (5 ,4 ), +}; +static const unsigned int avb2_phy_int_mux[] = { +AVB2_PHY_INT_MARK , +}; +static const unsigned int avb2_mdio_pins[] = { +/* AVB2_MDC, AVB2_MDIO */ +RCAR_GP_PIN (5 ,6 ),RCAR_GP_PIN (5 ,10 ), +}; +static const unsigned int avb2_mdio_mux[] = { +AVB2_MDC_MARK ,AVB2_MDIO_MARK , +}; +static const unsigned int avb2_rgmii_pins[] = { +/* +* AVB2_TX_CTL, AVB2_TXC, AVB2_TD0, AVB2_TD1, AVB2_TD2, AVB2_TD3, +* AVB2_RX_CTL, AVB2_RXC, AVB2_RD0, AVB2_RD1, AVB2_RD2, AVB2_RD3, +*/ +RCAR_GP_PIN (5 ,19 ),RCAR_GP_PIN (5 ,16 ), +RCAR_GP_PIN (5 ,15 ),RCAR_GP_PIN (5 ,12 ), +RCAR_GP_PIN (5 ,11 ),RCAR_GP_PIN (5 ,8 ), +RCAR_GP_PIN (5 ,20 ),RCAR_GP_PIN (5 ,18 ), +RCAR_GP_PIN (5 ,17 ),RCAR_GP_PIN (5 ,14 ), +RCAR_GP_PIN (5 ,13 ),RCAR_GP_PIN (5 ,9 ), +}; +static const unsigned int avb2_rgmii_mux[] = { +AVB2_TX_CTL_MARK ,AVB2_TXC_MARK , +AVB2_TD0_MARK ,AVB2_TD1_MARK , +AVB2_TD2_MARK ,AVB2_TD3_MARK , +AVB2_RX_CTL_MARK ,AVB2_RXC_MARK , +AVB2_RD0_MARK ,AVB2_RD1_MARK , +AVB2_RD2_MARK ,AVB2_RD3_MARK , +}; +static const unsigned int avb2_txcrefclk_pins[] = { +/* AVB2_TXCREFCLK */ +RCAR_GP_PIN (5 ,7 ), +}; +static const unsigned int avb2_txcrefclk_mux[] = { +AVB2_TXCREFCLK_MARK , +}; +static const unsigned int avb2_avtp_pps_pins[] = { +/* AVB2_AVTP_PPS */ +RCAR_GP_PIN (5 ,0 ), +}; +static const unsigned int avb2_avtp_pps_mux[] = { +AVB2_AVTP_PPS_MARK , +}; +static const unsigned int avb2_avtp_capture_pins[] = { +/* AVB2_AVTP_CAPTURE */ +RCAR_GP_PIN (5 ,1 ), +}; +static const unsigned int avb2_avtp_capture_mux[] = { +AVB2_AVTP_CAPTURE_MARK , +}; +static const unsigned int avb2_avtp_match_pins[] = { +/* AVB2_AVTP_MATCH */ +RCAR_GP_PIN (5 ,2 ), +}; +static const unsigned int avb2_avtp_match_mux[] = { +AVB2_AVTP_MATCH_MARK , +}; +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 (avb1_link), +SH_PFC_PIN_GROUP (avb1_magic), +SH_PFC_PIN_GROUP (avb1_phy_int), +SH_PFC_PIN_GROUP (avb1_mdio), +SH_PFC_PIN_GROUP (avb1_rgmii), +SH_PFC_PIN_GROUP (avb1_txcrefclk), +SH_PFC_PIN_GROUP (avb1_avtp_pps), +SH_PFC_PIN_GROUP (avb1_avtp_capture), +SH_PFC_PIN_GROUP (avb1_avtp_match), + +SH_PFC_PIN_GROUP (avb2_link), +SH_PFC_PIN_GROUP (avb2_magic), +SH_PFC_PIN_GROUP (avb2_phy_int), +SH_PFC_PIN_GROUP (avb2_mdio), +SH_PFC_PIN_GROUP (avb2_rgmii), +SH_PFC_PIN_GROUP (avb2_txcrefclk), +SH_PFC_PIN_GROUP (avb2_avtp_pps), +SH_PFC_PIN_GROUP (avb2_avtp_capture), +SH_PFC_PIN_GROUP (avb2_avtp_match), +}; +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 struct sh_pfc_function pinmux_functions[] = { +static const char *const avb1_groups[] = { +"avb1_link" , +"avb1_magic" , +"avb1_phy_int" , +"avb1_mdio" , +"avb1_rgmii" , +"avb1_txcrefclk" , +"avb1_avtp_pps" , +"avb1_avtp_capture" , +"avb1_avtp_match" , +}; +static const char *const avb2_groups[] = { +"avb2_link" , +"avb2_magic" , +"avb2_phy_int" , +"avb2_mdio" , +"avb2_rgmii" , +"avb2_txcrefclk" , +"avb2_avtp_pps" , +"avb2_avtp_capture" , +"avb2_avtp_match" , +}; + +static const struct sh_pfc_function pinmux_functions[] = { +SH_PFC_FUNCTION (avb0), +SH_PFC_FUNCTION (avb1), +SH_PFC_FUNCTION (avb2), };static const struct pinmux_cfg_reg pinmux_config_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 4/14 pinctrl: renesas: r8a779h0: Add SD/MMC pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the SD Card/MMC Interface on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +63 -0
@@ -1425,6 +1425,49 @@ static const unsigned int avb2_avtp_match_mux[] = { AVB2_AVTP_MATCH_MARK, }; +/* - MMC -------------------------------------------------------------------- */ +static const unsigned int mmc_data_pins[] = { +/* MMC_SD_D[0:3], MMC_D[4:7] */ +RCAR_GP_PIN (3 ,1 ),RCAR_GP_PIN (3 ,0 ), +RCAR_GP_PIN (3 ,2 ),RCAR_GP_PIN (3 ,5 ), +RCAR_GP_PIN (3 ,7 ),RCAR_GP_PIN (3 ,6 ), +RCAR_GP_PIN (3 ,9 ),RCAR_GP_PIN (3 ,8 ), +}; +static const unsigned int mmc_data_mux[] = { +MMC_SD_D0_MARK ,MMC_SD_D1_MARK , +MMC_SD_D2_MARK ,MMC_SD_D3_MARK , +MMC_D4_MARK ,MMC_D5_MARK , +MMC_D6_MARK ,MMC_D7_MARK , +}; +static const unsigned int mmc_ctrl_pins[] = { +/* MMC_SD_CLK, MMC_SD_CMD */ +RCAR_GP_PIN (3 ,3 ),RCAR_GP_PIN (3 ,10 ), +}; +static const unsigned int mmc_ctrl_mux[] = { +MMC_SD_CLK_MARK ,MMC_SD_CMD_MARK , +}; +static const unsigned int mmc_cd_pins[] = { +/* SD_CD */ +RCAR_GP_PIN (3 ,11 ), +}; +static const unsigned int mmc_cd_mux[] = { +SD_CD_MARK , +}; +static const unsigned int mmc_wp_pins[] = { +/* SD_WP */ +RCAR_GP_PIN (3 ,12 ), +}; +static const unsigned int mmc_wp_mux[] = { +SD_WP_MARK , +}; +static const unsigned int mmc_ds_pins[] = { +/* MMC_DS */ +RCAR_GP_PIN (3 ,4 ), +}; +static const unsigned int mmc_ds_mux[] = { +MMC_DS_MARK , +}; +static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb0_link),SH_PFC_PIN_GROUP (avb0_magic),
@@ -1455,6 +1498,14 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb2_avtp_pps),SH_PFC_PIN_GROUP (avb2_avtp_capture),SH_PFC_PIN_GROUP (avb2_avtp_match), + +BUS_DATA_PIN_GROUP (mmc_data,1 ), +BUS_DATA_PIN_GROUP (mmc_data,4 ), +BUS_DATA_PIN_GROUP (mmc_data,8 ), +SH_PFC_PIN_GROUP (mmc_ctrl), +SH_PFC_PIN_GROUP (mmc_cd), +SH_PFC_PIN_GROUP (mmc_wp), + SH_PFC_PIN_GROUP(mmc_ds), }; static const char * const avb0_groups[] = {
@@ -1493,10 +1544,22 @@ static const char * const avb2_groups[] = { "avb2_avtp_match", }; +static const char *const mmc_groups[] = { +"mmc_data1" , +"mmc_data4" , +"mmc_data8" , +"mmc_ctrl" , +"mmc_cd" , +"mmc_wp" , +"mmc_ds" , +}; +static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (avb1),SH_PFC_FUNCTION (avb2), + +SH_PFC_FUNCTION (mmc), };static const struct pinmux_cfg_reg pinmux_config_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 5/14 pinctrl: renesas: r8a779h0: Add QSPI pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the QSPI functionality proviced by the SPI Multi I/O Bus Controller (RPC-IF) on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 58 ++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +58 -0
@@ -1468,6 +1468,42 @@ static const unsigned int mmc_ds_mux[] = { MMC_DS_MARK, }; +/* - QSPI0 ------------------------------------------------------------------ */ +static const unsigned int qspi0_ctrl_pins[] = { +/* SPCLK, SSL */ +RCAR_GP_PIN (3 ,20 ),RCAR_GP_PIN (3 ,15 ), +}; +static const unsigned int qspi0_ctrl_mux[] = { +QSPI0_SPCLK_MARK ,QSPI0_SSL_MARK , +}; +static const unsigned int qspi0_data_pins[] = { +/* MOSI_IO0, MISO_IO1, IO2, IO3 */ +RCAR_GP_PIN (3 ,19 ),RCAR_GP_PIN (3 ,18 ), +RCAR_GP_PIN (3 ,17 ),RCAR_GP_PIN (3 ,16 ), +}; +static const unsigned int qspi0_data_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 (3 ,22 ),RCAR_GP_PIN (3 ,25 ), +}; +static const unsigned int qspi1_ctrl_mux[] = { +QSPI1_SPCLK_MARK ,QSPI1_SSL_MARK , +}; +static const unsigned int qspi1_data_pins[] = { +/* MOSI_IO0, MISO_IO1, IO2, IO3 */ +RCAR_GP_PIN (3 ,21 ),RCAR_GP_PIN (3 ,23 ), +RCAR_GP_PIN (3 ,24 ),RCAR_GP_PIN (3 ,26 ), +}; +static const unsigned int qspi1_data_mux[] = { +QSPI1_MOSI_IO0_MARK ,QSPI1_MISO_IO1_MARK , +QSPI1_IO2_MARK ,QSPI1_IO3_MARK +}; +static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb0_link),SH_PFC_PIN_GROUP (avb0_magic),
@@ -1506,6 +1542,13 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (mmc_cd),SH_PFC_PIN_GROUP (mmc_wp),SH_PFC_PIN_GROUP (mmc_ds), + +SH_PFC_PIN_GROUP (qspi0_ctrl), +BUS_DATA_PIN_GROUP (qspi0_data,2 ), +BUS_DATA_PIN_GROUP (qspi0_data,4 ), +SH_PFC_PIN_GROUP (qspi1_ctrl), +BUS_DATA_PIN_GROUP (qspi1_data,2 ), + BUS_DATA_PIN_GROUP(qspi1_data, 4), }; static const char * const avb0_groups[] = {
@@ -1554,12 +1597,27 @@ static const char * const mmc_groups[] = { "mmc_ds", }; +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 struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (avb1),SH_PFC_FUNCTION (avb2),SH_PFC_FUNCTION (mmc), + +SH_PFC_FUNCTION (qspi0), +SH_PFC_FUNCTION (qspi1), };static const struct pinmux_cfg_reg pinmux_config_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 6/14 pinctrl: renesas: r8a779h0: Add SCIF pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the Serial Communication Interfaces with FIFO (SCIF) on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 192 +++++++++++++++++++++++++ 1 file changed, 192 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +192 -0
@@ -1504,6 +1504,144 @@ static const unsigned int qspi1_data_mux[] = {QSPI1_IO2_MARK ,QSPI1_IO3_MARK }; +/* - SCIF0 ------------------------------------------------------------------ */ +static const unsigned int scif0_data_pins[] = { +/* RX0, TX0 */ +RCAR_GP_PIN (1 ,16 ),RCAR_GP_PIN (1 ,12 ), +}; +static const unsigned int scif0_data_mux[] = { +RX0_MARK ,TX0_MARK , +}; +static const unsigned int scif0_clk_pins[] = { +/* SCK0 */ +RCAR_GP_PIN (1 ,15 ), +}; +static const unsigned int scif0_clk_mux[] = { +SCK0_MARK , +}; +static const unsigned int scif0_ctrl_pins[] = { +/* RTS0_N, CTS0_N */ +RCAR_GP_PIN (1 ,14 ),RCAR_GP_PIN (1 ,13 ), +}; +static const unsigned int scif0_ctrl_mux[] = { +RTS0_N_MARK ,CTS0_N_MARK , +}; + +/* - SCIF1_A ------------------------------------------------------------------ */ +static const unsigned int scif1_data_a_pins[] = { +/* RX1_A, TX1_A */ +RCAR_GP_PIN (0 ,15 ),RCAR_GP_PIN (0 ,14 ), +}; +static const unsigned int scif1_data_a_mux[] = { +RX1_A_MARK ,TX1_A_MARK , +}; +static const unsigned int scif1_clk_a_pins[] = { +/* SCK1_A */ +RCAR_GP_PIN (0 ,18 ), +}; +static const unsigned int scif1_clk_a_mux[] = { +SCK1_A_MARK , +}; +static const unsigned int scif1_ctrl_a_pins[] = { +/* RTS1_N_A, CTS1_N_A */ +RCAR_GP_PIN (0 ,17 ),RCAR_GP_PIN (0 ,16 ), +}; +static const unsigned int scif1_ctrl_a_mux[] = { +RTS1_N_A_MARK ,CTS1_N_A_MARK , +}; + +/* - SCIF1_B ------------------------------------------------------------------ */ +static const unsigned int scif1_data_b_pins[] = { +/* RX1_B, TX1_B */ +RCAR_GP_PIN (1 ,7 ),RCAR_GP_PIN (1 ,6 ), +}; +static const unsigned int scif1_data_b_mux[] = { +RX1_B_MARK ,TX1_B_MARK , +}; +static const unsigned int scif1_clk_b_pins[] = { +/* SCK1_B */ +RCAR_GP_PIN (1 ,10 ), +}; +static const unsigned int scif1_clk_b_mux[] = { +SCK1_B_MARK , +}; +static const unsigned int scif1_ctrl_b_pins[] = { +/* RTS1_N_B, CTS1_N_B */ +RCAR_GP_PIN (1 ,9 ),RCAR_GP_PIN (1 ,8 ), +}; +static const unsigned int scif1_ctrl_b_mux[] = { +RTS1_N_B_MARK ,CTS1_N_B_MARK , +}; + +/* - SCIF3_A ------------------------------------------------------------------ */ +static const unsigned int scif3_data_a_pins[] = { +/* RX3_A, TX3_A */ +RCAR_GP_PIN (1 ,27 ),RCAR_GP_PIN (1 ,28 ), +}; +static const unsigned int scif3_data_a_mux[] = { +RX3_A_MARK ,TX3_A_MARK , +}; +static const unsigned int scif3_clk_a_pins[] = { +/* SCK3_A */ +RCAR_GP_PIN (1 ,24 ), +}; +static const unsigned int scif3_clk_a_mux[] = { +SCK3_A_MARK , +}; +static const unsigned int scif3_ctrl_a_pins[] = { +/* RTS3_N_A, CTS3_N_A */ +RCAR_GP_PIN (1 ,26 ),RCAR_GP_PIN (1 ,25 ), +}; +static const unsigned int scif3_ctrl_a_mux[] = { +RTS3_N_A_MARK ,CTS3_N_A_MARK , +}; + +/* - SCIF3_B ------------------------------------------------------------------ */ +static const unsigned int scif3_data_b_pins[] = { +/* RX3_B, TX3_B */ +RCAR_GP_PIN (1 ,1 ),RCAR_GP_PIN (1 ,0 ), +}; +static const unsigned int scif3_data_b_mux[] = { +RX3_B_MARK ,TX3_B_MARK , +}; +static const unsigned int scif3_clk_b_pins[] = { +/* SCK3_B */ +RCAR_GP_PIN (1 ,4 ), +}; +static const unsigned int scif3_clk_b_mux[] = { +SCK3_B_MARK , +}; +static const unsigned int scif3_ctrl_b_pins[] = { +/* RTS3_N_B, CTS3_N_B */ +RCAR_GP_PIN (1 ,2 ),RCAR_GP_PIN (1 ,3 ), +}; +static const unsigned int scif3_ctrl_b_mux[] = { +RTS3_N_B_MARK ,CTS3_N_B_MARK , +}; + +/* - SCIF4 ------------------------------------------------------------------ */ +static const unsigned int scif4_data_pins[] = { +/* RX4, TX4 */ +RCAR_GP_PIN (4 ,13 ),RCAR_GP_PIN (4 ,12 ), +}; +static const unsigned int scif4_data_mux[] = { +RX4_MARK ,TX4_MARK , +}; +static const unsigned int scif4_clk_pins[] = { +/* SCK4 */ +RCAR_GP_PIN (4 ,8 ), +}; +static const unsigned int scif4_clk_mux[] = { +SCK4_MARK , +}; +static const unsigned int scif4_ctrl_pins[] = { +/* RTS4_N, CTS4_N */ +RCAR_GP_PIN (4 ,10 ),RCAR_GP_PIN (4 ,9 ), +}; +static const unsigned int scif4_ctrl_mux[] = { +RTS4_N_MARK ,CTS4_N_MARK , +}; +static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb0_link), SH_PFC_PIN_GROUP(avb0_magic),
@@ -1549,6 +1687,25 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (qspi1_ctrl),BUS_DATA_PIN_GROUP (qspi1_data,2 ),BUS_DATA_PIN_GROUP (qspi1_data,4 ), + +SH_PFC_PIN_GROUP (scif0_data), +SH_PFC_PIN_GROUP (scif0_clk), +SH_PFC_PIN_GROUP (scif0_ctrl), +SH_PFC_PIN_GROUP (scif1_data_a), +SH_PFC_PIN_GROUP (scif1_clk_a), +SH_PFC_PIN_GROUP (scif1_ctrl_a), +SH_PFC_PIN_GROUP (scif1_data_b), +SH_PFC_PIN_GROUP (scif1_clk_b), +SH_PFC_PIN_GROUP (scif1_ctrl_b), +SH_PFC_PIN_GROUP (scif3_data_a), +SH_PFC_PIN_GROUP (scif3_clk_a), +SH_PFC_PIN_GROUP (scif3_ctrl_a), +SH_PFC_PIN_GROUP (scif3_data_b), +SH_PFC_PIN_GROUP (scif3_clk_b), +SH_PFC_PIN_GROUP (scif3_ctrl_b), +SH_PFC_PIN_GROUP (scif4_data), +SH_PFC_PIN_GROUP (scif4_clk), + SH_PFC_PIN_GROUP(scif4_ctrl), }; static const char * const avb0_groups[] = {
@@ -1609,6 +1766,36 @@ static const char * const qspi1_groups[] = { "qspi1_data4", }; +static const char *const scif0_groups[] = { +"scif0_data" , +"scif0_clk" , +"scif0_ctrl" , +}; + +static const char *const scif1_groups[] = { +"scif1_data_a" , +"scif1_clk_a" , +"scif1_ctrl_a" , +"scif1_data_b" , +"scif1_clk_b" , +"scif1_ctrl_b" , +}; + +static const char *const scif3_groups[] = { +"scif3_data_a" , +"scif3_clk_a" , +"scif3_ctrl_a" , +"scif3_data_b" , +"scif3_clk_b" , +"scif3_ctrl_b" , +}; + +static const char *const scif4_groups[] = { +"scif4_data" , +"scif4_clk" , +"scif4_ctrl" , +}; +static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (avb1),
@@ -1618,6 +1805,11 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (qspi0),SH_PFC_FUNCTION (qspi1 ), + +SH_PFC_FUNCTION (scif0 ), +SH_PFC_FUNCTION (scif1 ), +SH_PFC_FUNCTION (scif3 ), + SH_PFC_FUNCTION(scif4), };static const struct pinmux_cfg_reg pinmux_config_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 7/14 pinctrl: renesas: r8a779h0: Add SCIF_CLK pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the baud rate generation clock pins (SCIF_CLK) on the Renesas R-Car V4M (R8A779H0) SoC.
---
Changes compared to the BSP:
- Split off from HSCIF pins/groups/functions patch,
- Change references to "HSCIF clocks" to "SCIF clocks",
- Move SCIF clocks to preserve alphabetical sort order.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +29 -0
@@ -1642,6 +1642,23 @@ static const unsigned int scif4_ctrl_mux[] = { RTS4_N_MARK, CTS4_N_MARK, }; +/* - SCIF Clock ------------------------------------------------------------- */ +static const unsigned int scif_clk_pins[] = { +/* SCIF_CLK */ +RCAR_GP_PIN (1 ,17 ), +}; +static const unsigned int scif_clk_mux[] = { +SCIF_CLK_MARK , +}; + +static const unsigned int scif_clk2_pins[] = { +/* SCIF_CLK2 */ +RCAR_GP_PIN (4 ,11 ), +}; +static const unsigned int scif_clk2_mux[] = { +SCIF_CLK2_MARK , +}; +static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb0_link),SH_PFC_PIN_GROUP (avb0_magic),
@@ -1706,6 +1723,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (scif4_data),SH_PFC_PIN_GROUP (scif4_clk ),SH_PFC_PIN_GROUP (scif4_ctrl ), +SH_PFC_PIN_GROUP (scif_clk ), + SH_PFC_PIN_GROUP(scif_clk2), };static const char *const avb0_groups[] = {
@@ -1796,6 +1815,14 @@ static const char * const scif4_groups[] = { "scif4_ctrl", }; +static const char *const scif_clk_groups[] = { +"scif_clk" , +}; + +static const char *const scif_clk2_groups[] = { +"scif_clk2" , +}; +static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (avb1),
@@ -1810,6 +1837,8 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (scif1),SH_PFC_FUNCTION (scif3 ),SH_PFC_FUNCTION (scif4 ), +SH_PFC_FUNCTION (scif_clk ), + SH_PFC_FUNCTION(scif_clk2), };static const struct pinmux_cfg_reg pinmux_config_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 8/14 pinctrl: renesas: r8a779h0: Add HSCIF pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the High Speed Serial Communication Interfaces with FIFO (HSCIF) on the Renesas R-Car V4M (R8A779H0) SoC.
---
Changes compared to the BSP:
- Move SCIF_CLK pins/groups/functions into a separate patch.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 192 +++++++++++++++++++++++++ 1 file changed, 192 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +192 -0
@@ -1425,6 +1425,144 @@ static const unsigned int avb2_avtp_match_mux[] = { AVB2_AVTP_MATCH_MARK, }; +/* - HSCIF0 ----------------------------------------------------------------- */ +static const unsigned int hscif0_data_pins[] = { +/* HRX0, HTX0 */ +RCAR_GP_PIN (1 ,16 ),RCAR_GP_PIN (1 ,12 ), +}; +static const unsigned int hscif0_data_mux[] = { +HRX0_MARK ,HTX0_MARK , +}; +static const unsigned int hscif0_clk_pins[] = { +/* HSCK0 */ +RCAR_GP_PIN (1 ,15 ), +}; +static const unsigned int hscif0_clk_mux[] = { +HSCK0_MARK , +}; +static const unsigned int hscif0_ctrl_pins[] = { +/* HRTS0_N, HCTS0_N */ +RCAR_GP_PIN (1 ,14 ),RCAR_GP_PIN (1 ,13 ), +}; +static const unsigned int hscif0_ctrl_mux[] = { +HRTS0_N_MARK ,HCTS0_N_MARK , +}; + +/* - HSCIF1_A ----------------------------------------------------------------- */ +static const unsigned int hscif1_data_a_pins[] = { +/* HRX1_A, HTX1_A */ +RCAR_GP_PIN (0 ,15 ),RCAR_GP_PIN (0 ,14 ), +}; +static const unsigned int hscif1_data_a_mux[] = { +HRX1_A_MARK ,HTX1_A_MARK , +}; +static const unsigned int hscif1_clk_a_pins[] = { +/* HSCK1_A */ +RCAR_GP_PIN (0 ,18 ), +}; +static const unsigned int hscif1_clk_a_mux[] = { +HSCK1_A_MARK , +}; +static const unsigned int hscif1_ctrl_a_pins[] = { +/* HRTS1_N_A, HCTS1_N_A */ +RCAR_GP_PIN (0 ,17 ),RCAR_GP_PIN (0 ,16 ), +}; +static const unsigned int hscif1_ctrl_a_mux[] = { +HRTS1_N_A_MARK ,HCTS1_N_A_MARK , +}; + +/* - HSCIF1_B ---------------------------------------------------------------- */ +static const unsigned int hscif1_data_b_pins[] = { +/* HRX1_B, HTX1_B */ +RCAR_GP_PIN (1 ,7 ),RCAR_GP_PIN (1 ,6 ), +}; +static const unsigned int hscif1_data_b_mux[] = { +HRX1_B_MARK ,HTX1_B_MARK , +}; +static const unsigned int hscif1_clk_b_pins[] = { +/* HSCK1_B */ +RCAR_GP_PIN (1 ,10 ), +}; +static const unsigned int hscif1_clk_b_mux[] = { +HSCK1_B_MARK , +}; +static const unsigned int hscif1_ctrl_b_pins[] = { +/* HRTS1_N_B, HCTS1_N_B */ +RCAR_GP_PIN (1 ,9 ),RCAR_GP_PIN (1 ,8 ), +}; +static const unsigned int hscif1_ctrl_b_mux[] = { +HRTS1_N_B_MARK ,HCTS1_N_B_MARK , +}; + +/* - HSCIF2 ----------------------------------------------------------------- */ +static const unsigned int hscif2_data_pins[] = { +/* HRX2, HTX2 */ +RCAR_GP_PIN (4 ,8 ),RCAR_GP_PIN (4 ,9 ), +}; +static const unsigned int hscif2_data_mux[] = { +HRX2_MARK ,HTX2_MARK , +}; +static const unsigned int hscif2_clk_pins[] = { +/* HSCK2 */ +RCAR_GP_PIN (4 ,13 ), +}; +static const unsigned int hscif2_clk_mux[] = { +HSCK2_MARK , +}; +static const unsigned int hscif2_ctrl_pins[] = { +/* HRTS2_N, HCTS2_N */ +RCAR_GP_PIN (4 ,10 ),RCAR_GP_PIN (4 ,12 ), +}; +static const unsigned int hscif2_ctrl_mux[] = { +HRTS2_N_MARK ,HCTS2_N_MARK , +}; + +/* - HSCIF3_A ----------------------------------------------------------------- */ +static const unsigned int hscif3_data_a_pins[] = { +/* HRX3_A, HTX3_A */ +RCAR_GP_PIN (1 ,24 ),RCAR_GP_PIN (1 ,28 ), +}; +static const unsigned int hscif3_data_a_mux[] = { +HRX3_A_MARK ,HTX3_A_MARK , +}; +static const unsigned int hscif3_clk_a_pins[] = { +/* HSCK3_A */ +RCAR_GP_PIN (1 ,25 ), +}; +static const unsigned int hscif3_clk_a_mux[] = { +HSCK3_A_MARK , +}; +static const unsigned int hscif3_ctrl_a_pins[] = { +/* HRTS3_N_A, HCTS3_N_A */ +RCAR_GP_PIN (1 ,26 ),RCAR_GP_PIN (1 ,27 ), +}; +static const unsigned int hscif3_ctrl_a_mux[] = { +HRTS3_N_A_MARK ,HCTS3_N_A_MARK , +}; + +/* - HSCIF3_B ----------------------------------------------------------------- */ +static const unsigned int hscif3_data_b_pins[] = { +/* HRX3_B, HTX3_B */ +RCAR_GP_PIN (1 ,4 ),RCAR_GP_PIN (1 ,0 ), +}; +static const unsigned int hscif3_data_b_mux[] = { +HRX3_B_MARK ,HTX3_B_MARK , +}; +static const unsigned int hscif3_clk_b_pins[] = { +/* HSCK3_B */ +RCAR_GP_PIN (1 ,3 ), +}; +static const unsigned int hscif3_clk_b_mux[] = { +HSCK3_B_MARK , +}; +static const unsigned int hscif3_ctrl_b_pins[] = { +/* HRTS3_N_B, HCTS3_N_B */ +RCAR_GP_PIN (1 ,2 ),RCAR_GP_PIN (1 ,1 ), +}; +static const unsigned int hscif3_ctrl_b_mux[] = { +HRTS3_N_B_MARK ,HCTS3_N_B_MARK , +}; +/* - MMC -------------------------------------------------------------------- */ static const unsigned int mmc_data_pins[] = {/* MMC_SD_D[0:3], MMC_D[4:7] */
@@ -1690,6 +1828,25 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb2_avtp_capture),SH_PFC_PIN_GROUP (avb2_avtp_match), +SH_PFC_PIN_GROUP (hscif0_data), +SH_PFC_PIN_GROUP (hscif0_clk), +SH_PFC_PIN_GROUP (hscif0_ctrl), +SH_PFC_PIN_GROUP (hscif1_data_a), +SH_PFC_PIN_GROUP (hscif1_clk_a), +SH_PFC_PIN_GROUP (hscif1_ctrl_a), +SH_PFC_PIN_GROUP (hscif1_data_b), +SH_PFC_PIN_GROUP (hscif1_clk_b), +SH_PFC_PIN_GROUP (hscif1_ctrl_b), +SH_PFC_PIN_GROUP (hscif2_data), +SH_PFC_PIN_GROUP (hscif2_clk), +SH_PFC_PIN_GROUP (hscif2_ctrl), +SH_PFC_PIN_GROUP (hscif3_data_a), +SH_PFC_PIN_GROUP (hscif3_clk_a), +SH_PFC_PIN_GROUP (hscif3_ctrl_a), +SH_PFC_PIN_GROUP (hscif3_data_b), +SH_PFC_PIN_GROUP (hscif3_clk_b), +SH_PFC_PIN_GROUP (hscif3_ctrl_b), +BUS_DATA_PIN_GROUP (mmc_data,1 ),BUS_DATA_PIN_GROUP (mmc_data,4 ), BUS_DATA_PIN_GROUP(mmc_data, 8),
@@ -1763,6 +1920,36 @@ static const char * const avb2_groups[] = { "avb2_avtp_match", }; +static const char *const hscif0_groups[] = { +"hscif0_data" , +"hscif0_clk" , +"hscif0_ctrl" , +}; + +static const char *const hscif1_groups[] = { +"hscif1_data_a" , +"hscif1_clk_a" , +"hscif1_ctrl_a" , +"hscif1_data_b" , +"hscif1_clk_b" , +"hscif1_ctrl_b" , +}; + +static const char *const hscif2_groups[] = { +"hscif2_data" , +"hscif2_clk" , +"hscif2_ctrl" , +}; + +static const char *const hscif3_groups[] = { +"hscif3_data_a" , +"hscif3_clk_a" , +"hscif3_ctrl_a" , +"hscif3_data_b" , +"hscif3_clk_b" , +"hscif3_ctrl_b" , +}; +static const char *const mmc_groups[] = {"mmc_data1" ,"mmc_data4" ,
@@ -1828,6 +2015,11 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb1),SH_PFC_FUNCTION (avb2), +SH_PFC_FUNCTION (hscif0), +SH_PFC_FUNCTION (hscif1), +SH_PFC_FUNCTION (hscif2), +SH_PFC_FUNCTION (hscif3), +SH_PFC_FUNCTION (mmc), SH_PFC_FUNCTION(qspi0),
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 9/14 pinctrl: renesas: r8a779h0: Add I2C pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the I2C Bus Interfaces on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +62 -0
@@ -1563,6 +1563,42 @@ static const unsigned int hscif3_ctrl_b_mux[] = { HRTS3_N_B_MARK, HCTS3_N_B_MARK, }; +/* - I2C0 ------------------------------------------------------------------- */ +static const unsigned int i2c0_pins[] = { +/* SDA0, SCL0 */ +RCAR_GP_PIN (4 ,1 ),RCAR_GP_PIN (4 ,0 ), +}; +static const unsigned int i2c0_mux[] = { +SDA0_MARK ,SCL0_MARK , +}; + +/* - I2C1 ------------------------------------------------------------------- */ +static const unsigned int i2c1_pins[] = { +/* SDA1, SCL1 */ +RCAR_GP_PIN (4 ,3 ),RCAR_GP_PIN (4 ,2 ), +}; +static const unsigned int i2c1_mux[] = { +SDA1_MARK ,SCL1_MARK , +}; + +/* - I2C2 ------------------------------------------------------------------- */ +static const unsigned int i2c2_pins[] = { +/* SDA2, SCL2 */ +RCAR_GP_PIN (4 ,5 ),RCAR_GP_PIN (4 ,4 ), +}; +static const unsigned int i2c2_mux[] = { +SDA2_MARK ,SCL2_MARK , +}; + +/* - I2C3 ------------------------------------------------------------------- */ +static const unsigned int i2c3_pins[] = { +/* SDA3, SCL3 */ +RCAR_GP_PIN (4 ,7 ),RCAR_GP_PIN (4 ,6 ), +}; +static const unsigned int i2c3_mux[] = { +SDA3_MARK ,SCL3_MARK , +}; +/* - MMC -------------------------------------------------------------------- */ static const unsigned int mmc_data_pins[] = {/* MMC_SD_D[0:3], MMC_D[4:7] */
@@ -1847,6 +1883,11 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (hscif3_clk_b),SH_PFC_PIN_GROUP (hscif3_ctrl_b), +SH_PFC_PIN_GROUP (i2c0), +SH_PFC_PIN_GROUP (i2c1), +SH_PFC_PIN_GROUP (i2c2), +SH_PFC_PIN_GROUP (i2c3), +BUS_DATA_PIN_GROUP (mmc_data,1 ),BUS_DATA_PIN_GROUP (mmc_data,4 ), BUS_DATA_PIN_GROUP(mmc_data, 8),
@@ -1950,6 +1991,22 @@ static const char * const hscif3_groups[] = { "hscif3_ctrl_b", }; +static const char *const i2c0_groups[] = { +"i2c0" , +}; + +static const char *const i2c1_groups[] = { +"i2c1" , +}; + +static const char *const i2c2_groups[] = { +"i2c2" , +}; + +static const char *const i2c3_groups[] = { +"i2c3" , +}; +static const char *const mmc_groups[] = {"mmc_data1" ,"mmc_data4" ,
@@ -2020,6 +2077,11 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (hscif2),SH_PFC_FUNCTION (hscif3), +SH_PFC_FUNCTION (i2c0), +SH_PFC_FUNCTION (i2c1), +SH_PFC_FUNCTION (i2c2), +SH_PFC_FUNCTION (i2c3), +SH_PFC_FUNCTION (mmc), SH_PFC_FUNCTION(qspi0),
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 10/14 pinctrl: renesas: r8a779h0: Add MSIOF pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the Clock-Synchronized Serial Interfaces with FIFO (MSIOF) on the Renesas R-Car V4M (R8A779H0) SoC.
---
Changes compared to the BSP:
- Drop MSIOF5 A/B, as they are no longer documented in the R-Car V4M Series Hardaware User’s Manual Rev.0.51.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 367 +++++++++++++++++++++++++ 1 file changed, 367 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +367 -0
@@ -1642,6 +1642,270 @@ static const unsigned int mmc_ds_mux[] = { MMC_DS_MARK, }; +/* - MSIOF0 ----------------------------------------------------------------- */ +static const unsigned int msiof0_clk_pins[] = { +/* MSIOF0_SCK */ +RCAR_GP_PIN (1 ,10 ), +}; +static const unsigned int msiof0_clk_mux[] = { +MSIOF0_SCK_MARK , +}; +static const unsigned int msiof0_sync_pins[] = { +/* MSIOF0_SYNC */ +RCAR_GP_PIN (1 ,8 ), +}; +static const unsigned int msiof0_sync_mux[] = { +MSIOF0_SYNC_MARK , +}; +static const unsigned int msiof0_ss1_pins[] = { +/* MSIOF0_SS1 */ +RCAR_GP_PIN (1 ,7 ), +}; +static const unsigned int msiof0_ss1_mux[] = { +MSIOF0_SS1_MARK , +}; +static const unsigned int msiof0_ss2_pins[] = { +/* MSIOF0_SS2 */ +RCAR_GP_PIN (1 ,6 ), +}; +static const unsigned int msiof0_ss2_mux[] = { +MSIOF0_SS2_MARK , +}; +static const unsigned int msiof0_txd_pins[] = { +/* MSIOF0_TXD */ +RCAR_GP_PIN (1 ,9 ), +}; +static const unsigned int msiof0_txd_mux[] = { +MSIOF0_TXD_MARK , +}; +static const unsigned int msiof0_rxd_pins[] = { +/* MSIOF0_RXD */ +RCAR_GP_PIN (1 ,11 ), +}; +static const unsigned int msiof0_rxd_mux[] = { +MSIOF0_RXD_MARK , +}; + +/* - MSIOF1 ----------------------------------------------------------------- */ +static const unsigned int msiof1_clk_pins[] = { +/* MSIOF1_SCK */ +RCAR_GP_PIN (1 ,3 ), +}; +static const unsigned int msiof1_clk_mux[] = { +MSIOF1_SCK_MARK , +}; +static const unsigned int msiof1_sync_pins[] = { +/* MSIOF1_SYNC */ +RCAR_GP_PIN (1 ,2 ), +}; +static const unsigned int msiof1_sync_mux[] = { +MSIOF1_SYNC_MARK , +}; +static const unsigned int msiof1_ss1_pins[] = { +/* MSIOF1_SS1 */ +RCAR_GP_PIN (1 ,1 ), +}; +static const unsigned int msiof1_ss1_mux[] = { +MSIOF1_SS1_MARK , +}; +static const unsigned int msiof1_ss2_pins[] = { +/* MSIOF1_SS2 */ +RCAR_GP_PIN (1 ,0 ), +}; +static const unsigned int msiof1_ss2_mux[] = { +MSIOF1_SS2_MARK , +}; +static const unsigned int msiof1_txd_pins[] = { +/* MSIOF1_TXD */ +RCAR_GP_PIN (1 ,4 ), +}; +static const unsigned int msiof1_txd_mux[] = { +MSIOF1_TXD_MARK , +}; +static const unsigned int msiof1_rxd_pins[] = { +/* MSIOF1_RXD */ +RCAR_GP_PIN (1 ,5 ), +}; +static const unsigned int msiof1_rxd_mux[] = { +MSIOF1_RXD_MARK , +}; + +/* - MSIOF2 ----------------------------------------------------------------- */ +static const unsigned int msiof2_clk_pins[] = { +/* MSIOF2_SCK */ +RCAR_GP_PIN (0 ,17 ), +}; +static const unsigned int msiof2_clk_mux[] = { +MSIOF2_SCK_MARK , +}; +static const unsigned int msiof2_sync_pins[] = { +/* MSIOF2_SYNC */ +RCAR_GP_PIN (0 ,15 ), +}; +static const unsigned int msiof2_sync_mux[] = { +MSIOF2_SYNC_MARK , +}; +static const unsigned int msiof2_ss1_pins[] = { +/* MSIOF2_SS1 */ +RCAR_GP_PIN (0 ,14 ), +}; +static const unsigned int msiof2_ss1_mux[] = { +MSIOF2_SS1_MARK , +}; +static const unsigned int msiof2_ss2_pins[] = { +/* MSIOF2_SS2 */ +RCAR_GP_PIN (0 ,13 ), +}; +static const unsigned int msiof2_ss2_mux[] = { +MSIOF2_SS2_MARK , +}; +static const unsigned int msiof2_txd_pins[] = { +/* MSIOF2_TXD */ +RCAR_GP_PIN (0 ,16 ), +}; +static const unsigned int msiof2_txd_mux[] = { +MSIOF2_TXD_MARK , +}; +static const unsigned int msiof2_rxd_pins[] = { +/* MSIOF2_RXD */ +RCAR_GP_PIN (0 ,18 ), +}; +static const unsigned int msiof2_rxd_mux[] = { +MSIOF2_RXD_MARK , +}; + +/* - MSIOF3 ----------------------------------------------------------------- */ +static const unsigned int msiof3_clk_pins[] = { +/* MSIOF3_SCK */ +RCAR_GP_PIN (0 ,3 ), +}; +static const unsigned int msiof3_clk_mux[] = { +MSIOF3_SCK_MARK , +}; +static const unsigned int msiof3_sync_pins[] = { +/* MSIOF3_SYNC */ +RCAR_GP_PIN (0 ,6 ), +}; +static const unsigned int msiof3_sync_mux[] = { +MSIOF3_SYNC_MARK , +}; +static const unsigned int msiof3_ss1_pins[] = { +/* MSIOF3_SS1 */ +RCAR_GP_PIN (0 ,1 ), +}; +static const unsigned int msiof3_ss1_mux[] = { +MSIOF3_SS1_MARK , +}; +static const unsigned int msiof3_ss2_pins[] = { +/* MSIOF3_SS2 */ +RCAR_GP_PIN (0 ,2 ), +}; +static const unsigned int msiof3_ss2_mux[] = { +MSIOF3_SS2_MARK , +}; +static const unsigned int msiof3_txd_pins[] = { +/* MSIOF3_TXD */ +RCAR_GP_PIN (0 ,4 ), +}; +static const unsigned int msiof3_txd_mux[] = { +MSIOF3_TXD_MARK , +}; +static const unsigned int msiof3_rxd_pins[] = { +/* MSIOF3_RXD */ +RCAR_GP_PIN (0 ,5 ), +}; +static const unsigned int msiof3_rxd_mux[] = { +MSIOF3_RXD_MARK , +}; + +/* - MSIOF4 ----------------------------------------------------------------- */ +static const unsigned int msiof4_clk_pins[] = { +/* MSIOF4_SCK */ +RCAR_GP_PIN (1 ,25 ), +}; +static const unsigned int msiof4_clk_mux[] = { +MSIOF4_SCK_MARK , +}; +static const unsigned int msiof4_sync_pins[] = { +/* MSIOF4_SYNC */ +RCAR_GP_PIN (1 ,28 ), +}; +static const unsigned int msiof4_sync_mux[] = { +MSIOF4_SYNC_MARK , +}; +static const unsigned int msiof4_ss1_pins[] = { +/* MSIOF4_SS1 */ +RCAR_GP_PIN (1 ,23 ), +}; +static const unsigned int msiof4_ss1_mux[] = { +MSIOF4_SS1_MARK , +}; +static const unsigned int msiof4_ss2_pins[] = { +/* MSIOF4_SS2 */ +RCAR_GP_PIN (1 ,24 ), +}; +static const unsigned int msiof4_ss2_mux[] = { +MSIOF4_SS2_MARK , +}; +static const unsigned int msiof4_txd_pins[] = { +/* MSIOF4_TXD */ +RCAR_GP_PIN (1 ,26 ), +}; +static const unsigned int msiof4_txd_mux[] = { +MSIOF4_TXD_MARK , +}; +static const unsigned int msiof4_rxd_pins[] = { +/* MSIOF4_RXD */ +RCAR_GP_PIN (1 ,27 ), +}; +static const unsigned int msiof4_rxd_mux[] = { +MSIOF4_RXD_MARK , +}; + +/* - MSIOF5 ----------------------------------------------------------------- */ +static const unsigned int msiof5_clk_pins[] = { +/* MSIOF5_SCK */ +RCAR_GP_PIN (0 ,11 ), +}; +static const unsigned int msiof5_clk_mux[] = { +MSIOF5_SCK_MARK , +}; +static const unsigned int msiof5_sync_pins[] = { +/* MSIOF5_SYNC */ +RCAR_GP_PIN (0 ,9 ), +}; +static const unsigned int msiof5_sync_mux[] = { +MSIOF5_SYNC_MARK , +}; +static const unsigned int msiof5_ss1_pins[] = { +/* MSIOF5_SS1 */ +RCAR_GP_PIN (0 ,8 ), +}; +static const unsigned int msiof5_ss1_mux[] = { +MSIOF5_SS1_MARK , +}; +static const unsigned int msiof5_ss2_pins[] = { +/* MSIOF5_SS2 */ +RCAR_GP_PIN (0 ,7 ), +}; +static const unsigned int msiof5_ss2_mux[] = { +MSIOF5_SS2_MARK , +}; +static const unsigned int msiof5_txd_pins[] = { +/* MSIOF5_TXD */ +RCAR_GP_PIN (0 ,10 ), +}; +static const unsigned int msiof5_txd_mux[] = { +MSIOF5_TXD_MARK , +}; +static const unsigned int msiof5_rxd_pins[] = { +/* MSIOF5_RXD */ +RCAR_GP_PIN (0 ,12 ), +}; +static const unsigned int msiof5_rxd_mux[] = { +MSIOF5_RXD_MARK , +}; +/* - QSPI0 ------------------------------------------------------------------ */ static const unsigned int qspi0_ctrl_pins[] = {/* SPCLK, SSL */
@@ -1896,6 +2160,48 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (mmc_wp),SH_PFC_PIN_GROUP (mmc_ds), +SH_PFC_PIN_GROUP (msiof0_clk), +SH_PFC_PIN_GROUP (msiof0_sync), +SH_PFC_PIN_GROUP (msiof0_ss1), +SH_PFC_PIN_GROUP (msiof0_ss2), +SH_PFC_PIN_GROUP (msiof0_txd), +SH_PFC_PIN_GROUP (msiof0_rxd), + +SH_PFC_PIN_GROUP (msiof1_clk), +SH_PFC_PIN_GROUP (msiof1_sync), +SH_PFC_PIN_GROUP (msiof1_ss1), +SH_PFC_PIN_GROUP (msiof1_ss2), +SH_PFC_PIN_GROUP (msiof1_txd), +SH_PFC_PIN_GROUP (msiof1_rxd), + +SH_PFC_PIN_GROUP (msiof2_clk), +SH_PFC_PIN_GROUP (msiof2_sync), +SH_PFC_PIN_GROUP (msiof2_ss1), +SH_PFC_PIN_GROUP (msiof2_ss2), +SH_PFC_PIN_GROUP (msiof2_txd), +SH_PFC_PIN_GROUP (msiof2_rxd), + +SH_PFC_PIN_GROUP (msiof3_clk), +SH_PFC_PIN_GROUP (msiof3_sync), +SH_PFC_PIN_GROUP (msiof3_ss1), +SH_PFC_PIN_GROUP (msiof3_ss2), +SH_PFC_PIN_GROUP (msiof3_txd), +SH_PFC_PIN_GROUP (msiof3_rxd), + +SH_PFC_PIN_GROUP (msiof4_clk), +SH_PFC_PIN_GROUP (msiof4_sync), +SH_PFC_PIN_GROUP (msiof4_ss1), +SH_PFC_PIN_GROUP (msiof4_ss2), +SH_PFC_PIN_GROUP (msiof4_txd), +SH_PFC_PIN_GROUP (msiof4_rxd), + +SH_PFC_PIN_GROUP (msiof5_clk), +SH_PFC_PIN_GROUP (msiof5_sync), +SH_PFC_PIN_GROUP (msiof5_ss1), +SH_PFC_PIN_GROUP (msiof5_ss2), +SH_PFC_PIN_GROUP (msiof5_txd), +SH_PFC_PIN_GROUP (msiof5_rxd), +SH_PFC_PIN_GROUP (qspi0_ctrl),BUS_DATA_PIN_GROUP (qspi0_data,2 ), BUS_DATA_PIN_GROUP(qspi0_data, 4),
@@ -2017,6 +2323,60 @@ static const char * const mmc_groups[] = { "mmc_ds", }; +static const char *const msiof0_groups[] = { +"msiof0_clk" , +"msiof0_sync" , +"msiof0_ss1" , +"msiof0_ss2" , +"msiof0_txd" , +"msiof0_rxd" , +}; + +static const char *const msiof1_groups[] = { +"msiof1_clk" , +"msiof1_sync" , +"msiof1_ss1" , +"msiof1_ss2" , +"msiof1_txd" , +"msiof1_rxd" , +}; + +static const char *const msiof2_groups[] = { +"msiof2_clk" , +"msiof2_sync" , +"msiof2_ss1" , +"msiof2_ss2" , +"msiof2_txd" , +"msiof2_rxd" , +}; + +static const char *const msiof3_groups[] = { +"msiof3_clk" , +"msiof3_sync" , +"msiof3_ss1" , +"msiof3_ss2" , +"msiof3_txd" , +"msiof3_rxd" , +}; + +static const char *const msiof4_groups[] = { +"msiof4_clk" , +"msiof4_sync" , +"msiof4_ss1" , +"msiof4_ss2" , +"msiof4_txd" , +"msiof4_rxd" , +}; + +static const char *const msiof5_groups[] = { +"msiof5_clk" , +"msiof5_sync" , +"msiof5_ss1" , +"msiof5_ss2" , +"msiof5_txd" , +"msiof5_rxd" , +}; +static const char *const qspi0_groups[] = {"qspi0_ctrl" ,"qspi0_data2" ,
@@ -2084,6 +2444,13 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (mmc), +SH_PFC_FUNCTION (msiof0), +SH_PFC_FUNCTION (msiof1), +SH_PFC_FUNCTION (msiof2), +SH_PFC_FUNCTION (msiof3), +SH_PFC_FUNCTION (msiof4), +SH_PFC_FUNCTION (msiof5), +SH_PFC_FUNCTION (qspi0), SH_PFC_FUNCTION(qspi1),
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 11/14 pinctrl: renesas: r8a779h0: Add PWM/TPU pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the PWM and 16-Bit Timer Pulse Units (TPU) on the Renesas R-Car V4M (R8A779H0) SoC.
---
Changes compared to the BSP:
- Change PWM2_B to PWM2_C in comment,
- Change PWM3_C pin from (1, 12) to (1, 22).
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 236 +++++++++++++++++++++++++ 1 file changed, 236 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +236 -0
@@ -1906,6 +1906,114 @@ static const unsigned int msiof5_rxd_mux[] = { MSIOF5_RXD_MARK, }; +/* - PWM0_A ------------------------------------------------------------------- */ +static const unsigned int pwm0_a_pins[] = { +/* PWM0_A */ +RCAR_GP_PIN (1 ,15 ), +}; +static const unsigned int pwm0_a_mux[] = { +PWM0_A_MARK , +}; + +/* - PWM0_B ------------------------------------------------------------------- */ +static const unsigned int pwm0_b_pins[] = { +/* PWM0_B */ +RCAR_GP_PIN (1 ,14 ), +}; +static const unsigned int pwm0_b_mux[] = { +PWM0_B_MARK , +}; + +/* - PWM1_A ------------------------------------------------------------------- */ +static const unsigned int pwm1_a_pins[] = { +/* PWM1_A */ +RCAR_GP_PIN (3 ,13 ), +}; +static const unsigned int pwm1_a_mux[] = { +PWM1_A_MARK , +}; + +/* - PWM1_B ------------------------------------------------------------------- */ +static const unsigned int pwm1_b_pins[] = { +/* PWM1_B */ +RCAR_GP_PIN (2 ,13 ), +}; +static const unsigned int pwm1_b_mux[] = { +PWM1_B_MARK , +}; + +/* - PWM1_C ------------------------------------------------------------------- */ +static const unsigned int pwm1_c_pins[] = { +/* PWM1_C */ +RCAR_GP_PIN (2 ,17 ), +}; +static const unsigned int pwm1_c_mux[] = { +PWM1_C_MARK , +}; + +/* - PWM2_A ------------------------------------------------------------------- */ +static const unsigned int pwm2_a_pins[] = { +/* PWM2_A */ +RCAR_GP_PIN (3 ,14 ), +}; +static const unsigned int pwm2_a_mux[] = { +PWM2_A_MARK , +}; + +/* - PWM2_B ------------------------------------------------------------------- */ +static const unsigned int pwm2_b_pins[] = { +/* PWM2_B */ +RCAR_GP_PIN (2 ,14 ), +}; +static const unsigned int pwm2_b_mux[] = { +PWM2_B_MARK , +}; + +/* - PWM2_C ------------------------------------------------------------------- */ +static const unsigned int pwm2_c_pins[] = { +/* PWM2_C */ +RCAR_GP_PIN (2 ,19 ), +}; +static const unsigned int pwm2_c_mux[] = { +PWM2_C_MARK , +}; + +/* - PWM3_A ------------------------------------------------------------------- */ +static const unsigned int pwm3_a_pins[] = { +/* PWM3_A */ +RCAR_GP_PIN (4 ,14 ), +}; +static const unsigned int pwm3_a_mux[] = { +PWM3_A_MARK , +}; + +/* - PWM3_B ------------------------------------------------------------------- */ +static const unsigned int pwm3_b_pins[] = { +/* PWM3_B */ +RCAR_GP_PIN (2 ,15 ), +}; +static const unsigned int pwm3_b_mux[] = { +PWM3_B_MARK , +}; + +/* - PWM3_C ------------------------------------------------------------------- */ +static const unsigned int pwm3_c_pins[] = { +/* PWM3_C */ +RCAR_GP_PIN (1 ,22 ), +}; +static const unsigned int pwm3_c_mux[] = { +PWM3_C_MARK , +}; + +/* - PWM4 ------------------------------------------------------------------- */ +static const unsigned int pwm4_pins[] = { +/* PWM4 */ +RCAR_GP_PIN (4 ,15 ), +}; +static const unsigned int pwm4_mux[] = { +PWM4_MARK , +}; +/* - QSPI0 ------------------------------------------------------------------ */ static const unsigned int qspi0_ctrl_pins[] = {/* SPCLK, SSL */
@@ -2097,6 +2205,66 @@ static const unsigned int scif_clk2_mux[] = { SCIF_CLK2_MARK, }; +/* - TPU_A ------------------------------------------------------------------- */ +static const unsigned int tpu_to0_a_pins[] = { +/* TPU0TO0_A */ +RCAR_GP_PIN (2 ,8 ), +}; +static const unsigned int tpu_to0_a_mux[] = { +TPU0TO0_A_MARK , +}; +static const unsigned int tpu_to1_a_pins[] = { +/* TPU0TO1_A */ +RCAR_GP_PIN (2 ,7 ), +}; +static const unsigned int tpu_to1_a_mux[] = { +TPU0TO1_A_MARK , +}; +static const unsigned int tpu_to2_a_pins[] = { +/* TPU0TO2_A */ +RCAR_GP_PIN (2 ,12 ), +}; +static const unsigned int tpu_to2_a_mux[] = { +TPU0TO2_A_MARK , +}; +static const unsigned int tpu_to3_a_pins[] = { +/* TPU0TO3_A */ +RCAR_GP_PIN (2 ,13 ), +}; +static const unsigned int tpu_to3_a_mux[] = { +TPU0TO3_A_MARK , +}; + +/* - TPU_B ------------------------------------------------------------------- */ +static const unsigned int tpu_to0_b_pins[] = { +/* TPU0TO0_B */ +RCAR_GP_PIN (1 ,25 ), +}; +static const unsigned int tpu_to0_b_mux[] = { +TPU0TO0_B_MARK , +}; +static const unsigned int tpu_to1_b_pins[] = { +/* TPU0TO1_B */ +RCAR_GP_PIN (1 ,26 ), +}; +static const unsigned int tpu_to1_b_mux[] = { +TPU0TO1_B_MARK , +}; +static const unsigned int tpu_to2_b_pins[] = { +/* TPU0TO2_B */ +RCAR_GP_PIN (2 ,0 ), +}; +static const unsigned int tpu_to2_b_mux[] = { +TPU0TO2_B_MARK , +}; +static const unsigned int tpu_to3_b_pins[] = { +/* TPU0TO3_B */ +RCAR_GP_PIN (2 ,1 ), +}; +static const unsigned int tpu_to3_b_mux[] = { +TPU0TO3_B_MARK , +}; +static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb0_link),SH_PFC_PIN_GROUP (avb0_magic),
@@ -2202,6 +2370,19 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (msiof5_txd),SH_PFC_PIN_GROUP (msiof5_rxd), +SH_PFC_PIN_GROUP (pwm0_a), +SH_PFC_PIN_GROUP (pwm0_b), +SH_PFC_PIN_GROUP (pwm1_a), +SH_PFC_PIN_GROUP (pwm1_b), +SH_PFC_PIN_GROUP (pwm1_c), +SH_PFC_PIN_GROUP (pwm2_a), +SH_PFC_PIN_GROUP (pwm2_b), +SH_PFC_PIN_GROUP (pwm2_c), +SH_PFC_PIN_GROUP (pwm3_a), +SH_PFC_PIN_GROUP (pwm3_b), +SH_PFC_PIN_GROUP (pwm3_c), +SH_PFC_PIN_GROUP (pwm4), +SH_PFC_PIN_GROUP (qspi0_ctrl),BUS_DATA_PIN_GROUP (qspi0_data,2 ), BUS_DATA_PIN_GROUP(qspi0_data, 4),
@@ -2229,6 +2410,15 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (scif4_ctrl),SH_PFC_PIN_GROUP (scif_clk ),SH_PFC_PIN_GROUP (scif_clk2 ), + +SH_PFC_PIN_GROUP (tpu_to0_a ), +SH_PFC_PIN_GROUP (tpu_to0_b ), +SH_PFC_PIN_GROUP (tpu_to1_a ), +SH_PFC_PIN_GROUP (tpu_to1_b ), +SH_PFC_PIN_GROUP (tpu_to2_a ), +SH_PFC_PIN_GROUP (tpu_to2_b ), +SH_PFC_PIN_GROUP (tpu_to3_a ), + SH_PFC_PIN_GROUP(tpu_to3_b), };static const char *const avb0_groups[] = {
@@ -2377,6 +2567,33 @@ static const char * const msiof5_groups[] = { "msiof5_rxd", }; +static const char *const pwm0_groups[] = { +"pwm0_a" , +"pwm0_b" , +}; + +static const char *const pwm1_groups[] = { +"pwm1_a" , +"pwm1_b" , +"pwm1_c" , +}; + +static const char *const pwm2_groups[] = { +"pwm2_a" , +"pwm2_b" , +"pwm2_c" , +}; + +static const char *const pwm3_groups[] = { +"pwm3_a" , +"pwm3_b" , +"pwm3_c" , +}; + +static const char *const pwm4_groups[] = { +"pwm4" , +}; +static const char *const qspi0_groups[] = {"qspi0_ctrl" ,"qspi0_data2" ,
@@ -2427,6 +2644,17 @@ static const char * const scif_clk2_groups[] = { "scif_clk2", }; +static const char *const tpu_groups[] = { +"tpu_to0_a" , +"tpu_to0_b" , +"tpu_to1_a" , +"tpu_to1_b" , +"tpu_to2_a" , +"tpu_to2_b" , +"tpu_to3_a" , +"tpu_to3_b" , +}; +static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (avb1),
@@ -2451,6 +2679,12 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (msiof4),SH_PFC_FUNCTION (msiof5), +SH_PFC_FUNCTION (pwm0), +SH_PFC_FUNCTION (pwm1), +SH_PFC_FUNCTION (pwm2), +SH_PFC_FUNCTION (pwm3), +SH_PFC_FUNCTION (pwm4), +SH_PFC_FUNCTION (qspi0), SH_PFC_FUNCTION(qspi1),
@@ -2460,6 +2694,8 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (scif4),SH_PFC_FUNCTION (scif_clk ),SH_PFC_FUNCTION (scif_clk2 ), + + SH_PFC_FUNCTION(tpu), };static const struct pinmux_cfg_reg pinmux_config_regs[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 12/14 pinctrl: renesas: r8a779h0: Add CANFD pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the CAN-FD interfaces on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 77 ++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +77 -0
@@ -1425,6 +1425,51 @@ static const unsigned int avb2_avtp_match_mux[] = { AVB2_AVTP_MATCH_MARK, }; +/* - CANFD0 ----------------------------------------------------------------- */ +static const unsigned int canfd0_data_pins[] = { +/* CANFD0_TX, CANFD0_RX */ +RCAR_GP_PIN (2 ,10 ),RCAR_GP_PIN (2 ,11 ), +}; +static const unsigned int canfd0_data_mux[] = { +CANFD0_TX_MARK ,CANFD0_RX_MARK , +}; + +/* - CANFD1 ----------------------------------------------------------------- */ +static const unsigned int canfd1_data_pins[] = { +/* CANFD1_TX, CANFD1_RX */ +RCAR_GP_PIN (2 ,17 ),RCAR_GP_PIN (2 ,19 ), +}; +static const unsigned int canfd1_data_mux[] = { +CANFD1_TX_MARK ,CANFD1_RX_MARK , +}; + +/* - CANFD2 ----------------------------------------------------------------- */ +static const unsigned int canfd2_data_pins[] = { +/* CANFD2_TX, CANFD2_RX */ +RCAR_GP_PIN (2 ,12 ),RCAR_GP_PIN (2 ,13 ), +}; +static const unsigned int canfd2_data_mux[] = { +CANFD2_TX_MARK ,CANFD2_RX_MARK , +}; + +/* - CANFD3 ----------------------------------------------------------------- */ +static const unsigned int canfd3_data_pins[] = { +/* CANFD3_TX, CANFD3_RX */ +RCAR_GP_PIN (2 ,14 ),RCAR_GP_PIN (2 ,15 ), +}; +static const unsigned int canfd3_data_mux[] = { +CANFD3_TX_MARK ,CANFD3_RX_MARK , +}; + +/* - CANFD Clock ------------------------------------------------------------ */ +static const unsigned int can_clk_pins[] = { +/* CAN_CLK */ +RCAR_GP_PIN (2 ,9 ), +}; +static const unsigned int can_clk_mux[] = { +CAN_CLK_MARK , +}; +/* - HSCIF0 ----------------------------------------------------------------- */ static const unsigned int hscif0_data_pins[] = {/* HRX0, HTX0 */
@@ -2296,6 +2341,12 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (avb2_avtp_capture),SH_PFC_PIN_GROUP (avb2_avtp_match), +SH_PFC_PIN_GROUP (canfd0_data), +SH_PFC_PIN_GROUP (canfd1_data), +SH_PFC_PIN_GROUP (canfd2_data), +SH_PFC_PIN_GROUP (canfd3_data), +SH_PFC_PIN_GROUP (can_clk), +SH_PFC_PIN_GROUP (hscif0_data),SH_PFC_PIN_GROUP (hscif0_clk), SH_PFC_PIN_GROUP(hscif0_ctrl),
@@ -2457,6 +2508,26 @@ static const char * const avb2_groups[] = { "avb2_avtp_match", }; +static const char *const canfd0_groups[] = { +"canfd0_data" , +}; + +static const char *const canfd1_groups[] = { +"canfd1_data" , +}; + +static const char *const canfd2_groups[] = { +"canfd2_data" , +}; + +static const char *const canfd3_groups[] = { +"canfd3_data" , +}; + +static const char *const can_clk_groups[] = { +"can_clk" , +}; +static const char *const hscif0_groups[] = {"hscif0_data" ,"hscif0_clk" ,
@@ -2660,6 +2731,12 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (avb1),SH_PFC_FUNCTION (avb2), +SH_PFC_FUNCTION (canfd0), +SH_PFC_FUNCTION (canfd1), +SH_PFC_FUNCTION (canfd2), +SH_PFC_FUNCTION (canfd3), +SH_PFC_FUNCTION (can_clk), +SH_PFC_FUNCTION (hscif0),SH_PFC_FUNCTION (hscif1), SH_PFC_FUNCTION(hscif2),
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 13/14 pinctrl: renesas: r8a779h0: Add PCIe pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for the PCIe Controller on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +18 -0
@@ -1951,6 +1951,16 @@ static const unsigned int msiof5_rxd_mux[] = { MSIOF5_RXD_MARK, }; +/* - PCIE ------------------------------------------------------------------- */ +static const unsigned int pcie0_clkreq_n_pins[] = { +/* PCIE0_CLKREQ_N */ +RCAR_GP_PIN (4 ,21 ), +}; + +static const unsigned int pcie0_clkreq_n_mux[] = { +PCIE0_CLKREQ_N_MARK , +}; +/* - PWM0_A ------------------------------------------------------------------- */ static const unsigned int pwm0_a_pins[] = {/* PWM0_A */
@@ -2421,6 +2431,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (msiof5_txd),SH_PFC_PIN_GROUP (msiof5_rxd), +SH_PFC_PIN_GROUP (pcie0_clkreq_n), +SH_PFC_PIN_GROUP (pwm0_a),SH_PFC_PIN_GROUP (pwm0_b), SH_PFC_PIN_GROUP(pwm1_a),
@@ -2638,6 +2650,10 @@ static const char * const msiof5_groups[] = { "msiof5_rxd", }; +static const char *const pcie_groups[] = { +"pcie0_clkreq_n" , +}; +static const char *const pwm0_groups[] = {"pwm0_a" ,"pwm0_b" ,
@@ -2756,6 +2772,8 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (msiof4),SH_PFC_FUNCTION (msiof5), +SH_PFC_FUNCTION (pcie), +SH_PFC_FUNCTION (pwm0),SH_PFC_FUNCTION (pwm1), SH_PFC_FUNCTION(pwm2),
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 14/14 pinctrl: renesas: r8a779h0: Add Audio pins, groups, functions
In reply to Geert UytterhoevenFrom: Cong Dang <[email protected]>
Add pins, groups and functions for Audio on the Renesas R-Car V4M (R8A779H0) SoC.
--- drivers/pinctrl/renesas/pfc-r8a779h0.c | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/pinctrl/renesas/pfc-r8a779h0.c +52 -0
@@ -1191,6 +1191,22 @@ static const struct sh_pfc_pin pinmux_pins[] = { PINMUX_NOGP_ALL(), }; +/* - AUDIO CLOCK ----------------------------------------- */ +static const unsigned int audio_clkin_pins[] = { +/* CLK IN */ +RCAR_GP_PIN (1 ,22 ), +}; +static const unsigned int audio_clkin_mux[] = { +AUDIO_CLKIN_MARK , +}; +static const unsigned int audio_clkout_pins[] = { +/* CLK OUT */ +RCAR_GP_PIN (1 ,21 ), +}; +static const unsigned int audio_clkout_mux[] = { +AUDIO_CLKOUT_MARK , +}; +/* - AVB0 ------------------------------------------------ */ static const unsigned int avb0_link_pins[] = {/* AVB0_LINK */
@@ -2260,6 +2276,22 @@ static const unsigned int scif_clk2_mux[] = { SCIF_CLK2_MARK, }; +/* - SSI ------------------------------------------------- */ +static const unsigned int ssi_data_pins[] = { +/* SSI_SD */ +RCAR_GP_PIN (1 ,20 ), +}; +static const unsigned int ssi_data_mux[] = { +SSI_SD_MARK , +}; +static const unsigned int ssi_ctrl_pins[] = { +/* SSI_SCK, SSI_WS */ +RCAR_GP_PIN (1 ,18 ),RCAR_GP_PIN (1 ,19 ), +}; +static const unsigned int ssi_ctrl_mux[] = { +SSI_SCK_MARK ,SSI_WS_MARK , +}; +/* - TPU_A ------------------------------------------------------------------- */ static const unsigned int tpu_to0_a_pins[] = {/* TPU0TO0_A */
@@ -2321,6 +2353,9 @@ static const unsigned int tpu_to3_b_mux[] = { };static const struct sh_pfc_pin_group pinmux_groups[] = { +SH_PFC_PIN_GROUP (audio_clkin), +SH_PFC_PIN_GROUP (audio_clkout), +SH_PFC_PIN_GROUP (avb0_link),SH_PFC_PIN_GROUP (avb0_magic),SH_PFC_PIN_GROUP (avb0_phy_int),
@@ -2474,6 +2509,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {SH_PFC_PIN_GROUP (scif_clk),SH_PFC_PIN_GROUP (scif_clk2), +SH_PFC_PIN_GROUP (ssi_data), +SH_PFC_PIN_GROUP (ssi_ctrl), +SH_PFC_PIN_GROUP (tpu_to0_a),SH_PFC_PIN_GROUP (tpu_to0_b), SH_PFC_PIN_GROUP(tpu_to1_a),
@@ -2484,6 +2522,11 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(tpu_to3_b), }; +static const char *const audio_clk_groups[] = { +"audio_clkin" , +"audio_clkout" , +}; +static const char *const avb0_groups[] = {"avb0_link" ,"avb0_magic" ,
@@ -2731,6 +2774,11 @@ static const char * const scif_clk2_groups[] = { "scif_clk2", }; +static const char *const ssi_groups[] = { +"ssi_data" , +"ssi_ctrl" , +}; +static const char *const tpu_groups[] = {"tpu_to0_a" ,"tpu_to0_b" ,
@@ -2743,6 +2791,8 @@ static const char * const tpu_groups[] = { };static const struct sh_pfc_function pinmux_functions[] = { +SH_PFC_FUNCTION (audio_clk), +SH_PFC_FUNCTION (avb0),SH_PFC_FUNCTION (avb1),SH_PFC_FUNCTION (avb2),
@@ -2790,6 +2840,8 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (scif_clk),SH_PFC_FUNCTION (scif_clk2), +SH_PFC_FUNCTION (ssi), + SH_PFC_FUNCTION(tpu), };
Signature · 1 line
2.34.1
Quoted 5 lines · Geert Uytterhoeven
This patch series adds pin control support for the R-Car V4M (R8A779H0) SoC.
Some, but not all, of this has been tested on the Gray Hawk Single development board.
Thanks, queuing in renesas-pinctrl for v6.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