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

Commit 571319f1 authored by Linus Walleij's avatar Linus Walleij
Browse files

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

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

pinctrl: sh-pfc: Add support for R-Car M3-W

Add initial support for the Pin Function Controller on the Renesas R-Car
M3-W SoC:
  - Basic definitions,
  - SCIF (serial) pins, groups and functions,
  - SDHI pins, groups and functions.
parents a2d16a21 374cf699

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Required Properties: 
    - "renesas,pfc-r8a7793": for R8A7793 (R-Car M2-N) compatible pin-controller.

    - "renesas,pfc-r8a7794": for R8A7794 (R-Car E2) compatible pin-controller.

    - "renesas,pfc-r8a7795": for R8A7795 (R-Car H3) compatible pin-controller.

    - "renesas,pfc-r8a7796": for R8A7796 (R-Car M3-W) compatible pin-controller.

    - "renesas,pfc-sh73a0": for SH73A0 (SH-Mobile AG5) compatible pin-controller.



  - reg: Base address and length of each memory resource used by the pin

drivers/pinctrl/sh-pfc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ config PINCTRL_PFC_R8A7795 
	depends on ARCH_R8A7795

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7796

        def_bool y

        depends on ARCH_R8A7796

        select PINCTRL_SH_PFC



config PINCTRL_PFC_SH7203

	def_bool y

	depends on CPU_SUBTYPE_SH7203

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7792) += pfc-r8a7792.o 
obj-$(CONFIG_PINCTRL_PFC_R8A7793)	+= pfc-r8a7791.o

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

obj-$(CONFIG_PINCTRL_PFC_R8A7795)	+= pfc-r8a7795.o

obj-$(CONFIG_PINCTRL_PFC_R8A7796)	+= pfc-r8a7796.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/sh-pfc/core.c

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

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7796

	{

		.compatible = "renesas,pfc-r8a7796",

		.data = &r8a7796_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_SH73A0

	{

		.compatible = "renesas,pfc-sh73a0",

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

0 → 100644
+2647 −0

File added.

Preview size limit exceeded, changes collapsed.