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

Commit fe598411 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.13-tag1' of... 

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

pinctrl: sh-pfc: Updates for v4.13

  - Add PWM, AVB MDIO/MII, and sound pin groups on R-Car M3-W,
  - Add support for RZ/G1M and RZ/G1E,
  - Small fixes and cleanups.
parents acaa0379 c8bac70f

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

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ Required Properties: 
    - "renesas,pfc-emev2": for EMEV2 (EMMA Mobile EV2) compatible pin-controller.

    - "renesas,pfc-r8a73a4": for R8A73A4 (R-Mobile APE6) compatible pin-controller.

    - "renesas,pfc-r8a7740": for R8A7740 (R-Mobile A1) compatible pin-controller.

    - "renesas,pfc-r8a7743": for R8A7743 (RZ/G1M) compatible pin-controller.

    - "renesas,pfc-r8a7745": for R8A7745 (RZ/G1E) compatible pin-controller.

    - "renesas,pfc-r8a7778": for R8A7778 (R-Mobile M1) compatible pin-controller.

    - "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible pin-controller.

    - "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible pin-controller.

drivers/pinctrl/sh-pfc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ config PINCTRL_PFC_R8A7740 
	depends on ARCH_R8A7740

	select PINCTRL_SH_PFC_GPIO



config PINCTRL_PFC_R8A7743

	def_bool y

	depends on ARCH_R8A7743

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7745

        def_bool y

        depends on ARCH_R8A7745

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7778

	def_bool y

	depends on ARCH_R8A7778

drivers/pinctrl/sh-pfc/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ obj-$(CONFIG_PINCTRL_SH_PFC_GPIO) += gpio.o 
obj-$(CONFIG_PINCTRL_PFC_EMEV2)	+= pfc-emev2.o

obj-$(CONFIG_PINCTRL_PFC_R8A73A4)	+= pfc-r8a73a4.o

obj-$(CONFIG_PINCTRL_PFC_R8A7740)	+= pfc-r8a7740.o

obj-$(CONFIG_PINCTRL_PFC_R8A7743)	+= pfc-r8a7791.o

obj-$(CONFIG_PINCTRL_PFC_R8A7745)	+= pfc-r8a7794.o

obj-$(CONFIG_PINCTRL_PFC_R8A7778)	+= pfc-r8a7778.o

obj-$(CONFIG_PINCTRL_PFC_R8A7779)	+= pfc-r8a7779.o

obj-$(CONFIG_PINCTRL_PFC_R8A7790)	+= pfc-r8a7790.o

drivers/pinctrl/sh-pfc/core.c

+12 −0
Original line number Diff line number Diff line
@@ -485,6 +485,18 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a7740_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7743

	{

		.compatible = "renesas,pfc-r8a7743",

		.data = &r8a7743_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7745

	{

		.compatible = "renesas,pfc-r8a7745",

		.data = &r8a7745_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7778

	{

		.compatible = "renesas,pfc-r8a7778",

drivers/pinctrl/sh-pfc/pfc-r8a7791.c

+694 −647

File changed.

Preview size limit exceeded, changes collapsed.