Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a16885 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.17-tag2' of... 

Merge tag 'sh-pfc-for-v4.17-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: sh-pfc: Updates for v4.17 (take two)

  - Add USB pin groups on R-Car M3-N,
  - Add support for the new R-Car V3H SoC,
  - Add EtherAVB pin groups on R-Car V3M,
  - Miscellaneous fixes and cleanups.
parents 2ba08d75 a6fff41f

Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7795) += pfc-r8a7795-es1.o 
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
Original line number Diff line number Diff line
@@ -569,6 +569,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.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-r8a7790.c

+4 −4
Original line number Diff line number Diff line
@@ -1835,8 +1835,8 @@ static const unsigned int avb_mii_pins[] = { 
	RCAR_GP_PIN(2, 2),



	RCAR_GP_PIN(2, 7), RCAR_GP_PIN(2, 8), RCAR_GP_PIN(2, 9),

	RCAR_GP_PIN(2, 10), RCAR_GP_PIN(3, 8), RCAR_GP_PIN(3, 10),

	RCAR_GP_PIN(3, 12),

	RCAR_GP_PIN(2, 10), RCAR_GP_PIN(3, 8), RCAR_GP_PIN(3, 9),

	RCAR_GP_PIN(3, 10), RCAR_GP_PIN(3, 12),

};

static const unsigned int avb_mii_mux[] = {

	AVB_TXD0_MARK, AVB_TXD1_MARK, AVB_TXD2_MARK,
@@ -1846,8 +1846,8 @@ static const unsigned int avb_mii_mux[] = { 
	AVB_RXD3_MARK,



	AVB_RX_ER_MARK, AVB_RX_CLK_MARK, AVB_RX_DV_MARK,

	AVB_CRS_MARK, AVB_TX_EN_MARK, AVB_TX_CLK_MARK,

	AVB_COL_MARK,

	AVB_CRS_MARK, AVB_TX_EN_MARK, AVB_TX_ER_MARK,

	AVB_TX_CLK_MARK, AVB_COL_MARK,

};

static const unsigned int avb_gmii_pins[] = {

	RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9), RCAR_GP_PIN(0, 10),